Refactor sheet presentations to use parent-child pattern

Consolidates 9 competing sheet modifiers into a single unified system
with a SheetType enum and priority-based selection. Implements parent-child
presentation pattern for image picker as suggested by @qalandarov in PR #834:
- Main view presents image picker when NOT in a sheet
- DM/people sheet presents image picker when IN a sheet

Benefits:
- Simpler code without complex conditional bindings
- Better architecture matching UI hierarchy
- Easier to maintain with clear separation of concerns
- Type-safe enum-based sheet management

Addresses feedback on PR #834.

Justfile

@@ -47,7 +47,7 @@ patch-for-macos: backup
 # Build the macOS app
 build: #check generate
     @echo "Building BitChat for macOS..."
-    @xcodebuild -project bitchat.xcodeproj -scheme "bitchat (macOS)" -configuration Debug CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" build
+    @xcodebuild -project bitchat.xcodeproj -scheme "bitchat_macOS" -configuration Debug CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO CODE_SIGN_ENTITLEMENTS="" build
 
 # Run the macOS app
 run: build

Package.swift

@@ -34,8 +34,7 @@ let package = Package(
                 "Assets.xcassets",
                 "bitchat.entitlements",
                 "bitchat-macOS.entitlements",
-                "LaunchScreen.storyboard",
-                "ViewModels/Extensions/README.md"
+                "LaunchScreen.storyboard"
             ],
             resources: [
                 .process("Localizable.xcstrings")
@@ -50,8 +49,7 @@ let package = Package(
                 "README.md"
             ],
             resources: [
-                .process("Localization"),
-                .process("Noise")
+                .process("Localization")
             ]
         )
     ]

bitchat.xcodeproj/project.pbxproj

@@ -95,24 +95,6 @@
 			);
 			target = 57CA17A36A2532A6CFF367BB /* bitchatShareExtension */;
 		};
-		C5E027A52ECCDFD700BD6012 /* Exceptions for "bitchatTests" folder in "bitchatTests_macOS" target */ = {
-			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
-			membershipExceptions = (
-				Info.plist,
-				Localization/PrimaryLocalizationKeys.json,
-				README.md,
-			);
-			target = 47FF23248747DD7CB666CB91 /* bitchatTests_macOS */;
-		};
-		C5E027A82ECCDFE200BD6012 /* Exceptions for "bitchatTests" folder in "bitchatTests_iOS" target */ = {
-			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
-			membershipExceptions = (
-				Info.plist,
-				Localization/PrimaryLocalizationKeys.json,
-				README.md,
-			);
-			target = 6CB97DF2EA57234CB3E563B8 /* bitchatTests_iOS */;
-		};
 /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
 
 /* Begin PBXFileSystemSynchronizedRootGroup section */
@@ -136,10 +118,6 @@
 		};
 		A6E32D412E762EAE0032EA8A /* bitchatTests */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
-			exceptions = (
-				C5E027A82ECCDFE200BD6012 /* Exceptions for "bitchatTests" folder in "bitchatTests_iOS" target */,
-				C5E027A52ECCDFD700BD6012 /* Exceptions for "bitchatTests" folder in "bitchatTests_macOS" target */,
-			);
 			path = bitchatTests;
 			sourceTree = "<group>";
 		};
@@ -235,7 +213,6 @@
 			buildConfigurationList = 1C27B5BA3DB46DDF0DBFEF62 /* Build configuration list for PBXNativeTarget "bitchatTests_macOS" */;
 			buildPhases = (
 				5C22AA7B9ACC5A861445C769 /* Sources */,
-				C5E027A42ECCDFD700BD6012 /* Resources */,
 			);
 			buildRules = (
 			);
@@ -268,7 +245,6 @@
 			buildConfigurationList = 38C4AF6313E5037F25CEF30B /* Build configuration list for PBXNativeTarget "bitchatTests_iOS" */;
 			buildPhases = (
 				865C8403EF02C089369A9FCB /* Sources */,
-				C5E027A72ECCDFE200BD6012 /* Resources */,
 			);
 			buildRules = (
 			);
@@ -367,16 +343,6 @@
 				E0A1B2C3D4E5F6012345678D /* relays/online_relays_gps.csv in Resources */,
 			);
 		};
-		C5E027A42ECCDFD700BD6012 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			files = (
-			);
-		};
-		C5E027A72ECCDFE200BD6012 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			files = (
-			);
-		};
 		CD6E8F32BC38357473954F97 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			files = (

bitchat.xcodeproj/xcshareddata/xcschemes/bitchat (iOS).xcscheme

@@ -98,8 +98,8 @@
       </BuildableProductRunnable>
       <EnvironmentVariables>
          <EnvironmentVariable
-            key = "BITCHAT_LOG_LEVEL"
-            value = "debug"
+            key = "-DBITCHAT_DEV_ALLOW_CLEARNET"
+            value = ""
             isEnabled = "YES">
          </EnvironmentVariable>
       </EnvironmentVariables>

bitchat/BitchatApp.swift

@@ -53,14 +53,15 @@ struct BitchatApp: App {
                     // Inject live Noise service into VerificationService to avoid creating new BLE instances
                     VerificationService.shared.configure(with: chatViewModel.meshService.getNoiseService())
                     // Prewarm Nostr identity and QR to make first VERIFY sheet fast
-                    let nickname = chatViewModel.nickname
                     DispatchQueue.global(qos: .utility).async {
                         let npub = try? idBridge.getCurrentNostrIdentity()?.npub
-                        _ = VerificationService.shared.buildMyQRString(nickname: nickname, npub: npub)
+                        _ = VerificationService.shared.buildMyQRString(nickname: chatViewModel.nickname, npub: npub)
                     }
-
+                    #if os(iOS)
                     appDelegate.chatViewModel = chatViewModel
-
+                    #elseif os(macOS)
+                    appDelegate.chatViewModel = chatViewModel
+                    #endif
                     // Initialize network activation policy; will start Tor/Nostr only when allowed
                     NetworkActivationService.shared.start()
                     // Check for shared content
@@ -188,10 +189,6 @@ final class AppDelegate: NSObject, UIApplicationDelegate {
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
         return true
     }
-    
-    func applicationWillTerminate(_ application: UIApplication) {
-        chatViewModel?.applicationWillTerminate()
-    }
 }
 #endif
 
@@ -249,15 +246,10 @@ final class NotificationDelegate: NSObject, UNUserNotificationCenterDelegate {
             // Get peer ID from userInfo
             if let peerID = userInfo["peerID"] as? String {
                 // Don't show notification if the private chat is already open
-                // Access main-actor-isolated property via Task
-                Task { @MainActor in
-                    if self.chatViewModel?.selectedPrivateChatPeer == PeerID(str: peerID) {
-                        completionHandler([])
-                    } else {
-                        completionHandler([.banner, .sound])
-                    }
+                if chatViewModel?.selectedPrivateChatPeer == peerID {
+                    completionHandler([])
+                    return
                 }
-                return
             }
         }
         // Suppress geohash activity notification if we're already in that geohash channel

bitchat/Features/media/ImageUtils.swift

@@ -13,10 +13,10 @@ enum ImageUtilsError: Error {
 }
 
 enum ImageUtils {
-    private static let compressionQuality: CGFloat = 0.82
-    private static let targetImageBytes: Int = 45_000
+    private static let compressionQuality: CGFloat = 0.85
+    private static let targetImageBytes: Int = 60_000
 
-    static func processImage(at url: URL, maxDimension: CGFloat = 448) throws -> URL {
+    static func processImage(at url: URL, maxDimension: CGFloat = 512) throws -> URL {
         // Security H1: Check file size BEFORE reading into memory
         let attrs = try FileManager.default.attributesOfItem(atPath: url.path)
         guard let fileSize = attrs[.size] as? Int else {
@@ -38,7 +38,7 @@ enum ImageUtils {
     }
 
     #if os(iOS)
-    static func processImage(_ image: UIImage, maxDimension: CGFloat = 448) throws -> URL {
+    static func processImage(_ image: UIImage, maxDimension: CGFloat = 512) throws -> URL {
         return try autoreleasepool {
             // Scale the image first
             let scaled = scaledImage(image, maxDimension: maxDimension)
@@ -106,7 +106,7 @@ enum ImageUtils {
         return data as Data
     }
     #else
-    static func processImage(_ image: NSImage, maxDimension: CGFloat = 448) throws -> URL {
+    static func processImage(_ image: NSImage, maxDimension: CGFloat = 512) throws -> URL {
         return try autoreleasepool {
             let scaled = scaledImage(image, maxDimension: maxDimension)
             guard let inputCG = scaled.cgImage(forProposedRect: nil, context: nil, hints: nil) else {

bitchat/Features/voice/VoiceRecorder.swift

@@ -14,7 +14,6 @@ final class VoiceRecorder: NSObject, AVAudioRecorderDelegate {
 
     private let queue = DispatchQueue(label: "com.bitchat.voice-recorder")
     private let paddingInterval: TimeInterval = 0.5
-    private let maxRecordingDuration: TimeInterval = 120
 
     private var recorder: AVAudioRecorder?
     private var currentURL: URL?
@@ -76,14 +75,14 @@ final class VoiceRecorder: NSObject, AVAudioRecorderDelegate {
                 AVFormatIDKey: kAudioFormatMPEG4AAC,
                 AVSampleRateKey: 16_000,
                 AVNumberOfChannelsKey: 1,
-                AVEncoderBitRateKey: 16_000
+                AVEncoderBitRateKey: 20_000
             ]
 
             let audioRecorder = try AVAudioRecorder(url: outputURL, settings: settings)
             audioRecorder.delegate = self
             audioRecorder.isMeteringEnabled = true
             audioRecorder.prepareToRecord()
-            audioRecorder.record(forDuration: maxRecordingDuration)
+            audioRecorder.record()
 
             recorder = audioRecorder
             currentURL = outputURL

bitchat/Models/BitchatPacket.swift

@@ -21,9 +21,8 @@ struct BitchatPacket: Codable {
     let payload: Data
     var signature: Data?
     var ttl: UInt8
-    var route: [Data]?
     
-    init(type: UInt8, senderID: Data, recipientID: Data?, timestamp: UInt64, payload: Data, signature: Data?, ttl: UInt8, version: UInt8 = 1, route: [Data]? = nil) {
+    init(type: UInt8, senderID: Data, recipientID: Data?, timestamp: UInt64, payload: Data, signature: Data?, ttl: UInt8, version: UInt8 = 1) {
         self.version = version
         self.type = type
         self.senderID = senderID
@@ -32,7 +31,6 @@ struct BitchatPacket: Codable {
         self.payload = payload
         self.signature = signature
         self.ttl = ttl
-        self.route = route
     }
     
     // Convenience initializer for new binary format
@@ -55,7 +53,6 @@ struct BitchatPacket: Codable {
         self.payload = payload
         self.signature = nil
         self.ttl = ttl
-        self.route = nil
     }
     
     var data: Data? {
@@ -84,8 +81,7 @@ struct BitchatPacket: Codable {
             payload: payload,
             signature: nil, // Remove signature for signing
             ttl: 0, // Use fixed TTL=0 for signing to ensure relay compatibility
-            version: version,
-            route: route
+            version: version
         )
         return BinaryProtocol.encode(unsignedPacket)
     }

bitchat/Models/CommandInfo.swift

@@ -1,58 +0,0 @@
-//
-// CommandsInfo.swift
-// bitchat
-//
-// This is free and unencumbered software released into the public domain.
-// For more information, see <https://unlicense.org>
-//
-
-import Foundation
-
-// MARK: - CommandInfo Enum
-
-enum CommandInfo: String, Identifiable {
-    case block
-    case clear
-    case hug
-    case message = "dm"
-    case slap
-    case unblock
-    case who
-    case favorite
-    case unfavorite
-    
-    var id: String { rawValue }
-    
-    var alias: String { "/" + rawValue }
-    
-    var placeholder: String? {
-        switch self {
-        case .block, .hug, .message, .slap, .unblock, .favorite, .unfavorite:
-            return "<" + String(localized: "content.input.nickname_placeholder") + ">"
-        case .clear, .who:
-            return nil
-        }
-    }
-    
-    var description: String {
-        switch self {
-        case .block:        String(localized: "content.commands.block")
-        case .clear:        String(localized: "content.commands.clear")
-        case .hug:          String(localized: "content.commands.hug")
-        case .message:      String(localized: "content.commands.message")
-        case .slap:         String(localized: "content.commands.slap")
-        case .unblock:      String(localized: "content.commands.unblock")
-        case .who:          String(localized: "content.commands.who")
-        case .favorite:     String(localized: "content.commands.favorite")
-        case .unfavorite:   String(localized: "content.commands.unfavorite")
-        }
-    }
-    
-    static func all(isGeoPublic: Bool, isGeoDM: Bool) -> [CommandInfo] {
-        let baseCommands: [CommandInfo] = [.block, .unblock, .clear, .hug, .message, .slap, .who]
-        if isGeoPublic || isGeoDM {
-            return baseCommands + [.favorite, .unfavorite]
-        }
-        return baseCommands
-    }
-}

bitchat/Models/PeerID.swift

@@ -35,7 +35,7 @@ struct PeerID: Equatable, Hashable {
     // Private so the callers have to go through a convenience init
     private init(prefix: Prefix, bare: any StringProtocol) {
         self.prefix = prefix
-        self.bare = String(bare).lowercased()
+        self.bare = String(bare)
     }
 }
 
@@ -76,12 +76,6 @@ extension PeerID {
     init(hexData: Data) {
         self.init(str: hexData.hexEncodedString())
     }
-    
-    /// Convenience init to "hide" hex-encoding implementation detail
-    init?(hexData: Data?) {
-        guard let hexData else { return nil }
-        self.init(hexData: hexData)
-    }
 }
 
 // MARK: - Noise Public Key Helpers
@@ -136,20 +130,6 @@ extension PeerID {
     }
 }
 
-extension PeerID {
-    var routingData: Data? {
-        if let direct = Data(hexString: id), direct.count == 8 { return direct }
-        if let bareData = Data(hexString: bare), bareData.count == 8 { return bareData }
-        let short = toShort()
-        return Data(hexString: short.id)
-    }
-
-    init?(routingData: Data) {
-        guard routingData.count == 8 else { return nil }
-        self.init(hexData: routingData)
-    }
-}
-
 // MARK: - Validation
 
 extension PeerID {
@@ -211,7 +191,9 @@ extension PeerID: Comparable {
     }
 }
 
-// MARK: - CustomStringConvertible
+// MARK: - String Interop Helpers
+
+// MARK: CustomStringConvertible
 
 extension PeerID: CustomStringConvertible {
     /// So it returns the actual `id` like before even inside another String
@@ -219,3 +201,17 @@ extension PeerID: CustomStringConvertible {
         id
     }
 }
+
+// MARK: Custom Equatable w/ String & Optionality
+
+// PeerID <> String
+extension Optional where Wrapped == PeerID {
+    static func ==(lhs: Optional<Wrapped>, rhs: Optional<String>) -> Bool   { lhs?.id == rhs }
+    static func !=(lhs: Optional<Wrapped>, rhs: Optional<String>) -> Bool   { lhs?.id != rhs }
+}
+
+// String <> PeerID
+extension Optional where Wrapped == String {
+    static func ==(lhs: Optional<Wrapped>, rhs: Optional<PeerID>) -> Bool   { lhs == rhs?.id }
+    static func !=(lhs: Optional<Wrapped>, rhs: Optional<PeerID>) -> Bool   { lhs != rhs?.id }
+}

bitchat/Models/RequestSyncPacket.swift

@@ -8,14 +8,6 @@ struct RequestSyncPacket {
     let p: Int
     let m: UInt32
     let data: Data
-    let types: SyncTypeFlags?
-
-    init(p: Int, m: UInt32, data: Data, types: SyncTypeFlags? = nil) {
-        self.p = p
-        self.m = m
-        self.data = data
-        self.types = types
-    }
 
     func encode() -> Data {
         var out = Data()
@@ -33,9 +25,6 @@ struct RequestSyncPacket {
         putTLV(0x02, withUnsafeBytes(of: &mBE) { Data($0) })
         // data
         putTLV(0x03, data)
-        if let typesData = types?.toData() {
-            putTLV(0x04, typesData)
-        }
         return out
     }
 
@@ -44,7 +33,6 @@ struct RequestSyncPacket {
         var p: Int? = nil
         var m: UInt32? = nil
         var payload: Data? = nil
-        var types: SyncTypeFlags? = nil
 
         while off + 3 <= data.count {
             let t = Int(data[off]); off += 1
@@ -64,16 +52,12 @@ struct RequestSyncPacket {
             case 0x03:
                 if v.count > maxAcceptBytes { return nil }
                 payload = v
-            case 0x04:
-                if let decoded = SyncTypeFlags.decode(v) {
-                    types = decoded
-                }
             default:
                 break // forward compatible; ignore unknown TLVs
             }
         }
 
         guard let pp = p, let mm = m, let dd = payload, pp >= 1, mm > 0 else { return nil }
-        return RequestSyncPacket(p: pp, m: mm, data: dd, types: types)
+        return RequestSyncPacket(p: pp, m: mm, data: dd)
     }
 }

bitchat/Noise/NoiseProtocol.swift

@@ -222,7 +222,7 @@ final class NoiseCipherState {
         guard combinedPayload.count >= Self.NONCE_SIZE_BYTES else {
             return nil
         }
-        
+
         // Extract 4-byte nonce (big-endian)
         let nonceData = combinedPayload.prefix(Self.NONCE_SIZE_BYTES)
         let extractedNonce = nonceData.withUnsafeBytes { (bytes: UnsafeRawBufferPointer) -> UInt64 in
@@ -233,18 +233,18 @@ final class NoiseCipherState {
             }
             return result
         }
-        
+
         // Extract ciphertext (remaining bytes)
         let ciphertext = combinedPayload.dropFirst(Self.NONCE_SIZE_BYTES)
-        
+
         return (nonce: extractedNonce, ciphertext: Data(ciphertext))
     }
-    
+
     /// Convert nonce to 4-byte array (big-endian)
     private func nonceToBytes(_ nonce: UInt64) -> Data {
         var bytes = Data(count: Self.NONCE_SIZE_BYTES)
         withUnsafeBytes(of: nonce.bigEndian) { ptr in
-            // Copy only the last 4 bytes from the 8-byte UInt64
+            // Copy only the last 4 bytes from the 8-byte UInt64 
             let sourceBytes = ptr.bindMemory(to: UInt8.self)
             bytes.replaceSubrange(0..<Self.NONCE_SIZE_BYTES, with: sourceBytes.suffix(Self.NONCE_SIZE_BYTES))
         }
@@ -273,7 +273,7 @@ final class NoiseCipherState {
         let sealedBox = try ChaChaPoly.seal(plaintext, using: key, nonce: ChaChaPoly.Nonce(data: nonceData), authenticating: associatedData)
         // increment local nonce
         nonce += 1
-        
+               
         // Create combined payload: <nonce><ciphertext>
         let combinedPayload: Data
         if (useExtractedNonce) {
@@ -287,7 +287,7 @@ final class NoiseCipherState {
         if currentNonce > Self.HIGH_NONCE_WARNING_THRESHOLD {
             SecureLogger.warning("High nonce value detected: \(currentNonce) - consider rekeying", category: .encryption)
         }
-        
+                
         return combinedPayload
     }
     
@@ -316,7 +316,7 @@ final class NoiseCipherState {
                 SecureLogger.debug("Replay attack detected: nonce \(extractedNonce) rejected")
                 throw NoiseError.replayDetected
             }
-            
+
             // Split ciphertext and tag
             encryptedData = actualCiphertext.prefix(actualCiphertext.count - 16)
             tag = actualCiphertext.suffix(16)
@@ -451,13 +451,13 @@ final class NoiseSymmetricState {
         }
     }
     
-    func split(useExtractedNonce: Bool) -> (NoiseCipherState, NoiseCipherState) {
+    func split() -> (NoiseCipherState, NoiseCipherState) {
         let output = hkdf(chainingKey: chainingKey, inputKeyMaterial: Data(), numOutputs: 2)
         let tempKey1 = SymmetricKey(data: output[0])
         let tempKey2 = SymmetricKey(data: output[1])
         
-        let c1 = NoiseCipherState(key: tempKey1, useExtractedNonce: useExtractedNonce)
-        let c2 = NoiseCipherState(key: tempKey2, useExtractedNonce: useExtractedNonce)
+        let c1 = NoiseCipherState(key: tempKey1, useExtractedNonce: true)
+        let c2 = NoiseCipherState(key: tempKey2, useExtractedNonce: true)
         
         return (c1, c2)
     }
@@ -507,24 +507,16 @@ final class NoiseHandshakeState {
     private var messagePatterns: [[NoiseMessagePattern]] = []
     private var currentPattern = 0
     
-    // Test support: predetermined ephemeral keys for test vectors
-    private var predeterminedEphemeralKey: Curve25519.KeyAgreement.PrivateKey?
-    private var prologueData: Data
-    
     init(
         role: NoiseRole,
         pattern: NoisePattern,
         keychain: KeychainManagerProtocol,
         localStaticKey: Curve25519.KeyAgreement.PrivateKey? = nil,
-        remoteStaticKey: Curve25519.KeyAgreement.PublicKey? = nil,
-        prologue: Data = Data(),
-        predeterminedEphemeralKey: Curve25519.KeyAgreement.PrivateKey? = nil
+        remoteStaticKey: Curve25519.KeyAgreement.PublicKey? = nil
     ) {
         self.role = role
         self.pattern = pattern
         self.keychain = keychain
-        self.prologueData = prologue
-        self.predeterminedEphemeralKey = predeterminedEphemeralKey
         
         // Initialize static keys
         if let localKey = localStaticKey {
@@ -545,8 +537,8 @@ final class NoiseHandshakeState {
     }
     
     private func mixPreMessageKeys() {
-        // Mix prologue
-        symmetricState.mixHash(self.prologueData)
+        // Mix prologue (empty for XX pattern normally)
+        symmetricState.mixHash(Data()) // Empty prologue for XX pattern
         // For XX pattern, no pre-message keys
         // For IK/NK patterns, we'd mix the responder's static key here
         switch pattern {
@@ -564,20 +556,15 @@ final class NoiseHandshakeState {
         guard currentPattern < messagePatterns.count else {
             throw NoiseError.handshakeComplete
         }
-        
+                
         var messageBuffer = Data()
         let patterns = messagePatterns[currentPattern]
         
         for pattern in patterns {
             switch pattern {
             case .e:
-                // Generate ephemeral key (or use predetermined key for tests)
-                if let predetermined = predeterminedEphemeralKey {
-                    localEphemeralPrivate = predetermined
-                    predeterminedEphemeralKey = nil
-                } else {
-                    localEphemeralPrivate = Curve25519.KeyAgreement.PrivateKey()
-                }
+                // Generate ephemeral key
+                localEphemeralPrivate = Curve25519.KeyAgreement.PrivateKey()
                 localEphemeralPublic = localEphemeralPrivate!.publicKey
                 messageBuffer.append(localEphemeralPublic!.rawRepresentation)
                 symmetricState.mixHash(localEphemeralPublic!.rawRepresentation)
@@ -665,7 +652,7 @@ final class NoiseHandshakeState {
         guard currentPattern < messagePatterns.count else {
             throw NoiseError.handshakeComplete
         }
-        
+                
         var buffer = message
         let patterns = messagePatterns[currentPattern]
         
@@ -789,12 +776,12 @@ final class NoiseHandshakeState {
         return currentPattern >= messagePatterns.count
     }
     
-    func getTransportCiphers(useExtractedNonce: Bool) throws -> (send: NoiseCipherState, receive: NoiseCipherState) {
+    func getTransportCiphers() throws -> (send: NoiseCipherState, receive: NoiseCipherState) {
         guard isHandshakeComplete() else {
             throw NoiseError.handshakeNotComplete
         }
         
-        let (c1, c2) = symmetricState.split(useExtractedNonce: useExtractedNonce)
+        let (c1, c2) = symmetricState.split()
         
         // Initiator uses c1 for sending, c2 for receiving
         // Responder uses c2 for sending, c1 for receiving

bitchat/Noise/NoiseSession.swift

@@ -103,7 +103,7 @@ class NoiseSession {
             // Check if handshake is complete
             if handshake.isHandshakeComplete() {
                 // Get transport ciphers
-                let (send, receive) = try handshake.getTransportCiphers(useExtractedNonce: true)
+                let (send, receive) = try handshake.getTransportCiphers()
                 sendCipher = send
                 receiveCipher = receive
                 
@@ -129,7 +129,7 @@ class NoiseSession {
                 // Check if handshake is complete after writing
                 if handshake.isHandshakeComplete() {
                     // Get transport ciphers
-                    let (send, receive) = try handshake.getTransportCiphers(useExtractedNonce: true)
+                    let (send, receive) = try handshake.getTransportCiphers()
                     sendCipher = send
                     receiveCipher = receive
                     

bitchat/Nostr/GeoRelayDirectory.swift

@@ -284,10 +284,7 @@ final class GeoRelayDirectory {
             object: nil,
             queue: .main
         ) { [weak self] _ in
-            guard let self else { return }
-            Task { @MainActor in
-                self.prefetchIfNeeded(force: true)
-            }
+            self?.prefetchIfNeeded(force: true)
         }
         observers.append(torReady)
 
@@ -297,10 +294,7 @@ final class GeoRelayDirectory {
             object: nil,
             queue: .main
         ) { [weak self] _ in
-            guard let self else { return }
-            Task { @MainActor in
-                self.prefetchIfNeeded()
-            }
+            self?.prefetchIfNeeded()
         }
         observers.append(didBecomeActive)
 #elseif os(macOS)
@@ -309,10 +303,7 @@ final class GeoRelayDirectory {
             object: nil,
             queue: .main
         ) { [weak self] _ in
-            guard let self else { return }
-            Task { @MainActor in
-                self.prefetchIfNeeded()
-            }
+            self?.prefetchIfNeeded()
         }
         observers.append(didBecomeActive)
 #endif

bitchat/Nostr/XChaCha20Poly1305Compat.swift

@@ -5,27 +5,16 @@ import CryptoKit
 /// Implements HChaCha20 to derive a subkey and reduces the 24-byte nonce to a 12-byte nonce
 /// as per XChaCha20 construction.
 enum XChaCha20Poly1305Compat {
-
-    /// Errors that can occur during XChaCha20-Poly1305 operations
-    enum Error: Swift.Error {
-        case invalidKeyLength(expected: Int, got: Int)
-        case invalidNonceLength(expected: Int, got: Int)
-    }
-
     struct SealBox {
         let ciphertext: Data
         let tag: Data
     }
 
     static func seal(plaintext: Data, key: Data, nonce24: Data, aad: Data? = nil) throws -> SealBox {
-        guard key.count == 32 else {
-            throw Error.invalidKeyLength(expected: 32, got: key.count)
-        }
-        guard nonce24.count == 24 else {
-            throw Error.invalidNonceLength(expected: 24, got: nonce24.count)
-        }
+        precondition(key.count == 32, "XChaCha20 key must be 32 bytes")
+        precondition(nonce24.count == 24, "XChaCha20 nonce must be 24 bytes")
 
-        let subkey = try hchacha20(key: key, nonce16: Data(nonce24.prefix(16)))
+        let subkey = hchacha20(key: key, nonce16: nonce24.prefix(16))
         let nonce12 = derive12ByteNonce(from24: nonce24)
         let chachaKey = SymmetricKey(data: subkey)
         let nonce = try ChaChaPoly.Nonce(data: nonce12)
@@ -34,14 +23,10 @@ enum XChaCha20Poly1305Compat {
     }
 
     static func open(ciphertext: Data, tag: Data, key: Data, nonce24: Data, aad: Data? = nil) throws -> Data {
-        guard key.count == 32 else {
-            throw Error.invalidKeyLength(expected: 32, got: key.count)
-        }
-        guard nonce24.count == 24 else {
-            throw Error.invalidNonceLength(expected: 24, got: nonce24.count)
-        }
+        precondition(key.count == 32, "XChaCha20 key must be 32 bytes")
+        precondition(nonce24.count == 24, "XChaCha20 nonce must be 24 bytes")
 
-        let subkey = try hchacha20(key: key, nonce16: Data(nonce24.prefix(16)))
+        let subkey = hchacha20(key: key, nonce16: nonce24.prefix(16))
         let nonce12 = derive12ByteNonce(from24: nonce24)
         let chachaKey = SymmetricKey(data: subkey)
         let box = try ChaChaPoly.SealedBox(nonce: ChaChaPoly.Nonce(data: nonce12), ciphertext: ciphertext, tag: tag)
@@ -58,14 +43,10 @@ enum XChaCha20Poly1305Compat {
         return out
     }
 
-    private static func hchacha20(key: Data, nonce16: Data) throws -> Data {
+    private static func hchacha20(key: Data, nonce16: Data) -> Data {
         // HChaCha20 based on the original ChaCha20 core with a 16-byte nonce.
-        guard key.count == 32 else {
-            throw Error.invalidKeyLength(expected: 32, got: key.count)
-        }
-        guard nonce16.count == 16 else {
-            throw Error.invalidNonceLength(expected: 16, got: nonce16.count)
-        }
+        precondition(key.count == 32)
+        precondition(nonce16.count == 16)
 
         // Constants "expand 32-byte k"
         var state: [UInt32] = [

bitchat/Protocols/BinaryProtocol.swift

@@ -137,7 +137,6 @@ struct BinaryProtocol {
         static let hasRecipient: UInt8 = 0x01
         static let hasSignature: UInt8 = 0x02
         static let isCompressed: UInt8 = 0x04
-        static let hasRoute: UInt8 = 0x08
     }
     
     // Encode BitchatPacket to binary format
@@ -161,21 +160,8 @@ struct BinaryProtocol {
         }
 
         let lengthFieldBytes = lengthFieldSize(for: version)
-        let originalRoute = packet.route ?? []
-        if originalRoute.contains(where: { $0.isEmpty }) { return nil }
-        let sanitizedRoute: [Data] = originalRoute.map { hop in
-            if hop.count == senderIDSize { return hop }
-            if hop.count > senderIDSize { return Data(hop.prefix(senderIDSize)) }
-            var padded = hop
-            padded.append(Data(repeating: 0, count: senderIDSize - hop.count))
-            return padded
-        }
-        guard sanitizedRoute.count <= 255 else { return nil }
-
-        let hasRoute = !sanitizedRoute.isEmpty
-        let routeLength = hasRoute ? 1 + sanitizedRoute.count * senderIDSize : 0
         let originalSizeFieldBytes = isCompressed ? lengthFieldBytes : 0
-        let payloadDataSize = routeLength + payload.count + originalSizeFieldBytes
+        let payloadDataSize = payload.count + originalSizeFieldBytes
 
         if version == 1 && payloadDataSize > Int(UInt16.max) { return nil }
         if version == 2 && payloadDataSize > Int(UInt32.max) { return nil }
@@ -199,7 +185,6 @@ struct BinaryProtocol {
         if packet.recipientID != nil { flags |= Flags.hasRecipient }
         if packet.signature != nil { flags |= Flags.hasSignature }
         if isCompressed { flags |= Flags.isCompressed }
-        if hasRoute { flags |= Flags.hasRoute }
         data.append(flags)
 
         if version == 2 {
@@ -227,13 +212,6 @@ struct BinaryProtocol {
             }
         }
 
-        if hasRoute {
-            data.append(UInt8(sanitizedRoute.count))
-            for hop in sanitizedRoute {
-                data.append(hop)
-            }
-        }
-
         if isCompressed, let originalSize = originalPayloadSize {
             if version == 2 {
                 let value = UInt32(originalSize)
@@ -343,27 +321,9 @@ struct BinaryProtocol {
                 if recipientID == nil { return nil }
             }
 
-            var route: [Data]? = nil
-            var remainingPayloadBytes = payloadLength
-
-            if (flags & Flags.hasRoute) != 0 {
-                guard remainingPayloadBytes >= 1, let routeCount = read8() else { return nil }
-                remainingPayloadBytes -= 1
-                if routeCount > 0 {
-                    var hops: [Data] = []
-                    for _ in 0..<Int(routeCount) {
-                        guard remainingPayloadBytes >= senderIDSize,
-                              let hop = readData(senderIDSize) else { return nil }
-                        remainingPayloadBytes -= senderIDSize
-                        hops.append(hop)
-                    }
-                    route = hops
-                }
-            }
-
             let payload: Data
             if isCompressed {
-                guard remainingPayloadBytes >= lengthFieldBytes else { return nil }
+                guard payloadLength >= lengthFieldBytes else { return nil }
                 let originalSize: Int
                 if version == 2 {
                     guard let rawSize = read32() else { return nil }
@@ -372,12 +332,16 @@ struct BinaryProtocol {
                     guard let rawSize = read16() else { return nil }
                     originalSize = Int(rawSize)
                 }
-                remainingPayloadBytes -= lengthFieldBytes
+                // Guard to keep decompression bounded to sane BLE payload limits
+                // Use maxFramedFileBytes to account for TLV overhead in file transfer payloads
                 guard originalSize >= 0 && originalSize <= FileTransferLimits.maxFramedFileBytes else { return nil }
-                let compressedSize = remainingPayloadBytes
-                guard compressedSize > 0, let compressed = readData(compressedSize) else { return nil }
-                remainingPayloadBytes = 0
+                let compressedSize = payloadLength - lengthFieldBytes
+                guard compressedSize >= 0, let compressed = readData(compressedSize) else { return nil }
 
+                // Validate compression ratio to prevent zip bomb attacks
+                // Primary protection: originalSize capped at 1MB (line 336)
+                // Defense-in-depth: reject extreme ratios (prevents DoS via memory allocation)
+                guard compressedSize > 0 else { return nil }
                 let compressionRatio = Double(originalSize) / Double(compressedSize)
                 guard compressionRatio <= 50_000.0 else {
                     SecureLogger.warning("🚫 Suspicious compression ratio: \(String(format: "%.0f", compressionRatio)):1", category: .security)
@@ -388,9 +352,7 @@ struct BinaryProtocol {
                       decompressed.count == originalSize else { return nil }
                 payload = decompressed
             } else {
-                guard remainingPayloadBytes >= 0,
-                      let rawPayload = readData(remainingPayloadBytes) else { return nil }
-                remainingPayloadBytes = 0
+                guard let rawPayload = readData(payloadLength) else { return nil }
                 payload = rawPayload
             }
 
@@ -410,8 +372,7 @@ struct BinaryProtocol {
                 payload: payload,
                 signature: signature,
                 ttl: ttl,
-                version: version,
-                route: route
+                version: version
             )
         }
     }

bitchat/Protocols/BitchatProtocol.swift

@@ -178,7 +178,7 @@ protocol BitchatDelegate: AnyObject {
 
     // Bluetooth state updates for user notifications
     func didUpdateBluetoothState(_ state: CBManagerState)
-    func didReceivePublicMessage(from peerID: PeerID, nickname: String, content: String, timestamp: Date, messageID: String?)
+    func didReceivePublicMessage(from peerID: PeerID, nickname: String, content: String, timestamp: Date)
 }
 
 // Provide default implementation to make it effectively optional
@@ -195,7 +195,7 @@ extension BitchatDelegate {
         // Default empty implementation
     }
 
-    func didReceivePublicMessage(from peerID: PeerID, nickname: String, content: String, timestamp: Date, messageID: String?) {
+    func didReceivePublicMessage(from peerID: PeerID, nickname: String, content: String, timestamp: Date) {
         // Default empty implementation
     }
 }

bitchat/Protocols/LocationChannel.swift

@@ -116,18 +116,4 @@ enum ChannelID: Equatable, Codable {
         case .location(let ch): return ch.geohash
         }
     }
-    
-    var isMesh: Bool {
-        switch self {
-        case .mesh:     true
-        case .location: false
-        }
-    }
-    
-    var isLocation: Bool {
-        switch self {
-        case .mesh:     false
-        case .location: true
-        }
-    }
 }

bitchat/Protocols/Packets.swift

@@ -6,13 +6,11 @@ struct AnnouncementPacket {
     let nickname: String
     let noisePublicKey: Data            // Noise static public key (Curve25519.KeyAgreement)
     let signingPublicKey: Data          // Ed25519 public key for signing
-    let directNeighbors: [Data]?        // 8-byte peer IDs
 
     private enum TLVType: UInt8 {
         case nickname = 0x01
         case noisePublicKey = 0x02
         case signingPublicKey = 0x03
-        case directNeighbors = 0x04
     }
 
     func encode() -> Data? {
@@ -37,16 +35,6 @@ struct AnnouncementPacket {
         data.append(TLVType.signingPublicKey.rawValue)
         data.append(UInt8(signingPublicKey.count))
         data.append(signingPublicKey)
-        
-        // TLV for direct neighbors (optional)
-        if let neighbors = directNeighbors, !neighbors.isEmpty {
-            let neighborsData = neighbors.prefix(10).reduce(Data()) { $0 + $1 }
-            if !neighborsData.isEmpty && neighborsData.count % 8 == 0 {
-                data.append(TLVType.directNeighbors.rawValue)
-                data.append(UInt8(neighborsData.count))
-                data.append(neighborsData)
-            }
-        }
 
         return data
     }
@@ -56,7 +44,6 @@ struct AnnouncementPacket {
         var nickname: String?
         var noisePublicKey: Data?
         var signingPublicKey: Data?
-        var directNeighbors: [Data]?
 
         while offset + 2 <= data.count {
             let typeRaw = data[offset]
@@ -76,17 +63,6 @@ struct AnnouncementPacket {
                     noisePublicKey = Data(value)
                 case .signingPublicKey:
                     signingPublicKey = Data(value)
-                case .directNeighbors:
-                    if length > 0 && length % 8 == 0 {
-                        var neighbors = [Data]()
-                        let count = length / 8
-                        for i in 0..<count {
-                            let start = value.startIndex + i * 8
-                            let end = start + 8
-                            neighbors.append(Data(value[start..<end]))
-                        }
-                        directNeighbors = neighbors
-                    }
                 }
             } else {
                 // Unknown TLV; skip (tolerant decoder for forward compatibility)
@@ -98,8 +74,7 @@ struct AnnouncementPacket {
         return AnnouncementPacket(
             nickname: nickname,
             noisePublicKey: noisePublicKey,
-            signingPublicKey: signingPublicKey,
-            directNeighbors: directNeighbors
+            signingPublicKey: signingPublicKey
         )
     }
 }

bitchat/Services/BLE/MimeType.swift

@@ -1,195 +0,0 @@
-//
-// MimeType.swift
-// bitchat
-//
-// This is free and unencumbered software released into the public domain.
-// For more information, see <https://unlicense.org>
-//
-
-import UniformTypeIdentifiers
-
-// MARK: - Extensions for missing UTTypes
-
-extension UTType {
-    static let webP = UTType(importedAs: "image/webp")
-    static let aac  = UTType(importedAs: "audio/aac")
-    static let m4a  = UTType(importedAs: "audio/m4a")
-    static let ogg  = UTType(importedAs: "audio/ogg")
-}
-
-// MARK: - MimeType Enum
-
-enum MimeType: CaseIterable, Hashable {
-    case jpeg
-    case jpg
-    case png
-    case gif
-    case webp
-    case mp4Audio
-    case m4a
-    case aac
-    case mpeg
-    case mp3
-    case wav
-    case xWav
-    case ogg
-    case pdf
-    case octetStream
-
-    var utType: UTType {
-        switch self {
-        case .jpeg, .jpg:   .jpeg
-        case .png:          .png
-        case .gif:          .gif
-        case .webp:         .webP
-        case .aac:          .aac
-        case .m4a:          .m4a
-        case .mp4Audio:     .mpeg4Audio
-        case .mp3, .mpeg:   .mp3
-        case .wav, .xWav:   .wav
-        case .ogg:          .ogg
-        case .pdf:          .pdf
-        case .octetStream:  .data
-        }
-    }
-    
-    var category: Category {
-        switch self {
-        case .jpeg, .jpg, .png, .gif, .webp:
-            return .image
-        case .aac, .m4a, .mp4Audio, .mpeg, .mp3, .wav, .xWav, .ogg:
-            return .audio
-        case .pdf, .octetStream:
-            return .file
-        }
-    }
-
-
-    var mimeString: String {
-        switch self {
-        case .jpeg, .jpg:   "image/jpeg"
-        case .png:          "image/png"
-        case .gif:          "image/gif"
-        case .webp:         "image/webp"
-        case .mp4Audio:     "audio/mp4"
-        case .m4a:          "audio/m4a"
-        case .aac:          "audio/aac"
-        case .mpeg:         "audio/mpeg"
-        case .mp3:          "audio/mp3"
-        case .wav:          "audio/wav"
-        case .xWav:         "audio/x-wav"
-        case .ogg:          "audio/ogg"
-        case .pdf:          "application/pdf"
-        case .octetStream:  "application/octet-stream"
-        }
-    }
-    
-    var defaultExtension: String {
-        switch self {
-        case .jpeg, .jpg:           "jpg"
-        case .png:                  "png"
-        case .webp:                 "webp"
-        case .gif:                  "gif"
-        case .mp4Audio, .m4a, .aac: "m4a"
-        case .mpeg, .mp3:           "mp3"
-        case .wav, .xWav:           "wav"
-        case .ogg:                  "ogg"
-        case .pdf:                  "pdf"
-        case .octetStream:          "bin"
-        }
-    }
-
-    static var allowed: Set<MimeType> = [
-        .jpeg, .jpg, .png, .gif, .webp,
-        .mp4Audio, .m4a, .aac, .mpeg, .mp3,
-        .wav, .xWav, .ogg,
-        .pdf, .octetStream
-    ]
-
-    var isAllowed: Bool {
-        Self.allowed.contains(self)
-    }
-
-    // MARK: - Byte signature validation
-    func matches(data: Data) -> Bool {
-        guard !data.isEmpty else { return false }
-
-        // Generic type → skip validation
-        if self == .octetStream { return true }
-
-        switch self {
-        case .jpeg, .jpg:
-            return data.count >= 3 && data[0] == 0xFF && data[1] == 0xD8 && data[2] == 0xFF
-
-        case .png:
-            return data.count >= 8 &&
-                   data[0] == 0x89 && data[1] == 0x50 && data[2] == 0x4E && data[3] == 0x47 &&
-                   data[4] == 0x0D && data[5] == 0x0A && data[6] == 0x1A && data[7] == 0x0A
-
-        case .gif:
-            return data.count >= 6 && data[0] == 0x47 && data[1] == 0x49 && data[2] == 0x46 &&
-                   data[3] == 0x38 && (data[4] == 0x37 || data[4] == 0x39) && data[5] == 0x61
-
-        case .webp:
-            return data.count >= 12 &&
-                   data[0] == 0x52 && data[1] == 0x49 && data[2] == 0x46 && data[3] == 0x46 &&
-                   data[8] == 0x57 && data[9] == 0x45 && data[10] == 0x42 && data[11] == 0x50
-
-        case .m4a, .mp4Audio, .aac:
-            // AVAudioRecorder output varies by platform - be lenient
-            // Security: size already capped + sandboxed execution
-            return data.count > 100
-
-        case .mpeg, .mp3:
-            if data.count >= 3 && data[0] == 0x49 && data[1] == 0x44 && data[2] == 0x33 {
-                return true // ID3 header
-            }
-            return data.count >= 2 && data[0] == 0xFF && (data[1] & 0xE0) == 0xE0
-
-        case .wav, .xWav:
-            return data.count >= 12 &&
-                   data[0] == 0x52 && data[1] == 0x49 && data[2] == 0x46 && data[3] == 0x46 &&
-                   data[8] == 0x57 && data[9] == 0x41 && data[10] == 0x56 && data[11] == 0x45
-
-        case .ogg:
-            return data.count >= 4 &&
-                   data[0] == 0x4F && data[1] == 0x67 && data[2] == 0x67 && data[3] == 0x53
-
-        case .pdf:
-            return data.count >= 4 &&
-                   data[0] == 0x25 && data[1] == 0x50 && data[2] == 0x44 && data[3] == 0x46
-
-        default:
-            return false
-        }
-    }
-
-    // MARK: - Convenience Initializers
-
-    init?(_ mimeString: String?) {
-        guard let mimeString else { return nil }
-        
-        let normalized = mimeString.lowercased()
-
-        // Direct match with our canonical list
-        if let match = MimeType.allCases.first(where: { $0.mimeString == normalized }) {
-            self = match
-            return
-        }
-
-        // Let UTType normalize aliases like "image/jpg", "audio/x-wav", etc.
-        if let type = UTType(mimeType: normalized),
-           let match = MimeType.allCases.first(where: { type.conforms(to: $0.utType) }) {
-            self = match
-            return
-        }
-
-        return nil
-    }
-}
-
-extension MimeType {
-    enum Category: String {
-        case audio, image, file
-    }
-}

bitchat/Services/CommandProcessor.swift

@@ -15,66 +15,18 @@ enum CommandResult {
     case handled  // Command handled, no message needed
 }
 
-/// Simple struct for geo participant info used by CommandProcessor
-struct CommandGeoParticipant {
-    let id: String        // pubkey hex (lowercased)
-    let displayName: String
-}
-
-/// Protocol defining what CommandProcessor needs from its context.
-/// This breaks the circular dependency between CommandProcessor and ChatViewModel.
-@MainActor
-protocol CommandContextProvider: AnyObject {
-    // MARK: - State Properties
-    var nickname: String { get }
-    var selectedPrivateChatPeer: PeerID? { get }
-    var blockedUsers: Set<String> { get }
-    var privateChats: [PeerID: [BitchatMessage]] { get set }
-    var idBridge: NostrIdentityBridge { get }
-
-    // MARK: - Peer Lookup
-    func getPeerIDForNickname(_ nickname: String) -> PeerID?
-    func getVisibleGeoParticipants() -> [CommandGeoParticipant]
-    func nostrPubkeyForDisplayName(_ displayName: String) -> String?
-
-    // MARK: - Chat Actions
-    func startPrivateChat(with peerID: PeerID)
-    func sendPrivateMessage(_ content: String, to peerID: PeerID)
-    func clearCurrentPublicTimeline()
-    func sendPublicRaw(_ content: String)
-
-    // MARK: - System Messages
-    func addLocalPrivateSystemMessage(_ content: String, to peerID: PeerID)
-    func addPublicSystemMessage(_ content: String)
-
-    // MARK: - Favorites
-    func toggleFavorite(peerID: PeerID)
-    func sendFavoriteNotification(to peerID: PeerID, isFavorite: Bool)
-}
-
 /// Processes chat commands in a focused, efficient way
 @MainActor
 final class CommandProcessor {
-    weak var contextProvider: CommandContextProvider?
+    weak var chatViewModel: ChatViewModel?
     weak var meshService: Transport?
     private let identityManager: SecureIdentityStateManagerProtocol
-
-    /// Backward-compatible property for existing code
-    weak var chatViewModel: CommandContextProvider? {
-        get { contextProvider }
-        set { contextProvider = newValue }
-    }
-
-    init(contextProvider: CommandContextProvider? = nil, meshService: Transport? = nil, identityManager: SecureIdentityStateManagerProtocol) {
-        self.contextProvider = contextProvider
+    
+    init(chatViewModel: ChatViewModel? = nil, meshService: Transport? = nil, identityManager: SecureIdentityStateManagerProtocol) {
+        self.chatViewModel = chatViewModel
         self.meshService = meshService
         self.identityManager = identityManager
     }
-
-    /// Backward-compatible initializer
-    convenience init(chatViewModel: ChatViewModel? = nil, meshService: Transport? = nil, identityManager: SecureIdentityStateManagerProtocol) {
-        self.init(contextProvider: chatViewModel, meshService: meshService, identityManager: identityManager)
-    }
     
     /// Process a command string
     @MainActor
@@ -90,7 +42,7 @@ final class CommandProcessor {
             case .location: return true
             }
         }()
-        let inGeoDM = contextProvider?.selectedPrivateChatPeer?.isGeoDM == true
+        let inGeoDM = chatViewModel?.selectedPrivateChatPeer?.isGeoDM == true
 
         switch cmd {
         case "/m", "/msg":
@@ -129,15 +81,15 @@ final class CommandProcessor {
         let targetName = String(parts[0])
         let nickname = targetName.hasPrefix("@") ? String(targetName.dropFirst()) : targetName
         
-        guard let peerID = contextProvider?.getPeerIDForNickname(nickname) else {
+        guard let peerID = chatViewModel?.getPeerIDForNickname(nickname) else {
             return .error(message: "'\(nickname)' not found")
         }
-
-        contextProvider?.startPrivateChat(with: peerID)
-
+        
+        chatViewModel?.startPrivateChat(with: peerID)
+        
         if parts.count > 1 {
             let message = String(parts[1])
-            contextProvider?.sendPrivateMessage(message, to: peerID)
+            chatViewModel?.sendPrivateMessage(message, to: peerID)
         }
         
         return .success(message: "started private chat with \(nickname)")
@@ -148,9 +100,9 @@ final class CommandProcessor {
         switch LocationChannelManager.shared.selectedChannel {
         case .location(let ch):
             // Geohash context: show visible geohash participants (exclude self)
-            guard let vm = contextProvider else { return .success(message: "nobody around") }
-            let myHex = (try? vm.idBridge.deriveIdentity(forGeohash: ch.geohash))?.publicKeyHex.lowercased()
-            let people = vm.getVisibleGeoParticipants().filter { person in
+            guard let vm = chatViewModel else { return .success(message: "nobody around") }
+            let myHex = (try? chatViewModel?.idBridge.deriveIdentity(forGeohash: ch.geohash))?.publicKeyHex.lowercased()
+            let people = vm.visibleGeohashPeople().filter { person in
                 if let me = myHex { return person.id.lowercased() != me }
                 return true
             }
@@ -168,10 +120,10 @@ final class CommandProcessor {
     }
     
     private func handleClear() -> CommandResult {
-        if let peerID = contextProvider?.selectedPrivateChatPeer {
-            contextProvider?.privateChats[peerID]?.removeAll()
+        if let peerID = chatViewModel?.selectedPrivateChatPeer {
+            chatViewModel?.privateChats[peerID]?.removeAll()
         } else {
-            contextProvider?.clearCurrentPublicTimeline()
+            chatViewModel?.clearCurrentPublicTimeline()
         }
         return .handled
     }
@@ -184,14 +136,14 @@ final class CommandProcessor {
         
         let nickname = targetName.hasPrefix("@") ? String(targetName.dropFirst()) : targetName
         
-        guard let targetPeerID = contextProvider?.getPeerIDForNickname(nickname),
-              let myNickname = contextProvider?.nickname else {
+        guard let targetPeerID = chatViewModel?.getPeerIDForNickname(nickname),
+              let myNickname = chatViewModel?.nickname else {
             return .error(message: "cannot \(command) \(nickname): not found")
         }
         
         let emoteContent = "* \(emoji) \(myNickname) \(action) \(nickname)\(suffix) *"
         
-        if contextProvider?.selectedPrivateChatPeer != nil {
+        if chatViewModel?.selectedPrivateChatPeer != nil {
             // In private chat
             if let peerNickname = meshService?.peerNickname(peerID: targetPeerID) {
                 let personalMessage = "* \(emoji) \(myNickname) \(action) you\(suffix) *"
@@ -207,13 +159,13 @@ final class CommandProcessor {
                     }
                 }()
                 let localText = "\(emoji) you \(pastAction) \(nickname)\(suffix)"
-                contextProvider?.addLocalPrivateSystemMessage(localText, to: targetPeerID)
+                chatViewModel?.addLocalPrivateSystemMessage(localText, to: targetPeerID)
             }
         } else {
             // In public chat: send to active public channel (mesh or geohash)
-            contextProvider?.sendPublicRaw(emoteContent)
+            chatViewModel?.sendPublicRaw(emoteContent)
             let publicEcho = "\(emoji) \(myNickname) \(action) \(nickname)\(suffix)"
-            contextProvider?.addPublicSystemMessage(publicEcho)
+            chatViewModel?.addPublicSystemMessage(publicEcho)
         }
         
         return .handled
@@ -224,7 +176,7 @@ final class CommandProcessor {
         
         if targetName.isEmpty {
             // List blocked users (mesh) and geohash (Nostr) blocks
-            let meshBlocked = contextProvider?.blockedUsers ?? []
+            let meshBlocked = chatViewModel?.blockedUsers ?? []
             var blockedNicknames: [String] = []
             if let peers = meshService?.getPeerNicknames() {
                 for (peerID, nickname) in peers {
@@ -238,8 +190,8 @@ final class CommandProcessor {
             // Geohash blocked names (prefer visible display names; fallback to #suffix)
             let geoBlocked = Array(identityManager.getBlockedNostrPubkeys())
             var geoNames: [String] = []
-            if let vm = contextProvider {
-                let visible = vm.getVisibleGeoParticipants()
+            if let vm = chatViewModel {
+                let visible = vm.visibleGeohashPeople()
                 let visibleIndex = Dictionary(uniqueKeysWithValues: visible.map { ($0.id.lowercased(), $0.displayName) })
                 for pk in geoBlocked {
                     if let name = visibleIndex[pk.lowercased()] {
@@ -258,7 +210,7 @@ final class CommandProcessor {
         
         let nickname = targetName.hasPrefix("@") ? String(targetName.dropFirst()) : targetName
         
-        if let peerID = contextProvider?.getPeerIDForNickname(nickname),
+        if let peerID = chatViewModel?.getPeerIDForNickname(nickname),
            let fingerprint = meshService?.getFingerprint(for: peerID) {
             if identityManager.isBlocked(fingerprint: fingerprint) {
                 return .success(message: "\(nickname) is already blocked")
@@ -283,7 +235,7 @@ final class CommandProcessor {
             return .success(message: "blocked \(nickname). you will no longer receive messages from them")
         }
         // Mesh lookup failed; try geohash (Nostr) participant by display name
-        if let pub = contextProvider?.nostrPubkeyForDisplayName(nickname) {
+        if let pub = chatViewModel?.nostrPubkeyForDisplayName(nickname) {
             if identityManager.isNostrBlocked(pubkeyHexLowercased: pub) {
                 return .success(message: "\(nickname) is already blocked")
             }
@@ -302,7 +254,7 @@ final class CommandProcessor {
         
         let nickname = targetName.hasPrefix("@") ? String(targetName.dropFirst()) : targetName
         
-        if let peerID = contextProvider?.getPeerIDForNickname(nickname),
+        if let peerID = chatViewModel?.getPeerIDForNickname(nickname),
            let fingerprint = meshService?.getFingerprint(for: peerID) {
             if !identityManager.isBlocked(fingerprint: fingerprint) {
                 return .success(message: "\(nickname) is not blocked")
@@ -311,7 +263,7 @@ final class CommandProcessor {
             return .success(message: "unblocked \(nickname)")
         }
         // Try geohash unblock
-        if let pub = contextProvider?.nostrPubkeyForDisplayName(nickname) {
+        if let pub = chatViewModel?.nostrPubkeyForDisplayName(nickname) {
             if !identityManager.isNostrBlocked(pubkeyHexLowercased: pub) {
                 return .success(message: "\(nickname) is not blocked")
             }
@@ -329,7 +281,7 @@ final class CommandProcessor {
         
         let nickname = targetName.hasPrefix("@") ? String(targetName.dropFirst()) : targetName
         
-        guard let peerID = contextProvider?.getPeerIDForNickname(nickname),
+        guard let peerID = chatViewModel?.getPeerIDForNickname(nickname),
               let noisePublicKey = Data(hexString: peerID.id) else {
             return .error(message: "can't find peer: \(nickname)")
         }
@@ -342,15 +294,15 @@ final class CommandProcessor {
                 peerNickname: nickname
             )
             
-            contextProvider?.toggleFavorite(peerID: peerID)
-            contextProvider?.sendFavoriteNotification(to: peerID, isFavorite: true)
+            chatViewModel?.toggleFavorite(peerID: peerID)
+            chatViewModel?.sendFavoriteNotification(to: peerID, isFavorite: true)
             
             return .success(message: "added \(nickname) to favorites")
         } else {
             FavoritesPersistenceService.shared.removeFavorite(peerNoisePublicKey: noisePublicKey)
             
-            contextProvider?.toggleFavorite(peerID: peerID)
-            contextProvider?.sendFavoriteNotification(to: peerID, isFavorite: false)
+            chatViewModel?.toggleFavorite(peerID: peerID)
+            chatViewModel?.sendFavoriteNotification(to: peerID, isFavorite: false)
             
             return .success(message: "removed \(nickname) from favorites")
         }

bitchat/Services/GeohashBookmarksStore.swift

@@ -0,0 +1,219 @@
+import Foundation
+import Combine
+#if os(iOS) || os(macOS)
+import CoreLocation
+#endif
+
+/// Stores a user-maintained list of bookmarked geohash channels.
+/// - Persistence: UserDefaults (JSON string array)
+/// - Semantics: geohashes are normalized to lowercase base32 and de-duplicated
+final class GeohashBookmarksStore: ObservableObject {
+    static let shared = GeohashBookmarksStore()
+
+    @Published private(set) var bookmarks: [String] = []
+    @Published private(set) var bookmarkNames: [String: String] = [:] // geohash -> friendly name
+
+    private let storeKey = "locationChannel.bookmarks"
+    private let namesStoreKey = "locationChannel.bookmarkNames"
+    private var membership: Set<String> = []
+    #if os(iOS) || os(macOS)
+    private let geocoder = CLGeocoder()
+    private var resolving: Set<String> = []
+    #endif
+    
+    private let storage: UserDefaults
+
+    init(storage: UserDefaults = .standard) {
+        self.storage = storage
+        load()
+    }
+
+    // MARK: - Public API
+    func isBookmarked(_ geohash: String) -> Bool {
+        return membership.contains(Self.normalize(geohash))
+    }
+
+    func toggle(_ geohash: String) {
+        let gh = Self.normalize(geohash)
+        if membership.contains(gh) {
+            remove(gh)
+        } else {
+            add(gh)
+        }
+    }
+
+    func add(_ geohash: String) {
+        let gh = Self.normalize(geohash)
+        guard !gh.isEmpty else { return }
+        guard !membership.contains(gh) else { return }
+        bookmarks.insert(gh, at: 0)
+        membership.insert(gh)
+        persist()
+        // Resolve and persist a friendly name once when added
+        resolveNameIfNeeded(for: gh)
+    }
+
+    func remove(_ geohash: String) {
+        let gh = Self.normalize(geohash)
+        guard membership.contains(gh) else { return }
+        if let idx = bookmarks.firstIndex(of: gh) { bookmarks.remove(at: idx) }
+        membership.remove(gh)
+        // Clean up stored name to avoid stale cache growth
+        if bookmarkNames.removeValue(forKey: gh) != nil {
+            persistNames()
+        }
+        persist()
+    }
+
+    // MARK: - Persistence
+    private func load() {
+        guard let data = storage.data(forKey: storeKey) else { return }
+        if let arr = try? JSONDecoder().decode([String].self, from: data) {
+            // Sanitize, normalize, dedupe while preserving order (first occurrence wins)
+            var seen = Set<String>()
+            var list: [String] = []
+            for raw in arr {
+                let gh = Self.normalize(raw)
+                guard !gh.isEmpty else { continue }
+                if !seen.contains(gh) {
+                    seen.insert(gh)
+                    list.append(gh)
+                }
+            }
+            bookmarks = list
+            membership = seen
+        }
+        // Load any saved names
+        if let namesData = storage.data(forKey: namesStoreKey),
+           let dict = try? JSONDecoder().decode([String: String].self, from: namesData) {
+            bookmarkNames = dict
+        }
+    }
+
+    private func persist() {
+        if let data = try? JSONEncoder().encode(bookmarks) {
+            storage.set(data, forKey: storeKey)
+        }
+    }
+
+    private func persistNames() {
+        if let data = try? JSONEncoder().encode(bookmarkNames) {
+            storage.set(data, forKey: namesStoreKey)
+        }
+    }
+
+    // MARK: - Helpers
+    private static func normalize(_ s: String) -> String {
+        let allowed = Set("0123456789bcdefghjkmnpqrstuvwxyz")
+        return s
+            .trimmingCharacters(in: .whitespacesAndNewlines)
+            .lowercased()
+            .replacingOccurrences(of: "#", with: "")
+            .filter { allowed.contains($0) }
+    }
+
+    // MARK: - Name Resolution
+    /// Attempt to resolve and persist a friendly place name for a bookmarked geohash.
+    func resolveNameIfNeeded(for geohash: String) {
+        let gh = Self.normalize(geohash)
+        guard !gh.isEmpty else { return }
+        if bookmarkNames[gh] != nil { return }
+        #if os(iOS) || os(macOS)
+        if resolving.contains(gh) { return }
+        resolving.insert(gh)
+        // For very coarse geohashes, sample multiple points to capture multiple admin areas
+        if gh.count <= 2 {
+            let b = Geohash.decodeBounds(gh)
+            let pts: [CLLocation] = [
+                CLLocation(latitude: (b.latMin + b.latMax) / 2, longitude: (b.lonMin + b.lonMax) / 2), // center
+                CLLocation(latitude: b.latMin, longitude: b.lonMin),
+                CLLocation(latitude: b.latMin, longitude: b.lonMax),
+                CLLocation(latitude: b.latMax, longitude: b.lonMin),
+                CLLocation(latitude: b.latMax, longitude: b.lonMax)
+            ]
+            resolveCompositeAdminName(geohash: gh, points: pts)
+        } else {
+            let center = Geohash.decodeCenter(gh)
+            let loc = CLLocation(latitude: center.lat, longitude: center.lon)
+            geocoder.reverseGeocodeLocation(loc) { [weak self] placemarks, _ in
+                guard let self = self else { return }
+                defer { self.resolving.remove(gh) }
+                if let pm = placemarks?.first {
+                    let name = Self.nameForGeohashLength(gh.count, from: pm)
+                    if let name = name, !name.isEmpty {
+                        DispatchQueue.main.async {
+                            self.bookmarkNames[gh] = name
+                            self.persistNames()
+                        }
+                    }
+                }
+            }
+        }
+        #endif
+    }
+
+    #if os(iOS) || os(macOS)
+    private func resolveCompositeAdminName(geohash gh: String, points: [CLLocation]) {
+        var uniqueAdmins = OrderedSet<String>()
+        var idx = 0
+        func step() {
+            if idx >= points.count {
+                // Compose up to 2 names joined by ' and '
+                let finalName: String? = {
+                    let names = uniqueAdmins.array
+                    if names.count >= 2 { return names[0] + " and " + names[1] }
+                    return names.first
+                }()
+                if let finalName = finalName, !finalName.isEmpty {
+                    DispatchQueue.main.async {
+                        self.bookmarkNames[gh] = finalName
+                        self.persistNames()
+                    }
+                }
+                self.resolving.remove(gh)
+                return
+            }
+            let loc = points[idx]
+            idx += 1
+            geocoder.reverseGeocodeLocation(loc) { [weak self] placemarks, _ in
+                guard self != nil else { return }
+                if let pm = placemarks?.first {
+                    if let admin = pm.administrativeArea, !admin.isEmpty {
+                        uniqueAdmins.insert(admin)
+                    } else if let country = pm.country, !country.isEmpty {
+                        uniqueAdmins.insert(country)
+                    }
+                }
+                // Proceed to next point
+                step()
+            }
+        }
+        step()
+    }
+
+    // Minimal ordered-set for stable joining
+    private struct OrderedSet<Element: Hashable> {
+        private var set: Set<Element> = []
+        private(set) var array: [Element] = []
+        mutating func insert(_ element: Element) {
+            if set.insert(element).inserted { array.append(element) }
+        }
+    }
+
+    private static func nameForGeohashLength(_ len: Int, from pm: CLPlacemark) -> String? {
+        switch len {
+        case 0...2:
+            // Prefer administrative area if available at this coarse level
+            return pm.administrativeArea ?? pm.country
+        case 3...4:
+            return pm.administrativeArea ?? pm.subAdministrativeArea ?? pm.country
+        case 5:
+            return pm.locality ?? pm.subAdministrativeArea ?? pm.administrativeArea
+        case 6...7:
+            return pm.subLocality ?? pm.locality ?? pm.administrativeArea
+        default:
+            return pm.subLocality ?? pm.locality ?? pm.administrativeArea ?? pm.country
+        }
+    }
+    #endif
+}

bitchat/Services/GeohashParticipantTracker.swift

@@ -1,159 +0,0 @@
-//
-// GeohashParticipantTracker.swift
-// bitchat
-//
-// Tracks participants in geohash-based location channels.
-// This is free and unencumbered software released into the public domain.
-//
-
-import Foundation
-
-/// Represents a participant in a geohash channel
-public struct GeoPerson: Identifiable, Equatable, Sendable {
-    public let id: String        // pubkey hex (lowercased)
-    public let displayName: String
-    public let lastSeen: Date
-
-    public init(id: String, displayName: String, lastSeen: Date) {
-        self.id = id
-        self.displayName = displayName
-        self.lastSeen = lastSeen
-    }
-}
-
-/// Protocol for resolving display names and checking block status
-@MainActor
-public protocol GeohashParticipantContext: AnyObject {
-    /// Returns display name for a Nostr pubkey (e.g., "alice#a1b2" or "anon#c3d4")
-    func displayNameForPubkey(_ pubkeyHex: String) -> String
-    /// Returns true if the pubkey is blocked
-    func isBlocked(_ pubkeyHexLowercased: String) -> Bool
-}
-
-/// Tracks participants across multiple geohash channels
-@MainActor
-public final class GeohashParticipantTracker: ObservableObject {
-
-    /// Activity cutoff duration (defaults to 5 minutes)
-    public let activityCutoff: TimeInterval
-
-    /// Per-geohash participant map: [geohash: [pubkeyHex: lastSeen]]
-    private var participants: [String: [String: Date]] = [:]
-
-    /// Currently visible people for the active geohash
-    @Published public private(set) var visiblePeople: [GeoPerson] = []
-
-    /// The currently active geohash (if any)
-    private var activeGeohash: String?
-
-    /// Context for display name resolution and block checking
-    private weak var context: GeohashParticipantContext?
-
-    /// Timer for periodic refresh
-    private var refreshTimer: Timer?
-
-    public init(activityCutoff: TimeInterval = -300) { // default 5 minutes
-        self.activityCutoff = activityCutoff
-    }
-
-    /// Configure with a context provider
-    public func configure(context: GeohashParticipantContext) {
-        self.context = context
-    }
-
-    /// Set the currently active geohash
-    public func setActiveGeohash(_ geohash: String?) {
-        activeGeohash = geohash
-        if geohash == nil {
-            visiblePeople = []
-        } else {
-            refresh()
-        }
-    }
-
-    /// Record activity from a participant in the current active geohash
-    public func recordParticipant(pubkeyHex: String) {
-        guard let gh = activeGeohash else { return }
-        recordParticipant(pubkeyHex: pubkeyHex, geohash: gh)
-    }
-
-    /// Record activity from a participant in a specific geohash
-    public func recordParticipant(pubkeyHex: String, geohash: String) {
-        let key = pubkeyHex.lowercased()
-        var map = participants[geohash] ?? [:]
-        map[key] = Date()
-        participants[geohash] = map
-
-        // Only refresh visible list if this geohash is currently active
-        if activeGeohash == geohash {
-            refresh()
-        }
-    }
-
-    /// Remove a participant from all geohashes (used when blocking)
-    public func removeParticipant(pubkeyHex: String) {
-        let key = pubkeyHex.lowercased()
-        for (gh, var map) in participants {
-            map.removeValue(forKey: key)
-            participants[gh] = map
-        }
-        refresh()
-    }
-
-    /// Get participant count for a specific geohash
-    public func participantCount(for geohash: String) -> Int {
-        let cutoff = Date().addingTimeInterval(activityCutoff)
-        let map = participants[geohash] ?? [:]
-        return map.values.filter { $0 >= cutoff }.count
-    }
-
-    /// Get the visible people list for the active geohash (read-only query)
-    public func getVisiblePeople() -> [GeoPerson] {
-        guard let gh = activeGeohash, let context = context else { return [] }
-        let cutoff = Date().addingTimeInterval(activityCutoff)
-        let map = (participants[gh] ?? [:])
-            .filter { $0.value >= cutoff }
-            .filter { !context.isBlocked($0.key) }
-
-        return map
-            .map { (pub, seen) in
-                GeoPerson(id: pub, displayName: context.displayNameForPubkey(pub), lastSeen: seen)
-            }
-            .sorted { $0.lastSeen > $1.lastSeen }
-    }
-
-    /// Refresh the visible people list
-    public func refresh() {
-        visiblePeople = getVisiblePeople()
-    }
-
-    /// Start the periodic refresh timer
-    public func startRefreshTimer(interval: TimeInterval = 30.0) {
-        stopRefreshTimer()
-        refreshTimer = Timer.scheduledTimer(withTimeInterval: interval, repeats: true) { [weak self] _ in
-            Task { @MainActor in
-                self?.refresh()
-            }
-        }
-    }
-
-    /// Stop the periodic refresh timer
-    public func stopRefreshTimer() {
-        refreshTimer?.invalidate()
-        refreshTimer = nil
-    }
-
-    /// Clear all participant data
-    public func clear() {
-        participants.removeAll()
-        visiblePeople = []
-    }
-
-    /// Clear participant data for a specific geohash
-    public func clear(geohash: String) {
-        participants.removeValue(forKey: geohash)
-        if activeGeohash == geohash {
-            visiblePeople = []
-        }
-    }
-}

bitchat/Services/LocationChannelManager.swift

@@ -0,0 +1,306 @@
+import BitLogger
+import Foundation
+import Combine
+
+#if os(iOS) || os(macOS)
+import CoreLocation
+
+/// Manages location permissions, one-shot location retrieval, and computing geohash channels.
+/// Not main-actor isolated to satisfy CLLocationManagerDelegate in Swift 6; state updates hop to MainActor.
+final class LocationChannelManager: NSObject, CLLocationManagerDelegate, ObservableObject {
+    static let shared = LocationChannelManager()
+
+    enum PermissionState: Equatable {
+        case notDetermined
+        case denied
+        case restricted
+        case authorized
+    }
+
+    private let cl = CLLocationManager()
+    private let geocoder = CLGeocoder()
+    private var lastLocation: CLLocation?
+    private var refreshTimer: Timer?
+    private let userDefaultsKey = "locationChannel.selected"
+    private let teleportedStoreKey = "locationChannel.teleportedSet"
+    private var isGeocoding: Bool = false
+
+    // Published state for UI bindings
+    @Published private(set) var permissionState: PermissionState = .notDetermined
+    @Published private(set) var availableChannels: [GeohashChannel] = []
+    @Published private(set) var selectedChannel: ChannelID = .mesh
+    // True when the current location channel was selected via manual teleport
+    @Published var teleported: Bool = false
+    @Published private(set) var locationNames: [GeohashChannelLevel: String] = [:]
+
+    // Persisted set of geohashes that were selected via teleport
+    private var teleportedSet: Set<String> = []
+
+    private override init() {
+        super.init()
+        cl.delegate = self
+        cl.desiredAccuracy = kCLLocationAccuracyHundredMeters
+        cl.distanceFilter = TransportConfig.locationDistanceFilterMeters // meters; we're not tracking continuously
+        // Load selection
+        if let data = UserDefaults.standard.data(forKey: userDefaultsKey),
+           let channel = try? JSONDecoder().decode(ChannelID.self, from: data) {
+            selectedChannel = channel
+        }
+        // Load persisted teleported set
+        if let data = UserDefaults.standard.data(forKey: teleportedStoreKey),
+           let arr = try? JSONDecoder().decode([String].self, from: data) {
+            teleportedSet = Set(arr)
+        }
+        // Do not eagerly mark teleported on startup; wait for location to compute regional set.
+        // This avoids showing teleported for in-region channels during cold start.
+        let status: CLAuthorizationStatus
+        if #available(iOS 14.0, macOS 11.0, *) {
+            status = cl.authorizationStatus
+        } else {
+            status = CLLocationManager.authorizationStatus()
+        }
+        updatePermissionState(from: status)
+        // If we don't have location authorization at startup, fall back to persisted teleport state
+        switch status {
+        case .authorizedAlways, .authorizedWhenInUse, .authorized:
+            break // will compute from location
+        case .notDetermined, .restricted, .denied:
+            fallthrough
+        @unknown default:
+            if case .location(let ch) = selectedChannel {
+                teleported = teleportedSet.contains(ch.geohash)
+            }
+        }
+    }
+
+    // MARK: - Public API
+    func enableLocationChannels() {
+        let status: CLAuthorizationStatus
+        if #available(iOS 14.0, macOS 11.0, *) {
+            status = cl.authorizationStatus
+        } else {
+            status = CLLocationManager.authorizationStatus()
+        }
+        switch status {
+        case .notDetermined:
+            cl.requestWhenInUseAuthorization()
+        case .restricted:
+            Task { @MainActor in self.permissionState = .restricted }
+        case .denied:
+            Task { @MainActor in self.permissionState = .denied }
+        case .authorizedAlways, .authorizedWhenInUse, .authorized:
+            Task { @MainActor in self.permissionState = .authorized }
+            requestOneShotLocation()
+        @unknown default:
+            Task { @MainActor in self.permissionState = .restricted }
+        }
+    }
+
+    func refreshChannels() {
+        if permissionState == .authorized {
+            requestOneShotLocation()
+        }
+    }
+
+    /// Begin continuous, distance-filtered updates while the channel sheet is visible.
+    /// Uses a 21m filter (configurable) to only refresh on meaningful movement.
+    func beginLiveRefresh(interval: TimeInterval = TransportConfig.locationLiveRefreshInterval) {
+        guard permissionState == .authorized else { return }
+        // Stop any previous polling timer
+        refreshTimer?.invalidate()
+        refreshTimer = nil
+        // Tighten accuracy and distance filter for live view
+        cl.desiredAccuracy = kCLLocationAccuracyNearestTenMeters
+        cl.distanceFilter = TransportConfig.locationDistanceFilterLiveMeters
+        // Start continuous updates
+        cl.startUpdatingLocation()
+        // Request an immediate fix to populate UI without waiting for movement
+        requestOneShotLocation()
+    }
+
+    /// Stop continuous refreshes when selector UI is dismissed.
+    func endLiveRefresh() {
+        refreshTimer?.invalidate()
+        refreshTimer = nil
+        cl.stopUpdatingLocation()
+        // Restore more relaxed defaults for background/idle state
+        cl.desiredAccuracy = kCLLocationAccuracyHundredMeters
+        cl.distanceFilter = TransportConfig.locationDistanceFilterMeters
+    }
+
+    func select(_ channel: ChannelID) {
+        Task { @MainActor in
+            self.selectedChannel = channel
+            if let data = try? JSONEncoder().encode(channel) {
+                UserDefaults.standard.set(data, forKey: self.userDefaultsKey)
+            }
+            // Update teleported flag based on persisted state for immediate UI behavior
+            switch channel {
+            case .mesh:
+                self.teleported = false
+            case .location(let ch):
+                // If this geohash is in our current regional set, do NOT mark teleported.
+                let inRegional = self.availableChannels.contains { $0.geohash == ch.geohash }
+                if inRegional {
+                    self.teleported = false
+                    // Clear persisted teleport for this geohash to keep future selections clean
+                    if self.teleportedSet.contains(ch.geohash) {
+                        self.teleportedSet.remove(ch.geohash)
+                        if let data = try? JSONEncoder().encode(Array(self.teleportedSet)) {
+                            UserDefaults.standard.set(data, forKey: self.teleportedStoreKey)
+                        }
+                    }
+                } else {
+                    // Fall back to persisted mark (set by deep link or manual teleport)
+                    self.teleported = self.teleportedSet.contains(ch.geohash)
+                }
+            }
+        }
+    }
+
+    // Mark or unmark a geohash as teleported in persistence and update current flag if relevant
+    func markTeleported(for geohash: String, _ flag: Bool) {
+        if flag { teleportedSet.insert(geohash) } else { teleportedSet.remove(geohash) }
+        if let data = try? JSONEncoder().encode(Array(teleportedSet)) {
+            UserDefaults.standard.set(data, forKey: teleportedStoreKey)
+        }
+        if case .location(let ch) = selectedChannel, ch.geohash == geohash {
+            Task { @MainActor in self.teleported = flag }
+        }
+    }
+
+    // MARK: - CoreLocation
+    private func requestOneShotLocation() {
+        cl.requestLocation()
+    }
+
+    // iOS < 14
+    func locationManager(_ manager: CLLocationManager, didChangeAuthorization status: CLAuthorizationStatus) {
+        updatePermissionState(from: status)
+        if case .authorized = permissionState {
+            requestOneShotLocation()
+        }
+    }
+
+    // iOS 14+ / macOS 11+
+    @available(iOS 14.0, macOS 11.0, *)
+    func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
+        updatePermissionState(from: manager.authorizationStatus)
+        if case .authorized = permissionState {
+            requestOneShotLocation()
+        }
+    }
+
+    func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
+        guard let loc = locations.last else { return }
+        lastLocation = loc
+        computeChannels(from: loc.coordinate)
+        reverseGeocodeIfNeeded(location: loc)
+    }
+
+    func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
+        // Surface as denied/restricted if relevant; otherwise keep previous state
+        SecureLogger.error("LocationChannelManager: location error: \(error.localizedDescription)", category: .session)
+    }
+
+    // MARK: - Helpers
+    private func updatePermissionState(from status: CLAuthorizationStatus) {
+        let newState: PermissionState
+        switch status {
+        case .notDetermined: newState = .notDetermined
+        case .restricted: newState = .restricted
+        case .denied: newState = .denied
+        case .authorizedAlways, .authorizedWhenInUse, .authorized: newState = .authorized
+        @unknown default: newState = .restricted
+        }
+        Task { @MainActor in self.permissionState = newState }
+    }
+
+    private func computeChannels(from coord: CLLocationCoordinate2D) {
+        let levels = GeohashChannelLevel.allCases
+        var result: [GeohashChannel] = []
+        for level in levels {
+            let gh = Geohash.encode(latitude: coord.latitude, longitude: coord.longitude, precision: level.precision)
+            result.append(GeohashChannel(level: level, geohash: gh))
+        }
+        Task { @MainActor in
+            self.availableChannels = result
+            // Recompute teleported status based on whether the selected geohash is in our regional set
+            switch self.selectedChannel {
+            case .mesh:
+                self.teleported = false
+            case .location(let ch):
+                // Membership check using freshly computed regional channels; avoids precision/rename drift
+                let inRegional = result.contains { $0.geohash == ch.geohash }
+                if inRegional {
+                    self.teleported = false
+                    // Clear persisted teleport flag if present
+                    if self.teleportedSet.contains(ch.geohash) {
+                        self.teleportedSet.remove(ch.geohash)
+                        if let data = try? JSONEncoder().encode(Array(self.teleportedSet)) {
+                            UserDefaults.standard.set(data, forKey: self.teleportedStoreKey)
+                        }
+                    }
+                } else {
+                    self.teleported = true
+                }
+            }
+        }
+    }
+
+    private func reverseGeocodeIfNeeded(location: CLLocation) {
+        // Always cancel previous to keep latest fresh while user moves
+        geocoder.cancelGeocode()
+        isGeocoding = true
+        geocoder.reverseGeocodeLocation(location) { [weak self] placemarks, error in
+            guard let self = self else { return }
+            self.isGeocoding = false
+            if let pm = placemarks?.first {
+                let names = self.namesByLevel(from: pm)
+                Task { @MainActor in self.locationNames = names }
+            }
+        }
+    }
+
+    private func namesByLevel(from pm: CLPlacemark) -> [GeohashChannelLevel: String] {
+        var dict: [GeohashChannelLevel: String] = [:]
+        // Region (country)
+        if let country = pm.country, !country.isEmpty {
+            dict[.region] = country
+        }
+        // Province (state/province or county)
+        if let admin = pm.administrativeArea, !admin.isEmpty {
+            dict[.province] = admin
+        } else if let subAdmin = pm.subAdministrativeArea, !subAdmin.isEmpty {
+            dict[.province] = subAdmin
+        }
+        // City (locality)
+        if let locality = pm.locality, !locality.isEmpty {
+            dict[.city] = locality
+        } else if let subAdmin = pm.subAdministrativeArea, !subAdmin.isEmpty {
+            dict[.city] = subAdmin
+        } else if let admin = pm.administrativeArea, !admin.isEmpty {
+            dict[.city] = admin
+        }
+        // Neighborhood
+        if let subLocality = pm.subLocality, !subLocality.isEmpty {
+            dict[.neighborhood] = subLocality
+        } else if let locality = pm.locality, !locality.isEmpty {
+            dict[.neighborhood] = locality
+        }
+        // Block: reuse neighborhood/locality granularity
+        if let subLocality = pm.subLocality, !subLocality.isEmpty {
+            dict[.block] = subLocality
+        } else if let locality = pm.locality, !locality.isEmpty {
+            dict[.block] = locality
+        }
+        // Building: prefer place name/street/venue when available
+        if let name = pm.name, !name.isEmpty {
+            dict[.building] = name
+        } else if let thoroughfare = pm.thoroughfare, !thoroughfare.isEmpty {
+            dict[.building] = thoroughfare
+        }
+        return dict
+    }
+}
+#endif

bitchat/Services/LocationStateManager.swift

@@ -1,545 +0,0 @@
-import BitLogger
-import Foundation
-import Combine
-
-#if os(iOS) || os(macOS)
-import CoreLocation
-
-/// Unified manager for location-based channel state including:
-/// - CoreLocation permissions and one-shot location retrieval
-/// - Geohash channel computation from coordinates
-/// - Channel selection and teleport state
-/// - Bookmark persistence and friendly name resolution
-///
-/// Consolidates LocationChannelManager + GeohashBookmarksStore into a single source of truth.
-final class LocationStateManager: NSObject, CLLocationManagerDelegate, ObservableObject {
-    static let shared = LocationStateManager()
-
-    // MARK: - Permission State
-
-    enum PermissionState: Equatable {
-        case notDetermined
-        case denied
-        case restricted
-        case authorized
-    }
-
-    // MARK: - Private Properties (CoreLocation)
-
-    private let cl = CLLocationManager()
-    private let geocoder = CLGeocoder()
-    private var lastLocation: CLLocation?
-    private var refreshTimer: Timer?
-    private var isGeocoding: Bool = false
-
-    // MARK: - Persistence Keys
-
-    private let selectedChannelKey = "locationChannel.selected"
-    private let teleportedStoreKey = "locationChannel.teleportedSet"
-    private let bookmarksKey = "locationChannel.bookmarks"
-    private let bookmarkNamesKey = "locationChannel.bookmarkNames"
-
-    // MARK: - Published State (Channel)
-
-    @Published private(set) var permissionState: PermissionState = .notDetermined
-    @Published private(set) var availableChannels: [GeohashChannel] = []
-    @Published private(set) var selectedChannel: ChannelID = .mesh
-    @Published var teleported: Bool = false
-    @Published private(set) var locationNames: [GeohashChannelLevel: String] = [:]
-
-    // MARK: - Published State (Bookmarks)
-
-    @Published private(set) var bookmarks: [String] = []
-    @Published private(set) var bookmarkNames: [String: String] = [:]
-
-    // MARK: - Private State
-
-    private var teleportedSet: Set<String> = []
-    private var bookmarkMembership: Set<String> = []
-    private var resolvingNames: Set<String> = []
-    private let storage: UserDefaults
-
-    /// Returns true if running in test environment
-    private static var isRunningTests: Bool {
-        let env = ProcessInfo.processInfo.environment
-        return NSClassFromString("XCTestCase") != nil ||
-               env["XCTestConfigurationFilePath"] != nil ||
-               env["XCTestBundlePath"] != nil ||
-               env["GITHUB_ACTIONS"] != nil ||
-               env["CI"] != nil
-    }
-
-    // MARK: - Initialization
-
-    private override init() {
-        self.storage = .standard
-        super.init()
-
-        // Skip CoreLocation setup in test environments
-        guard !Self.isRunningTests else {
-            loadPersistedState()
-            return
-        }
-
-        cl.delegate = self
-        cl.desiredAccuracy = kCLLocationAccuracyHundredMeters
-        cl.distanceFilter = TransportConfig.locationDistanceFilterMeters
-
-        loadPersistedState()
-        initializePermissionState()
-    }
-
-    /// Internal initializer for testing with custom storage
-    init(storage: UserDefaults) {
-        self.storage = storage
-        super.init()
-        loadPersistedState()
-    }
-
-    private func loadPersistedState() {
-        // Load selected channel
-        if let data = storage.data(forKey: selectedChannelKey),
-           let channel = try? JSONDecoder().decode(ChannelID.self, from: data) {
-            selectedChannel = channel
-        }
-
-        // Load teleported set
-        if let data = storage.data(forKey: teleportedStoreKey),
-           let arr = try? JSONDecoder().decode([String].self, from: data) {
-            teleportedSet = Set(arr)
-        }
-
-        // Load bookmarks
-        if let data = storage.data(forKey: bookmarksKey),
-           let arr = try? JSONDecoder().decode([String].self, from: data) {
-            var seen = Set<String>()
-            var list: [String] = []
-            for raw in arr {
-                let gh = Self.normalizeGeohash(raw)
-                guard !gh.isEmpty, !seen.contains(gh) else { continue }
-                seen.insert(gh)
-                list.append(gh)
-            }
-            bookmarks = list
-            bookmarkMembership = seen
-        }
-
-        // Load bookmark names
-        if let data = storage.data(forKey: bookmarkNamesKey),
-           let dict = try? JSONDecoder().decode([String: String].self, from: data) {
-            bookmarkNames = dict
-        }
-    }
-
-    private func initializePermissionState() {
-        let status: CLAuthorizationStatus
-        if #available(iOS 14.0, macOS 11.0, *) {
-            status = cl.authorizationStatus
-        } else {
-            status = CLLocationManager.authorizationStatus()
-        }
-        updatePermissionState(from: status)
-
-        // Fall back to persisted teleport state if no location authorization
-        switch status {
-        case .authorizedAlways, .authorizedWhenInUse, .authorized:
-            break
-        case .notDetermined, .restricted, .denied:
-            fallthrough
-        @unknown default:
-            if case .location(let ch) = selectedChannel {
-                teleported = teleportedSet.contains(ch.geohash)
-            }
-        }
-    }
-
-    // MARK: - Public API (Permissions & Location)
-
-    func enableLocationChannels() {
-        let status: CLAuthorizationStatus
-        if #available(iOS 14.0, macOS 11.0, *) {
-            status = cl.authorizationStatus
-        } else {
-            status = CLLocationManager.authorizationStatus()
-        }
-        switch status {
-        case .notDetermined:
-            cl.requestWhenInUseAuthorization()
-        case .restricted:
-            Task { @MainActor in self.permissionState = .restricted }
-        case .denied:
-            Task { @MainActor in self.permissionState = .denied }
-        case .authorizedAlways, .authorizedWhenInUse, .authorized:
-            Task { @MainActor in self.permissionState = .authorized }
-            requestOneShotLocation()
-        @unknown default:
-            Task { @MainActor in self.permissionState = .restricted }
-        }
-    }
-
-    func refreshChannels() {
-        if permissionState == .authorized {
-            requestOneShotLocation()
-        }
-    }
-
-    func beginLiveRefresh(interval: TimeInterval = TransportConfig.locationLiveRefreshInterval) {
-        guard permissionState == .authorized else { return }
-        refreshTimer?.invalidate()
-        refreshTimer = nil
-        cl.desiredAccuracy = kCLLocationAccuracyNearestTenMeters
-        cl.distanceFilter = TransportConfig.locationDistanceFilterLiveMeters
-        cl.startUpdatingLocation()
-        requestOneShotLocation()
-    }
-
-    func endLiveRefresh() {
-        refreshTimer?.invalidate()
-        refreshTimer = nil
-        cl.stopUpdatingLocation()
-        cl.desiredAccuracy = kCLLocationAccuracyHundredMeters
-        cl.distanceFilter = TransportConfig.locationDistanceFilterMeters
-    }
-
-    // MARK: - Public API (Channel Selection)
-
-    func select(_ channel: ChannelID) {
-        Task { @MainActor in
-            self.selectedChannel = channel
-            if let data = try? JSONEncoder().encode(channel) {
-                self.storage.set(data, forKey: self.selectedChannelKey)
-            }
-
-            switch channel {
-            case .mesh:
-                self.teleported = false
-            case .location(let ch):
-                let inRegional = self.availableChannels.contains { $0.geohash == ch.geohash }
-                if inRegional {
-                    self.teleported = false
-                    if self.teleportedSet.contains(ch.geohash) {
-                        self.teleportedSet.remove(ch.geohash)
-                        self.persistTeleportedSet()
-                    }
-                } else {
-                    self.teleported = self.teleportedSet.contains(ch.geohash)
-                }
-            }
-        }
-    }
-
-    func markTeleported(for geohash: String, _ flag: Bool) {
-        if flag {
-            teleportedSet.insert(geohash)
-        } else {
-            teleportedSet.remove(geohash)
-        }
-        persistTeleportedSet()
-        if case .location(let ch) = selectedChannel, ch.geohash == geohash {
-            Task { @MainActor in self.teleported = flag }
-        }
-    }
-
-    // MARK: - Public API (Bookmarks)
-
-    func isBookmarked(_ geohash: String) -> Bool {
-        bookmarkMembership.contains(Self.normalizeGeohash(geohash))
-    }
-
-    func toggleBookmark(_ geohash: String) {
-        let gh = Self.normalizeGeohash(geohash)
-        if bookmarkMembership.contains(gh) {
-            removeBookmark(gh)
-        } else {
-            addBookmark(gh)
-        }
-    }
-
-    func addBookmark(_ geohash: String) {
-        let gh = Self.normalizeGeohash(geohash)
-        guard !gh.isEmpty, !bookmarkMembership.contains(gh) else { return }
-        bookmarks.insert(gh, at: 0)
-        bookmarkMembership.insert(gh)
-        persistBookmarks()
-        resolveBookmarkNameIfNeeded(for: gh)
-    }
-
-    func removeBookmark(_ geohash: String) {
-        let gh = Self.normalizeGeohash(geohash)
-        guard bookmarkMembership.contains(gh) else { return }
-        if let idx = bookmarks.firstIndex(of: gh) {
-            bookmarks.remove(at: idx)
-        }
-        bookmarkMembership.remove(gh)
-        if bookmarkNames.removeValue(forKey: gh) != nil {
-            persistBookmarkNames()
-        }
-        persistBookmarks()
-    }
-
-    // MARK: - CLLocationManagerDelegate
-
-    private func requestOneShotLocation() {
-        cl.requestLocation()
-    }
-
-    func locationManager(_ manager: CLLocationManager, didChangeAuthorization status: CLAuthorizationStatus) {
-        updatePermissionState(from: status)
-        if case .authorized = permissionState {
-            requestOneShotLocation()
-        }
-    }
-
-    @available(iOS 14.0, macOS 11.0, *)
-    func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
-        updatePermissionState(from: manager.authorizationStatus)
-        if case .authorized = permissionState {
-            requestOneShotLocation()
-        }
-    }
-
-    func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
-        guard let loc = locations.last else { return }
-        lastLocation = loc
-        computeChannels(from: loc.coordinate)
-        reverseGeocodeLocation(loc)
-    }
-
-    func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
-        SecureLogger.error("LocationStateManager: location error: \(error.localizedDescription)", category: .session)
-    }
-
-    // MARK: - Private Helpers (Permission)
-
-    private func updatePermissionState(from status: CLAuthorizationStatus) {
-        let newState: PermissionState
-        switch status {
-        case .notDetermined: newState = .notDetermined
-        case .restricted: newState = .restricted
-        case .denied: newState = .denied
-        case .authorizedAlways, .authorizedWhenInUse, .authorized: newState = .authorized
-        @unknown default: newState = .restricted
-        }
-        Task { @MainActor in self.permissionState = newState }
-    }
-
-    // MARK: - Private Helpers (Channel Computation)
-
-    private func computeChannels(from coord: CLLocationCoordinate2D) {
-        let levels = GeohashChannelLevel.allCases
-        var result: [GeohashChannel] = []
-        for level in levels {
-            let gh = Geohash.encode(latitude: coord.latitude, longitude: coord.longitude, precision: level.precision)
-            result.append(GeohashChannel(level: level, geohash: gh))
-        }
-        Task { @MainActor in
-            self.availableChannels = result
-            switch self.selectedChannel {
-            case .mesh:
-                self.teleported = false
-            case .location(let ch):
-                let inRegional = result.contains { $0.geohash == ch.geohash }
-                if inRegional {
-                    self.teleported = false
-                    if self.teleportedSet.contains(ch.geohash) {
-                        self.teleportedSet.remove(ch.geohash)
-                        self.persistTeleportedSet()
-                    }
-                } else {
-                    self.teleported = true
-                }
-            }
-        }
-    }
-
-    // MARK: - Private Helpers (Geocoding)
-
-    private func reverseGeocodeLocation(_ location: CLLocation) {
-        geocoder.cancelGeocode()
-        isGeocoding = true
-        geocoder.reverseGeocodeLocation(location) { [weak self] placemarks, _ in
-            guard let self = self else { return }
-            self.isGeocoding = false
-            if let pm = placemarks?.first {
-                let names = self.locationNamesByLevel(from: pm)
-                Task { @MainActor in self.locationNames = names }
-            }
-        }
-    }
-
-    private func locationNamesByLevel(from pm: CLPlacemark) -> [GeohashChannelLevel: String] {
-        var dict: [GeohashChannelLevel: String] = [:]
-        if let country = pm.country, !country.isEmpty {
-            dict[.region] = country
-        }
-        if let admin = pm.administrativeArea, !admin.isEmpty {
-            dict[.province] = admin
-        } else if let subAdmin = pm.subAdministrativeArea, !subAdmin.isEmpty {
-            dict[.province] = subAdmin
-        }
-        if let locality = pm.locality, !locality.isEmpty {
-            dict[.city] = locality
-        } else if let subAdmin = pm.subAdministrativeArea, !subAdmin.isEmpty {
-            dict[.city] = subAdmin
-        } else if let admin = pm.administrativeArea, !admin.isEmpty {
-            dict[.city] = admin
-        }
-        if let subLocality = pm.subLocality, !subLocality.isEmpty {
-            dict[.neighborhood] = subLocality
-        } else if let locality = pm.locality, !locality.isEmpty {
-            dict[.neighborhood] = locality
-        }
-        if let subLocality = pm.subLocality, !subLocality.isEmpty {
-            dict[.block] = subLocality
-        } else if let locality = pm.locality, !locality.isEmpty {
-            dict[.block] = locality
-        }
-        if let name = pm.name, !name.isEmpty {
-            dict[.building] = name
-        } else if let thoroughfare = pm.thoroughfare, !thoroughfare.isEmpty {
-            dict[.building] = thoroughfare
-        }
-        return dict
-    }
-
-    func resolveBookmarkNameIfNeeded(for geohash: String) {
-        let gh = Self.normalizeGeohash(geohash)
-        guard !gh.isEmpty, bookmarkNames[gh] == nil, !resolvingNames.contains(gh) else { return }
-        resolvingNames.insert(gh)
-
-        if gh.count <= 2 {
-            let b = Geohash.decodeBounds(gh)
-            let pts: [CLLocation] = [
-                CLLocation(latitude: (b.latMin + b.latMax) / 2, longitude: (b.lonMin + b.lonMax) / 2),
-                CLLocation(latitude: b.latMin, longitude: b.lonMin),
-                CLLocation(latitude: b.latMin, longitude: b.lonMax),
-                CLLocation(latitude: b.latMax, longitude: b.lonMin),
-                CLLocation(latitude: b.latMax, longitude: b.lonMax)
-            ]
-            resolveCompositeAdminName(geohash: gh, points: pts)
-        } else {
-            let center = Geohash.decodeCenter(gh)
-            let loc = CLLocation(latitude: center.lat, longitude: center.lon)
-            geocoder.reverseGeocodeLocation(loc) { [weak self] placemarks, _ in
-                guard let self = self else { return }
-                defer { self.resolvingNames.remove(gh) }
-                if let pm = placemarks?.first,
-                   let name = Self.nameForGeohashLength(gh.count, from: pm),
-                   !name.isEmpty {
-                    DispatchQueue.main.async {
-                        self.bookmarkNames[gh] = name
-                        self.persistBookmarkNames()
-                    }
-                }
-            }
-        }
-    }
-
-    private func resolveCompositeAdminName(geohash gh: String, points: [CLLocation]) {
-        var uniqueAdmins: [String] = []
-        var seenAdmins = Set<String>()
-        var idx = 0
-
-        func step() {
-            if idx >= points.count {
-                let finalName: String? = {
-                    if uniqueAdmins.count >= 2 { return uniqueAdmins[0] + " and " + uniqueAdmins[1] }
-                    return uniqueAdmins.first
-                }()
-                if let finalName = finalName, !finalName.isEmpty {
-                    DispatchQueue.main.async {
-                        self.bookmarkNames[gh] = finalName
-                        self.persistBookmarkNames()
-                    }
-                }
-                self.resolvingNames.remove(gh)
-                return
-            }
-            let loc = points[idx]
-            idx += 1
-            geocoder.reverseGeocodeLocation(loc) { [weak self] placemarks, _ in
-                guard self != nil else { return }
-                if let pm = placemarks?.first {
-                    if let admin = pm.administrativeArea, !admin.isEmpty, !seenAdmins.contains(admin) {
-                        seenAdmins.insert(admin)
-                        uniqueAdmins.append(admin)
-                    } else if let country = pm.country, !country.isEmpty, !seenAdmins.contains(country) {
-                        seenAdmins.insert(country)
-                        uniqueAdmins.append(country)
-                    }
-                }
-                step()
-            }
-        }
-        step()
-    }
-
-    private static func nameForGeohashLength(_ len: Int, from pm: CLPlacemark) -> String? {
-        switch len {
-        case 0...2:
-            return pm.administrativeArea ?? pm.country
-        case 3...4:
-            return pm.administrativeArea ?? pm.subAdministrativeArea ?? pm.country
-        case 5:
-            return pm.locality ?? pm.subAdministrativeArea ?? pm.administrativeArea
-        case 6...7:
-            return pm.subLocality ?? pm.locality ?? pm.administrativeArea
-        default:
-            return pm.subLocality ?? pm.locality ?? pm.administrativeArea ?? pm.country
-        }
-    }
-
-    // MARK: - Private Helpers (Persistence)
-
-    private func persistTeleportedSet() {
-        if let data = try? JSONEncoder().encode(Array(teleportedSet)) {
-            storage.set(data, forKey: teleportedStoreKey)
-        }
-    }
-
-    private func persistBookmarks() {
-        if let data = try? JSONEncoder().encode(bookmarks) {
-            storage.set(data, forKey: bookmarksKey)
-        }
-    }
-
-    private func persistBookmarkNames() {
-        if let data = try? JSONEncoder().encode(bookmarkNames) {
-            storage.set(data, forKey: bookmarkNamesKey)
-        }
-    }
-
-    private static func normalizeGeohash(_ s: String) -> String {
-        let allowed = Set("0123456789bcdefghjkmnpqrstuvwxyz")
-        return s
-            .trimmingCharacters(in: .whitespacesAndNewlines)
-            .lowercased()
-            .replacingOccurrences(of: "#", with: "")
-            .filter { allowed.contains($0) }
-    }
-}
-
-// MARK: - Backward Compatibility Typealiases
-
-typealias LocationChannelManager = LocationStateManager
-typealias GeohashBookmarksStore = LocationStateManager
-
-// MARK: - Backward Compatibility Extensions
-
-extension LocationStateManager {
-    /// Backward compatibility: toggle bookmark (was GeohashBookmarksStore.toggle)
-    func toggle(_ geohash: String) {
-        toggleBookmark(geohash)
-    }
-
-    /// Backward compatibility: add bookmark (was GeohashBookmarksStore.add)
-    func add(_ geohash: String) {
-        addBookmark(geohash)
-    }
-
-    /// Backward compatibility: remove bookmark (was GeohashBookmarksStore.remove)
-    func remove(_ geohash: String) {
-        removeBookmark(geohash)
-    }
-}
-#endif

bitchat/Services/MeshTopologyTracker.swift

@@ -1,120 +0,0 @@
-import Foundation
-
-/// Tracks observed mesh topology and computes hop-by-hop routes.
-final class MeshTopologyTracker {
-    private typealias RoutingID = Data
-
-    private let queue = DispatchQueue(label: "mesh.topology", attributes: .concurrent)
-    private let hopSize = 8
-    private var adjacency: [RoutingID: Set<RoutingID>] = [:]
-
-    func reset() {
-        queue.sync(flags: .barrier) {
-            self.adjacency.removeAll()
-        }
-    }
-
-    func recordDirectLink(between a: Data?, and b: Data?) {
-        guard let left = sanitize(a), let right = sanitize(b), left != right else { return }
-        queue.sync(flags: .barrier) {
-            var setA = self.adjacency[left] ?? []
-            setA.insert(right)
-            self.adjacency[left] = setA
-
-            var setB = self.adjacency[right] ?? []
-            setB.insert(left)
-            self.adjacency[right] = setB
-        }
-    }
-
-    func removeDirectLink(between a: Data?, and b: Data?) {
-        guard let left = sanitize(a), let right = sanitize(b), left != right else { return }
-        queue.sync(flags: .barrier) {
-            if var setA = self.adjacency[left] {
-                setA.remove(right)
-                self.adjacency[left] = setA.isEmpty ? nil : setA
-            }
-            if var setB = self.adjacency[right] {
-                setB.remove(left)
-                self.adjacency[right] = setB.isEmpty ? nil : setB
-            }
-        }
-    }
-
-    func removePeer(_ data: Data?) {
-        guard let peer = sanitize(data) else { return }
-        queue.sync(flags: .barrier) {
-            guard let neighbors = self.adjacency.removeValue(forKey: peer) else { return }
-            for neighbor in neighbors {
-                if var set = self.adjacency[neighbor] {
-                    set.remove(peer)
-                    self.adjacency[neighbor] = set.isEmpty ? nil : set
-                }
-            }
-        }
-    }
-
-    func recordRoute(_ hops: [Data]) {
-        let sanitized = hops.compactMap { sanitize($0) }
-        guard sanitized.count >= 2 else { return }
-        queue.sync(flags: .barrier) {
-            for idx in 0..<(sanitized.count - 1) {
-                let left = sanitized[idx]
-                let right = sanitized[idx + 1]
-                guard left != right else { continue }
-
-                var setA = self.adjacency[left] ?? []
-                setA.insert(right)
-                self.adjacency[left] = setA
-
-                var setB = self.adjacency[right] ?? []
-                setB.insert(left)
-                self.adjacency[right] = setB
-            }
-        }
-    }
-
-    func computeRoute(from start: Data?, to goal: Data?, maxHops: Int = 255) -> [Data]? {
-        guard let source = sanitize(start), let target = sanitize(goal) else { return nil }
-        if source == target { return [source] }
-
-        let graph = queue.sync { adjacency }
-        guard graph[source] != nil, graph[target] != nil else { return nil }
-
-        var visited: Set<RoutingID> = [source]
-        var queuePaths: [[RoutingID]] = [[source]]
-        var index = 0
-
-        while index < queuePaths.count {
-            let path = queuePaths[index]
-            index += 1
-            guard path.count <= maxHops else { continue }
-            guard let last = path.last, let neighbors = graph[last] else { continue }
-
-            for neighbor in neighbors {
-                if visited.contains(neighbor) { continue }
-                var nextPath = path
-                nextPath.append(neighbor)
-                if neighbor == target { return nextPath }
-                if nextPath.count <= maxHops {
-                    queuePaths.append(nextPath)
-                }
-                visited.insert(neighbor)
-            }
-        }
-
-        return nil
-    }
-
-    // MARK: - Helpers
-
-    private func sanitize(_ data: Data?) -> Data? {
-        guard var value = data, !value.isEmpty else { return nil }
-        if value.count > hopSize {
-            value = Data(value.prefix(hopSize))
-        } else if value.count < hopSize {
-            value.append(Data(repeating: 0, count: hopSize - value.count))
-        }
-        return value
-    }
-}

bitchat/Services/MessageDeduplicationService.swift

@@ -1,274 +0,0 @@
-//
-// MessageDeduplicationService.swift
-// bitchat
-//
-// Handles message deduplication using LRU caches.
-// This is free and unencumbered software released into the public domain.
-//
-
-import Foundation
-
-// MARK: - LRU Deduplication Cache
-
-/// Generic LRU (Least Recently Used) cache for deduplication.
-/// Uses an efficient O(1) lookup with periodic compaction.
-final class LRUDeduplicationCache<Value> {
-    private var map: [String: Value] = [:]
-    private var order: [String] = []
-    private var head: Int = 0
-    private let capacity: Int
-
-    /// Creates a new LRU cache with the specified capacity.
-    /// - Parameter capacity: Maximum number of entries before eviction
-    init(capacity: Int) {
-        precondition(capacity > 0, "LRU cache capacity must be positive")
-        self.capacity = capacity
-    }
-
-    /// Number of active entries in the cache
-    var count: Int {
-        order.count - head
-    }
-
-    /// Checks if a key exists in the cache
-    func contains(_ key: String) -> Bool {
-        map[key] != nil
-    }
-
-    /// Gets the value for a key, or nil if not present
-    func value(for key: String) -> Value? {
-        map[key]
-    }
-
-    /// Records a key-value pair, updating if exists or inserting if new
-    func record(_ key: String, value: Value) {
-        if map[key] == nil {
-            order.append(key)
-        }
-        map[key] = value
-        trimIfNeeded()
-    }
-
-    /// Removes a specific key from the cache
-    func remove(_ key: String) {
-        map.removeValue(forKey: key)
-        // Note: key remains in order array but will be skipped during eviction
-    }
-
-    /// Clears all entries from the cache
-    func clear() {
-        map.removeAll()
-        order.removeAll()
-        head = 0
-    }
-
-    // MARK: - Private
-
-    private func trimIfNeeded() {
-        let activeCount = order.count - head
-        guard activeCount > capacity else { return }
-
-        let overflow = activeCount - capacity
-        for _ in 0..<overflow {
-            guard let victim = popOldest() else { break }
-            map.removeValue(forKey: victim)
-        }
-    }
-
-    private func popOldest() -> String? {
-        // Skip keys that were already removed from map
-        while head < order.count {
-            let key = order[head]
-            head += 1
-
-            // Periodically compact the backing storage
-            if head >= 32 && head * 2 >= order.count {
-                order.removeFirst(head)
-                head = 0
-            }
-
-            // Only return if key is still in map
-            if map[key] != nil {
-                return key
-            }
-        }
-        return nil
-    }
-}
-
-// MARK: - Content Normalizer
-
-/// Normalizes message content for near-duplicate detection.
-enum ContentNormalizer {
-
-    /// Regex to simplify HTTP URLs by stripping query strings and fragments
-    private static let simplifyHTTPURL: NSRegularExpression = {
-        try! NSRegularExpression(
-            pattern: "https?://[^\\s?#]+(?:[?#][^\\s]*)?",
-            options: [.caseInsensitive]
-        )
-    }()
-
-    /// Normalizes content for deduplication comparison.
-    /// - Parameters:
-    ///   - content: The raw message content
-    ///   - prefixLength: Maximum characters to consider (default from TransportConfig)
-    /// - Returns: A hash-based key for comparison
-    static func normalizedKey(
-        _ content: String,
-        prefixLength: Int = TransportConfig.contentKeyPrefixLength
-    ) -> String {
-        // Lowercase for case-insensitive comparison
-        let lowered = content.lowercased()
-        let ns = lowered as NSString
-        let range = NSRange(location: 0, length: ns.length)
-
-        // Simplify URLs by stripping query/fragment
-        var simplified = ""
-        var last = 0
-        for match in simplifyHTTPURL.matches(in: lowered, options: [], range: range) {
-            if match.range.location > last {
-                simplified += ns.substring(with: NSRange(location: last, length: match.range.location - last))
-            }
-            let url = ns.substring(with: match.range)
-            if let queryIndex = url.firstIndex(where: { $0 == "?" || $0 == "#" }) {
-                simplified += String(url[..<queryIndex])
-            } else {
-                simplified += url
-            }
-            last = match.range.location + match.range.length
-        }
-        if last < ns.length {
-            simplified += ns.substring(with: NSRange(location: last, length: ns.length - last))
-        }
-
-        // Trim and collapse whitespace
-        let trimmed = simplified.trimmingCharacters(in: .whitespacesAndNewlines)
-        let collapsed = trimmed.replacingOccurrences(of: "\\s+", with: " ", options: .regularExpression)
-
-        // Take prefix and hash
-        let prefix = String(collapsed.prefix(prefixLength))
-        let hash = prefix.djb2()
-        return String(format: "h:%016llx", hash)
-    }
-}
-
-// MARK: - Message Deduplication Service
-
-/// Service that manages message deduplication using LRU caches.
-/// Provides separate caches for content-based dedup and Nostr event ID dedup.
-final class MessageDeduplicationService {
-
-    /// Cache for content-based near-duplicate detection
-    private let contentCache: LRUDeduplicationCache<Date>
-
-    /// Cache for Nostr event ID deduplication
-    private let nostrEventCache: LRUDeduplicationCache<Bool>
-
-    /// Cache for Nostr ACK deduplication (messageId:ackType:senderPubkey format)
-    private let nostrAckCache: LRUDeduplicationCache<Bool>
-
-    /// Creates a new deduplication service with specified capacities.
-    /// - Parameters:
-    ///   - contentCapacity: Max entries for content cache
-    ///   - nostrEventCapacity: Max entries for Nostr event cache
-    init(
-        contentCapacity: Int = TransportConfig.contentLRUCap,
-        nostrEventCapacity: Int = TransportConfig.uiProcessedNostrEventsCap
-    ) {
-        self.contentCache = LRUDeduplicationCache(capacity: contentCapacity)
-        self.nostrEventCache = LRUDeduplicationCache(capacity: nostrEventCapacity)
-        self.nostrAckCache = LRUDeduplicationCache(capacity: nostrEventCapacity)
-    }
-
-    // MARK: - Content Deduplication
-
-    /// Records content with its timestamp for near-duplicate detection.
-    /// - Parameters:
-    ///   - content: The message content
-    ///   - timestamp: When the content was received
-    func recordContent(_ content: String, timestamp: Date) {
-        let key = ContentNormalizer.normalizedKey(content)
-        contentCache.record(key, value: timestamp)
-    }
-
-    /// Records a pre-normalized content key with its timestamp.
-    /// - Parameters:
-    ///   - key: The normalized content key
-    ///   - timestamp: When the content was received
-    func recordContentKey(_ key: String, timestamp: Date) {
-        contentCache.record(key, value: timestamp)
-    }
-
-    /// Gets the timestamp for previously seen content.
-    /// - Parameter content: The message content
-    /// - Returns: The timestamp when first seen, or nil if not seen
-    func contentTimestamp(for content: String) -> Date? {
-        let key = ContentNormalizer.normalizedKey(content)
-        return contentCache.value(for: key)
-    }
-
-    /// Gets the timestamp for a pre-normalized content key.
-    /// - Parameter key: The normalized content key
-    /// - Returns: The timestamp when first seen, or nil if not seen
-    func contentTimestamp(forKey key: String) -> Date? {
-        contentCache.value(for: key)
-    }
-
-    /// Normalizes content to a deduplication key.
-    /// - Parameter content: The raw content
-    /// - Returns: A normalized hash key
-    func normalizedContentKey(_ content: String) -> String {
-        ContentNormalizer.normalizedKey(content)
-    }
-
-    // MARK: - Nostr Event Deduplication
-
-    /// Checks if a Nostr event has already been processed.
-    /// - Parameter eventId: The event ID
-    /// - Returns: true if already processed
-    func hasProcessedNostrEvent(_ eventId: String) -> Bool {
-        nostrEventCache.contains(eventId)
-    }
-
-    /// Records a Nostr event as processed.
-    /// - Parameter eventId: The event ID
-    func recordNostrEvent(_ eventId: String) {
-        nostrEventCache.record(eventId, value: true)
-    }
-
-    // MARK: - Nostr ACK Deduplication
-
-    /// Checks if a Nostr ACK has already been processed.
-    /// - Parameter ackKey: The ACK key in format "messageId:ackType:senderPubkey"
-    /// - Returns: true if already processed
-    func hasProcessedNostrAck(_ ackKey: String) -> Bool {
-        nostrAckCache.contains(ackKey)
-    }
-
-    /// Records a Nostr ACK as processed.
-    /// - Parameter ackKey: The ACK key in format "messageId:ackType:senderPubkey"
-    func recordNostrAck(_ ackKey: String) {
-        nostrAckCache.record(ackKey, value: true)
-    }
-
-    /// Creates an ACK key from components.
-    static func ackKey(messageId: String, ackType: String, senderPubkey: String) -> String {
-        "\(messageId):\(ackType):\(senderPubkey)"
-    }
-
-    // MARK: - Clear
-
-    /// Clears all caches
-    func clearAll() {
-        contentCache.clear()
-        nostrEventCache.clear()
-        nostrAckCache.clear()
-    }
-
-    /// Clears only the Nostr caches (events and ACKs)
-    func clearNostrCaches() {
-        nostrEventCache.clear()
-        nostrAckCache.clear()
-    }
-}

bitchat/Services/MessageFormattingEngine.swift

@@ -1,471 +0,0 @@
-//
-// MessageFormattingEngine.swift
-// bitchat
-//
-// Handles message text formatting, including mentions, hashtags, URLs, and tokens.
-// This is free and unencumbered software released into the public domain.
-//
-
-import Foundation
-import SwiftUI
-
-// MARK: - Formatting Context Protocol
-
-/// Protocol defining the context needed for message formatting.
-/// Implemented by ChatViewModel to provide runtime state.
-@MainActor
-protocol MessageFormattingContext: AnyObject {
-    /// The user's current nickname
-    var nickname: String { get }
-
-    /// Determines if a message was sent by the current user
-    func isSelfMessage(_ message: BitchatMessage) -> Bool
-
-    /// Gets the color for a message's sender
-    func senderColor(for message: BitchatMessage, isDark: Bool) -> Color
-
-    /// Resolves a peer ID to a clickable URL
-    func peerURL(for peerID: PeerID) -> URL?
-}
-
-// MARK: - Formatting Engine
-
-/// Handles rich text formatting for chat messages.
-/// Extracts mentions, hashtags, URLs, Lightning invoices, and Cashu tokens.
-final class MessageFormattingEngine {
-
-    // MARK: - Precompiled Regexes
-
-    /// Precompiled regex patterns for message content parsing
-    enum Patterns {
-        static let hashtag: NSRegularExpression = {
-            try! NSRegularExpression(pattern: "#([a-zA-Z0-9_]+)", options: [])
-        }()
-
-        static let mention: NSRegularExpression = {
-            try! NSRegularExpression(pattern: "@([\\p{L}0-9_]+(?:#[a-fA-F0-9]{4})?)", options: [])
-        }()
-
-        static let cashu: NSRegularExpression = {
-            try! NSRegularExpression(pattern: "\\bcashu[AB][A-Za-z0-9._-]{40,}\\b", options: [])
-        }()
-
-        static let bolt11: NSRegularExpression = {
-            try! NSRegularExpression(pattern: "(?i)\\bln(bc|tb|bcrt)[0-9][a-z0-9]{50,}\\b", options: [])
-        }()
-
-        static let lnurl: NSRegularExpression = {
-            try! NSRegularExpression(pattern: "(?i)\\blnurl1[a-z0-9]{20,}\\b", options: [])
-        }()
-
-        static let lightningScheme: NSRegularExpression = {
-            try! NSRegularExpression(pattern: "(?i)\\blightning:[^\\s]+", options: [])
-        }()
-
-        static let linkDetector: NSDataDetector? = {
-            try? NSDataDetector(types: NSTextCheckingResult.CheckingType.link.rawValue)
-        }()
-
-        static let quickCashuPresence: NSRegularExpression = {
-            try! NSRegularExpression(pattern: "\\bcashu[AB][A-Za-z0-9._-]{40,}\\b", options: [])
-        }()
-
-        static let simplifyHTTPURL: NSRegularExpression = {
-            try! NSRegularExpression(pattern: "https?://[^\\s?#]+(?:[?#][^\\s]*)?", options: [.caseInsensitive])
-        }()
-    }
-
-    // MARK: - Match Types
-
-    /// Types of matches found in message content
-    enum MatchType: String {
-        case hashtag
-        case mention
-        case url
-        case cashu
-        case lightning
-        case bolt11
-        case lnurl
-    }
-
-    /// A match found in message content
-    struct ContentMatch {
-        let range: NSRange
-        let type: MatchType
-    }
-
-    // MARK: - Public API
-
-    /// Formats a message with rich text styling
-    @MainActor
-    static func formatMessage(
-        _ message: BitchatMessage,
-        context: MessageFormattingContext,
-        colorScheme: ColorScheme
-    ) -> AttributedString {
-        let isDark = colorScheme == .dark
-        let isSelf = context.isSelfMessage(message)
-
-        // Check cache first
-        if let cached = message.getCachedFormattedText(isDark: isDark, isSelf: isSelf) {
-            return cached
-        }
-
-        var result = AttributedString()
-        let baseColor: Color = isSelf ? .orange : context.senderColor(for: message, isDark: isDark)
-
-        // Format system messages differently
-        if message.sender == "system" {
-            result = formatSystemMessage(message, isDark: isDark)
-        } else {
-            // Format sender header
-            result = formatSenderHeader(
-                message: message,
-                baseColor: baseColor,
-                isSelf: isSelf,
-                context: context
-            )
-
-            // Format content
-            let contentResult = formatContent(
-                message.content,
-                baseColor: baseColor,
-                isSelf: isSelf,
-                isMentioned: message.mentions?.contains(context.nickname) ?? false
-            )
-            result.append(contentResult)
-
-            // Add timestamp
-            result.append(formatTimestamp(message.formattedTimestamp))
-        }
-
-        // Cache the result
-        message.setCachedFormattedText(result, isDark: isDark, isSelf: isSelf)
-
-        return result
-    }
-
-    /// Formats just the message header (sender portion)
-    @MainActor
-    static func formatHeader(
-        _ message: BitchatMessage,
-        context: MessageFormattingContext,
-        colorScheme: ColorScheme
-    ) -> AttributedString {
-        let isDark = colorScheme == .dark
-        let isSelf = context.isSelfMessage(message)
-        let baseColor: Color = isSelf ? .orange : context.senderColor(for: message, isDark: isDark)
-
-        if message.sender == "system" {
-            var style = AttributeContainer()
-            style.foregroundColor = baseColor
-            style.font = .bitchatSystem(size: 14, weight: .medium, design: .monospaced)
-            return AttributedString(message.sender).mergingAttributes(style)
-        }
-
-        return formatSenderHeader(
-            message: message,
-            baseColor: baseColor,
-            isSelf: isSelf,
-            context: context
-        )
-    }
-
-    /// Extracts mentions from message content
-    static func extractMentions(from content: String) -> [String] {
-        let nsContent = content as NSString
-        let range = NSRange(location: 0, length: nsContent.length)
-        let matches = Patterns.mention.matches(in: content, options: [], range: range)
-
-        return matches.compactMap { match -> String? in
-            guard match.numberOfRanges > 1 else { return nil }
-            let captureRange = match.range(at: 1)
-            guard let swiftRange = Range(captureRange, in: content) else { return nil }
-            return String(content[swiftRange])
-        }
-    }
-
-    /// Checks if content contains a Cashu token
-    static func containsCashuToken(_ content: String) -> Bool {
-        let nsContent = content as NSString
-        let range = NSRange(location: 0, length: nsContent.length)
-        return Patterns.quickCashuPresence.numberOfMatches(in: content, options: [], range: range) > 0
-    }
-
-    // MARK: - Private Helpers
-
-    private static func formatSystemMessage(_ message: BitchatMessage, isDark: Bool) -> AttributedString {
-        var result = AttributedString()
-
-        let content = AttributedString("* \(message.content) *")
-        var contentStyle = AttributeContainer()
-        contentStyle.foregroundColor = Color.gray
-        contentStyle.font = .bitchatSystem(size: 12, design: .monospaced).italic()
-        result.append(content.mergingAttributes(contentStyle))
-
-        // Add timestamp
-        let timestamp = AttributedString(" [\(message.formattedTimestamp)]")
-        var timestampStyle = AttributeContainer()
-        timestampStyle.foregroundColor = Color.gray.opacity(0.5)
-        timestampStyle.font = .bitchatSystem(size: 10, design: .monospaced)
-        result.append(timestamp.mergingAttributes(timestampStyle))
-
-        return result
-    }
-
-    @MainActor
-    private static func formatSenderHeader(
-        message: BitchatMessage,
-        baseColor: Color,
-        isSelf: Bool,
-        context: MessageFormattingContext
-    ) -> AttributedString {
-        var result = AttributedString()
-
-        let (baseName, suffix) = message.sender.splitSuffix()
-        var senderStyle = AttributeContainer()
-        senderStyle.foregroundColor = baseColor
-        let fontWeight: Font.Weight = isSelf ? .bold : .medium
-        senderStyle.font = .bitchatSystem(size: 14, weight: fontWeight, design: .monospaced)
-
-        // Make sender clickable
-        if let spid = message.senderPeerID, let url = context.peerURL(for: spid) {
-            senderStyle.link = url
-        }
-
-        // Build: "<@baseName#suffix> "
-        result.append(AttributedString("<@").mergingAttributes(senderStyle))
-        result.append(AttributedString(baseName).mergingAttributes(senderStyle))
-
-        if !suffix.isEmpty {
-            var suffixStyle = senderStyle
-            suffixStyle.foregroundColor = baseColor.opacity(0.6)
-            result.append(AttributedString(suffix).mergingAttributes(suffixStyle))
-        }
-
-        result.append(AttributedString("> ").mergingAttributes(senderStyle))
-
-        return result
-    }
-
-    private static func formatContent(
-        _ content: String,
-        baseColor: Color,
-        isSelf: Bool,
-        isMentioned: Bool
-    ) -> AttributedString {
-        // For very long content without special tokens, use plain formatting
-        let containsCashu = containsCashuToken(content)
-        if (content.count > 4000 || content.hasVeryLongToken(threshold: 1024)) && !containsCashu {
-            return formatPlainContent(content, baseColor: baseColor, isSelf: isSelf)
-        }
-
-        // Find all matches
-        let matches = findAllMatches(in: content)
-
-        // Build formatted content
-        var result = AttributedString()
-        var lastEnd = content.startIndex
-
-        for match in matches {
-            guard let swiftRange = Range(match.range, in: content) else { continue }
-
-            // Add text before match
-            if lastEnd < swiftRange.lowerBound {
-                let beforeText = String(content[lastEnd..<swiftRange.lowerBound])
-                result.append(formatPlainText(beforeText, baseColor: baseColor, isSelf: isSelf, isMentioned: isMentioned))
-            }
-
-            // Add styled match
-            let matchText = String(content[swiftRange])
-            result.append(formatMatch(matchText, type: match.type, baseColor: baseColor, isSelf: isSelf))
-
-            lastEnd = swiftRange.upperBound
-        }
-
-        // Add remaining text
-        if lastEnd < content.endIndex {
-            let remainingText = String(content[lastEnd...])
-            result.append(formatPlainText(remainingText, baseColor: baseColor, isSelf: isSelf, isMentioned: isMentioned))
-        }
-
-        return result
-    }
-
-    private static func findAllMatches(in content: String) -> [ContentMatch] {
-        let nsContent = content as NSString
-        let nsLen = nsContent.length
-        let fullRange = NSRange(location: 0, length: nsLen)
-
-        // Quick hints to avoid unnecessary regex work
-        let hasMentions = content.contains("@")
-        let hasHashtags = content.contains("#")
-        let hasURLs = content.contains("://") || content.contains("www.") || content.contains("http")
-        let hasLightning = content.lowercased().contains("ln") || content.lowercased().contains("lightning:")
-        let hasCashu = content.lowercased().contains("cashu")
-
-        // Collect matches
-        let mentionMatches = hasMentions ? Patterns.mention.matches(in: content, options: [], range: fullRange) : []
-        let hashtagMatches = hasHashtags ? Patterns.hashtag.matches(in: content, options: [], range: fullRange) : []
-        let urlMatches = hasURLs ? (Patterns.linkDetector?.matches(in: content, options: [], range: fullRange) ?? []) : []
-        let cashuMatches = hasCashu ? Patterns.cashu.matches(in: content, options: [], range: fullRange) : []
-        let lightningMatches = hasLightning ? Patterns.lightningScheme.matches(in: content, options: [], range: fullRange) : []
-        let bolt11Matches = hasLightning ? Patterns.bolt11.matches(in: content, options: [], range: fullRange) : []
-        let lnurlMatches = hasLightning ? Patterns.lnurl.matches(in: content, options: [], range: fullRange) : []
-
-        // Build mention ranges for overlap checking
-        let mentionRanges = mentionMatches.map { $0.range(at: 0) }
-
-        func overlapsMention(_ r: NSRange) -> Bool {
-            mentionRanges.contains { NSIntersectionRange(r, $0).length > 0 }
-        }
-
-        func isStandaloneHashtag(_ r: NSRange) -> Bool {
-            guard let swiftRange = Range(r, in: content) else { return false }
-            if swiftRange.lowerBound == content.startIndex { return true }
-            let prev = content.index(before: swiftRange.lowerBound)
-            return content[prev].isWhitespace || content[prev].isNewline
-        }
-
-        func attachedToMention(_ r: NSRange) -> Bool {
-            guard let swiftRange = Range(r, in: content), swiftRange.lowerBound > content.startIndex else { return false }
-            var i = content.index(before: swiftRange.lowerBound)
-            while true {
-                let ch = content[i]
-                if ch.isWhitespace || ch.isNewline { break }
-                if ch == "@" { return true }
-                if i == content.startIndex { break }
-                i = content.index(before: i)
-            }
-            return false
-        }
-
-        var allMatches: [ContentMatch] = []
-
-        // Add hashtags (excluding those attached to mentions)
-        for match in hashtagMatches {
-            let range = match.range(at: 0)
-            if !overlapsMention(range) && !attachedToMention(range) && isStandaloneHashtag(range) {
-                allMatches.append(ContentMatch(range: range, type: .hashtag))
-            }
-        }
-
-        // Add mentions
-        for match in mentionMatches {
-            allMatches.append(ContentMatch(range: match.range(at: 0), type: .mention))
-        }
-
-        // Add URLs
-        for match in urlMatches where !overlapsMention(match.range) {
-            allMatches.append(ContentMatch(range: match.range, type: .url))
-        }
-
-        // Add Cashu tokens
-        for match in cashuMatches where !overlapsMention(match.range(at: 0)) {
-            allMatches.append(ContentMatch(range: match.range(at: 0), type: .cashu))
-        }
-
-        // Add Lightning scheme URLs
-        for match in lightningMatches where !overlapsMention(match.range(at: 0)) {
-            allMatches.append(ContentMatch(range: match.range(at: 0), type: .lightning))
-        }
-
-        // Add bolt11/lnurl (avoiding overlaps with lightning scheme and URLs)
-        let occupied = urlMatches.map { $0.range } + lightningMatches.map { $0.range(at: 0) }
-        func overlapsOccupied(_ r: NSRange) -> Bool {
-            occupied.contains { NSIntersectionRange(r, $0).length > 0 }
-        }
-
-        for match in bolt11Matches where !overlapsMention(match.range(at: 0)) && !overlapsOccupied(match.range(at: 0)) {
-            allMatches.append(ContentMatch(range: match.range(at: 0), type: .bolt11))
-        }
-
-        for match in lnurlMatches where !overlapsMention(match.range(at: 0)) && !overlapsOccupied(match.range(at: 0)) {
-            allMatches.append(ContentMatch(range: match.range(at: 0), type: .lnurl))
-        }
-
-        // Sort by position
-        return allMatches.sorted { $0.range.location < $1.range.location }
-    }
-
-    private static func formatPlainContent(_ content: String, baseColor: Color, isSelf: Bool) -> AttributedString {
-        var style = AttributeContainer()
-        style.foregroundColor = baseColor
-        style.font = isSelf
-            ? .bitchatSystem(size: 14, weight: .bold, design: .monospaced)
-            : .bitchatSystem(size: 14, design: .monospaced)
-        return AttributedString(content).mergingAttributes(style)
-    }
-
-    private static func formatPlainText(_ text: String, baseColor: Color, isSelf: Bool, isMentioned: Bool) -> AttributedString {
-        guard !text.isEmpty else { return AttributedString() }
-
-        var style = AttributeContainer()
-        style.foregroundColor = baseColor
-        style.font = isSelf
-            ? .bitchatSystem(size: 14, weight: .bold, design: .monospaced)
-            : .bitchatSystem(size: 14, design: .monospaced)
-
-        if isMentioned {
-            style.font = style.font?.bold()
-        }
-
-        return AttributedString(text).mergingAttributes(style)
-    }
-
-    private static func formatMatch(_ text: String, type: MatchType, baseColor: Color, isSelf: Bool) -> AttributedString {
-        var style = AttributeContainer()
-
-        switch type {
-        case .mention:
-            // Split optional '#abcd' suffix
-            let (baseName, suffix) = text.splitSuffix()
-            var result = AttributedString()
-
-            var mentionStyle = AttributeContainer()
-            mentionStyle.foregroundColor = .blue
-            mentionStyle.font = .bitchatSystem(size: 14, weight: .semibold, design: .monospaced)
-            result.append(AttributedString(baseName).mergingAttributes(mentionStyle))
-
-            if !suffix.isEmpty {
-                var suffixStyle = mentionStyle
-                suffixStyle.foregroundColor = Color.gray.opacity(0.7)
-                result.append(AttributedString(suffix).mergingAttributes(suffixStyle))
-            }
-
-            return result
-
-        case .hashtag:
-            style.foregroundColor = .purple
-            style.font = .bitchatSystem(size: 14, weight: .medium, design: .monospaced)
-
-        case .url:
-            style.foregroundColor = .blue
-            style.font = .bitchatSystem(size: 14, design: .monospaced)
-            style.underlineStyle = .single
-            if let url = URL(string: text) {
-                style.link = url
-            }
-
-        case .cashu:
-            style.foregroundColor = .green
-            style.font = .bitchatSystem(size: 14, weight: .medium, design: .monospaced)
-            style.backgroundColor = Color.green.opacity(0.1)
-
-        case .lightning, .bolt11, .lnurl:
-            style.foregroundColor = .yellow
-            style.font = .bitchatSystem(size: 14, weight: .medium, design: .monospaced)
-            style.backgroundColor = Color.yellow.opacity(0.1)
-        }
-
-        return AttributedString(text).mergingAttributes(style)
-    }
-
-    private static func formatTimestamp(_ timestamp: String) -> AttributedString {
-        let text = AttributedString(" [\(timestamp)]")
-        var style = AttributeContainer()
-        style.foregroundColor = Color.gray.opacity(0.5)
-        style.font = .bitchatSystem(size: 10, design: .monospaced)
-        return text.mergingAttributes(style)
-    }
-}

bitchat/Services/MessageRouter.swift

@@ -1,14 +1,17 @@
 import BitLogger
 import Foundation
 
-/// Routes messages using available transports (Mesh, Nostr, etc.)
+/// Routes messages between BLE and Nostr transports
 @MainActor
 final class MessageRouter {
-    private let transports: [Transport]
+    private let mesh: Transport
+    private let nostr: NostrTransport
     private var outbox: [PeerID: [(content: String, nickname: String, messageID: String)]] = [:] // peerID -> queued messages
 
-    init(transports: [Transport]) {
-        self.transports = transports
+    init(mesh: Transport, nostr: NostrTransport) {
+        self.mesh = mesh
+        self.nostr = nostr
+        self.nostr.senderPeerID = mesh.myPeerID
 
         // Observe favorites changes to learn Nostr mapping and flush queued messages
         NotificationCenter.default.addObserver(
@@ -35,70 +38,88 @@ final class MessageRouter {
     }
 
     func sendPrivate(_ content: String, to peerID: PeerID, recipientNickname: String, messageID: String) {
-        // Try to find a reachable transport
-        if let transport = transports.first(where: { $0.isPeerReachable(peerID) }) {
-            SecureLogger.debug("Routing PM via \(type(of: transport)) to \(peerID.id.prefix(8))… id=\(messageID.prefix(8))…", category: .session)
-            transport.sendPrivateMessage(content, to: peerID, recipientNickname: recipientNickname, messageID: messageID)
+        let reachableMesh = mesh.isPeerReachable(peerID)
+        if reachableMesh {
+            SecureLogger.debug("Routing PM via mesh (reachable) to \(peerID.id.prefix(8))… id=\(messageID.prefix(8))…", category: .session)
+            // BLEService will initiate a handshake if needed and queue the message
+            mesh.sendPrivateMessage(content, to: peerID, recipientNickname: recipientNickname, messageID: messageID)
+        } else if canSendViaNostr(peerID: peerID) {
+            SecureLogger.debug("Routing PM via Nostr to \(peerID.id.prefix(8))… id=\(messageID.prefix(8))…", category: .session)
+            nostr.sendPrivateMessage(content, to: peerID, recipientNickname: recipientNickname, messageID: messageID)
         } else {
-            // Queue for later
+            // Queue for later (when mesh connects or Nostr mapping appears)
             if outbox[peerID] == nil { outbox[peerID] = [] }
             outbox[peerID]?.append((content, recipientNickname, messageID))
-            SecureLogger.debug("Queued PM for \(peerID.id.prefix(8))… (no reachable transport) id=\(messageID.prefix(8))…", category: .session)
+            SecureLogger.debug("Queued PM for \(peerID.id.prefix(8))… (no mesh, no Nostr mapping) id=\(messageID.prefix(8))…", category: .session)
         }
     }
 
     func sendReadReceipt(_ receipt: ReadReceipt, to peerID: PeerID) {
-        if let transport = transports.first(where: { $0.isPeerReachable(peerID) }) {
-            SecureLogger.debug("Routing READ ack via \(type(of: transport)) to \(peerID.id.prefix(8))… id=\(receipt.originalMessageID.prefix(8))…", category: .session)
-            transport.sendReadReceipt(receipt, to: peerID)
-        } else if !transports.isEmpty {
-            // Fallback to last transport (usually Nostr) if neither is explicitly reachable?
-            // Or better: just try the first one that supports it?
-            // Existing logic preferred mesh, then nostr.
-            // If neither reachable, existing logic queued it (via mesh usually) or sent via nostr.
-            // Let's stick to "try reachable". If none, maybe pick the first one to queue?
-            // Actually, for READ receipts, we might want to just fire-and-forget on the "best effort" transport.
-            // But let's stick to the reachable check.
-            SecureLogger.debug("No reachable transport for READ ack to \(peerID.id.prefix(8))…", category: .session)
+        // Prefer mesh for reachable peers; BLE will queue if handshake is needed
+        if mesh.isPeerReachable(peerID) {
+            SecureLogger.debug("Routing READ ack via mesh (reachable) to \(peerID.id.prefix(8))… id=\(receipt.originalMessageID.prefix(8))…", category: .session)
+            mesh.sendReadReceipt(receipt, to: peerID)
+        } else {
+            SecureLogger.debug("Routing READ ack via Nostr to \(peerID.id.prefix(8))… id=\(receipt.originalMessageID.prefix(8))…", category: .session)
+            nostr.sendReadReceipt(receipt, to: peerID)
         }
     }
 
     func sendDeliveryAck(_ messageID: String, to peerID: PeerID) {
-        if let transport = transports.first(where: { $0.isPeerReachable(peerID) }) {
-            SecureLogger.debug("Routing DELIVERED ack via \(type(of: transport)) to \(peerID.id.prefix(8))… id=\(messageID.prefix(8))…", category: .session)
-            transport.sendDeliveryAck(for: messageID, to: peerID)
+        if mesh.isPeerReachable(peerID) {
+            SecureLogger.debug("Routing DELIVERED ack via mesh (reachable) to \(peerID.id.prefix(8))… id=\(messageID.prefix(8))…", category: .session)
+            mesh.sendDeliveryAck(for: messageID, to: peerID)
+        } else {
+            nostr.sendDeliveryAck(for: messageID, to: peerID)
         }
     }
 
     func sendFavoriteNotification(to peerID: PeerID, isFavorite: Bool) {
-        if let transport = transports.first(where: { $0.isPeerConnected(peerID) }) {
-            transport.sendFavoriteNotification(to: peerID, isFavorite: isFavorite)
-        } else if let transport = transports.first(where: { $0.isPeerReachable(peerID) }) {
-             transport.sendFavoriteNotification(to: peerID, isFavorite: isFavorite)
+        // Route via mesh when connected; else use Nostr
+        if mesh.isPeerConnected(peerID) {
+            mesh.sendFavoriteNotification(to: peerID, isFavorite: isFavorite)
         } else {
-            // Fallback: try all? or just the last one?
-            // Old logic: if mesh connected, mesh. Else nostr.
-            // Note: NostrTransport.isPeerReachable now returns true if mapped.
-            // If not mapped, we can't send via Nostr anyway.
+            nostr.sendFavoriteNotification(to: peerID, isFavorite: isFavorite)
         }
     }
 
     // MARK: - Outbox Management
+    private func canSendViaNostr(peerID: PeerID) -> Bool {
+        // Two forms are supported:
+        // - 64-hex Noise public key (32 bytes)
+        // - 16-hex short peer ID (derived from Noise pubkey)
+        if let noiseKey = peerID.noiseKey {
+            if let fav = FavoritesPersistenceService.shared.getFavoriteStatus(for: noiseKey),
+               fav.peerNostrPublicKey != nil {
+                return true
+            }
+        } else if peerID.isShort {
+            if let fav = FavoritesPersistenceService.shared.getFavoriteStatus(forPeerID: peerID),
+               fav.peerNostrPublicKey != nil {
+                return true
+            }
+        }
+        return false
+    }
 
     func flushOutbox(for peerID: PeerID) {
         guard let queued = outbox[peerID], !queued.isEmpty else { return }
         SecureLogger.debug("Flushing outbox for \(peerID.id.prefix(8))… count=\(queued.count)", category: .session)
         var remaining: [(content: String, nickname: String, messageID: String)] = []
-        
+        // Prefer mesh if connected; else try Nostr if mapping exists
         for (content, nickname, messageID) in queued {
-            if let transport = transports.first(where: { $0.isPeerReachable(peerID) }) {
-                SecureLogger.debug("Outbox -> \(type(of: transport)) for \(peerID.id.prefix(8))… id=\(messageID.prefix(8))…", category: .session)
-                transport.sendPrivateMessage(content, to: peerID, recipientNickname: nickname, messageID: messageID)
+            if mesh.isPeerReachable(peerID) {
+                SecureLogger.debug("Outbox -> mesh for \(peerID.id.prefix(8))… id=\(messageID.prefix(8))…", category: .session)
+                mesh.sendPrivateMessage(content, to: peerID, recipientNickname: nickname, messageID: messageID)
+            } else if canSendViaNostr(peerID: peerID) {
+                SecureLogger.debug("Outbox -> Nostr for \(peerID.id.prefix(8))… id=\(messageID.prefix(8))…", category: .session)
+                nostr.sendPrivateMessage(content, to: peerID, recipientNickname: nickname, messageID: messageID)
             } else {
+                // Keep unsent items queued
                 remaining.append((content, nickname, messageID))
             }
         }
-        
+        // Persist only items we could not send
         if remaining.isEmpty {
             outbox.removeValue(forKey: peerID)
         } else {

bitchat/Services/NoiseEncryptionService.swift

@@ -177,18 +177,18 @@ final class NoiseEncryptionService {
     private let rekeyCheckInterval: TimeInterval = 60.0 // Check every minute
     
     // Callbacks
-    private var onPeerAuthenticatedHandlers: [((PeerID, String) -> Void)] = [] // Array of handlers for peer authentication
+    private var onPeerAuthenticatedHandlers: [((String, String) -> Void)] = [] // Array of handlers for peer authentication
     var onHandshakeRequired: ((PeerID) -> Void)? // peerID needs handshake
     
     // Add a handler for peer authentication
-    func addOnPeerAuthenticatedHandler(_ handler: @escaping (PeerID, String) -> Void) {
+    func addOnPeerAuthenticatedHandler(_ handler: @escaping (String, String) -> Void) {
         serviceQueue.async(flags: .barrier) { [weak self] in
             self?.onPeerAuthenticatedHandlers.append(handler)
         }
     }
     
     // Legacy support - setting this will add to the handlers array
-    var onPeerAuthenticated: ((PeerID, String) -> Void)? {
+    var onPeerAuthenticated: ((String, String) -> Void)? {
         get { nil } // Always return nil for backward compatibility
         set {
             if let handler = newValue {
@@ -546,7 +546,7 @@ final class NoiseEncryptionService {
         // Notify all handlers about authentication
         serviceQueue.async { [weak self] in
             self?.onPeerAuthenticatedHandlers.forEach { handler in
-                handler(peerID, fingerprint)
+                handler(peerID.id, fingerprint)
             }
         }
     }

bitchat/Services/NostrTransport.swift

@@ -3,7 +3,7 @@ import Foundation
 import Combine
 
 // Minimal Nostr transport conforming to Transport for offline sending
-final class NostrTransport: Transport, @unchecked Sendable {
+final class NostrTransport: Transport {
     // Provide BLE short peer ID for BitChat embedding
     var senderPeerID = PeerID(str: "")
 
@@ -18,49 +18,9 @@ final class NostrTransport: Transport, @unchecked Sendable {
     private let keychain: KeychainManagerProtocol
     private let idBridge: NostrIdentityBridge
 
-    // Reachability Cache (thread-safe)
-    private var reachablePeers: Set<PeerID> = []
-    private let queue = DispatchQueue(label: "nostr.transport.state", attributes: .concurrent)
-
-    @MainActor
     init(keychain: KeychainManagerProtocol, idBridge: NostrIdentityBridge) {
         self.keychain = keychain
         self.idBridge = idBridge
-        
-        setupObservers()
-        
-        // Synchronously warm the cache to avoid startup race
-        let favorites = FavoritesPersistenceService.shared.favorites
-        let reachable = favorites.values
-            .filter { $0.peerNostrPublicKey != nil }
-            .map { PeerID(publicKey: $0.peerNoisePublicKey) }
-            
-        queue.sync(flags: .barrier) {
-            self.reachablePeers = Set(reachable)
-        }
-    }
-
-    private func setupObservers() {
-        NotificationCenter.default.addObserver(
-            forName: .favoriteStatusChanged,
-            object: nil,
-            queue: nil
-        ) { [weak self] _ in
-            self?.refreshReachablePeers()
-        }
-    }
-
-    private func refreshReachablePeers() {
-        Task { @MainActor in
-            let favorites = FavoritesPersistenceService.shared.favorites
-            let reachable = favorites.values
-                .filter { $0.peerNostrPublicKey != nil }
-                .map { PeerID(publicKey: $0.peerNoisePublicKey) }
-            
-            self.queue.async(flags: .barrier) { [weak self] in
-                self?.reachablePeers = Set(reachable)
-            }
-        }
     }
 
     // MARK: - Transport Protocol Conformance
@@ -82,19 +42,7 @@ final class NostrTransport: Transport, @unchecked Sendable {
     func emergencyDisconnectAll() { /* no-op */ }
 
     func isPeerConnected(_ peerID: PeerID) -> Bool { false }
-    
-    func isPeerReachable(_ peerID: PeerID) -> Bool {
-        queue.sync {
-            // Check if exact match
-            if reachablePeers.contains(peerID) { return true }
-            // Check for short ID match
-            if peerID.isShort {
-                return reachablePeers.contains(where: { $0.toShort() == peerID })
-            }
-            return false
-        }
-    }
-    
+    func isPeerReachable(_ peerID: PeerID) -> Bool { false }
     func peerNickname(peerID: PeerID) -> String? { nil }
     func getPeerNicknames() -> [PeerID : String] { [:] }
 
@@ -165,10 +113,7 @@ final class NostrTransport: Transport, @unchecked Sendable {
                 let (hrp, data) = try Bech32.decode(recipientNpub)
                 guard hrp == "npub" else { return }
                 recipientHex = data.hexEncodedString()
-            } catch {
-                SecureLogger.error("NostrTransport: failed to decode recipient npub for favorite notification: \(error.localizedDescription)", category: .session)
-                return
-            }
+            } catch { return }
             guard let embedded = NostrEmbeddedBitChat.encodePMForNostr(content: content, messageID: UUID().uuidString, recipientPeerID: peerID, senderPeerID: senderPeerID) else {
                 SecureLogger.error("NostrTransport: failed to embed favorite notification", category: .session)
                 return
@@ -193,10 +138,7 @@ final class NostrTransport: Transport, @unchecked Sendable {
                 let (hrp, data) = try Bech32.decode(recipientNpub)
                 guard hrp == "npub" else { return }
                 recipientHex = data.hexEncodedString()
-            } catch {
-                SecureLogger.error("NostrTransport: failed to decode recipient npub for delivery ack: \(error.localizedDescription)", category: .session)
-                return
-            }
+            } catch { return }
             guard let ack = NostrEmbeddedBitChat.encodeAckForNostr(type: .delivered, messageID: messageID, recipientPeerID: peerID, senderPeerID: senderPeerID) else {
                 SecureLogger.error("NostrTransport: failed to embed DELIVERED ack", category: .session)
                 return
@@ -280,11 +222,7 @@ extension NostrTransport {
                 let (hrp, data) = try Bech32.decode(recipientNpub)
                 guard hrp == "npub" else { scheduleNextReadAck(); return }
                 recipientHex = data.hexEncodedString()
-            } catch {
-                SecureLogger.error("NostrTransport: failed to decode recipient npub for read ack: \(error.localizedDescription)", category: .session)
-                scheduleNextReadAck()
-                return
-            }
+            } catch { scheduleNextReadAck(); return }
             guard let ack = NostrEmbeddedBitChat.encodeAckForNostr(type: .readReceipt, messageID: item.receipt.originalMessageID, recipientPeerID: item.peerID, senderPeerID: senderPeerID) else {
                 SecureLogger.error("NostrTransport: failed to embed READ ack", category: .session)
                 scheduleNextReadAck(); return

bitchat/Services/NotificationService.swift

@@ -16,21 +16,10 @@ import AppKit
 
 final class NotificationService {
     static let shared = NotificationService()
-
-    /// Returns true if running in test environment (XCTest, Swift Testing, or CI)
-    private var isRunningTests: Bool {
-        let env = ProcessInfo.processInfo.environment
-        return NSClassFromString("XCTestCase") != nil ||
-               env["XCTestConfigurationFilePath"] != nil ||
-               env["XCTestBundlePath"] != nil ||
-               env["GITHUB_ACTIONS"] != nil ||
-               env["CI"] != nil
-    }
-
+    
     private init() {}
-
+    
     func requestAuthorization() {
-        guard !isRunningTests else { return }
         UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .sound, .badge]) { granted, error in
             if granted {
                 // Permission granted
@@ -40,31 +29,28 @@ final class NotificationService {
         }
     }
     
-    func sendLocalNotification(
-        title: String,
-        body: String,
-        identifier: String,
-        userInfo: [String: Any]? = nil,
-        interruptionLevel: UNNotificationInterruptionLevel = .active
-    ) {
-        guard !isRunningTests else { return }
-        let content = UNMutableNotificationContent()
-        content.title = title
-        content.body = body
-        content.sound = .default
-        content.interruptionLevel = interruptionLevel
-
-        if let userInfo = userInfo {
-            content.userInfo = userInfo
+    func sendLocalNotification(title: String, body: String, identifier: String, userInfo: [String: Any]? = nil) {
+        // For now, skip app state check entirely to avoid thread issues
+        // The NotificationDelegate will handle foreground presentation
+        DispatchQueue.main.async {
+            let content = UNMutableNotificationContent()
+            content.title = title
+            content.body = body
+            content.sound = .default
+            if let userInfo = userInfo {
+                content.userInfo = userInfo
+            }
+            
+            let request = UNNotificationRequest(
+                identifier: identifier,
+                content: content,
+                trigger: nil // Deliver immediately
+            )
+            
+            UNUserNotificationCenter.current().add(request) { _ in
+                // Notification added
+            }
         }
-
-        let request = UNNotificationRequest(
-            identifier: identifier,
-            content: content,
-            trigger: nil // Deliver immediately
-        )
-
-        UNUserNotificationCenter.current().add(request)
     }
     
     func sendMentionNotification(from sender: String, message: String) {
@@ -75,11 +61,11 @@ final class NotificationService {
         sendLocalNotification(title: title, body: body, identifier: identifier)
     }
     
-    func sendPrivateMessageNotification(from sender: String, message: String, peerID: PeerID) {
+    func sendPrivateMessageNotification(from sender: String, message: String, peerID: String) {
         let title = "🔒 DM from \(sender)"
         let body = message
         let identifier = "private-\(UUID().uuidString)"
-        let userInfo = ["peerID": peerID.id, "senderName": sender]
+        let userInfo = ["peerID": peerID, "senderName": sender]
         
         sendLocalNotification(title: title, body: body, identifier: identifier, userInfo: userInfo)
     }
@@ -97,12 +83,25 @@ final class NotificationService {
         let title = "👥 bitchatters nearby!"
         let body = peerCount == 1 ? "1 person around" : "\(peerCount) people around"
         let identifier = "network-available-\(Date().timeIntervalSince1970)"
-
-        sendLocalNotification(
-            title: title,
-            body: body,
-            identifier: identifier,
-            interruptionLevel: .timeSensitive
-        )
+        
+        // For network notifications, we want to show them even in foreground
+        // No app state check - let the notification delegate handle presentation
+        DispatchQueue.main.async {
+            let content = UNMutableNotificationContent()
+            content.title = title
+            content.body = body
+            content.sound = .default
+            content.interruptionLevel = .timeSensitive  // Make it more prominent
+            
+            let request = UNNotificationRequest(
+                identifier: identifier,
+                content: content,
+                trigger: nil // Deliver immediately
+            )
+            
+            UNUserNotificationCenter.current().add(request) { _ in
+                // Notification added
+            }
+        }
     }
 }

bitchat/Services/PrivateChatManager.swift

@@ -15,174 +15,20 @@ final class PrivateChatManager: ObservableObject {
     @Published var privateChats: [PeerID: [BitchatMessage]] = [:]
     @Published var selectedPeer: PeerID? = nil
     @Published var unreadMessages: Set<PeerID> = []
-
+    
     private var selectedPeerFingerprint: String? = nil
     var sentReadReceipts: Set<String> = []  // Made accessible for ChatViewModel
-
+    
     weak var meshService: Transport?
     // Route acks/receipts via MessageRouter (chooses mesh or Nostr)
     weak var messageRouter: MessageRouter?
-    // Peer service for looking up peer info during consolidation
-    weak var unifiedPeerService: UnifiedPeerService?
-
+    
     init(meshService: Transport? = nil) {
         self.meshService = meshService
     }
 
     // Cap for messages stored per private chat
     private let privateChatCap = TransportConfig.privateChatCap
-
-    // MARK: - Message Consolidation
-
-    /// Consolidates messages from different peer ID representations into a single chat.
-    /// This ensures messages from stable Noise keys and temporary Nostr peer IDs are merged.
-    /// - Parameters:
-    ///   - peerID: The target peer ID to consolidate messages into
-    ///   - peerNickname: The peer's display name (lowercased for matching)
-    ///   - persistedReadReceipts: The persisted read receipts set from ChatViewModel (UserDefaults-backed)
-    /// - Returns: True if any unread messages were found during consolidation
-    @MainActor
-    func consolidateMessages(for peerID: PeerID, peerNickname: String, persistedReadReceipts: Set<String>) -> Bool {
-        guard let meshService = meshService else { return false }
-        var hasUnreadMessages = false
-
-        // 1. Consolidate from stable Noise key (64-char hex)
-        if let peer = unifiedPeerService?.getPeer(by: peerID) {
-            let noiseKeyHex = PeerID(hexData: peer.noisePublicKey)
-
-            if noiseKeyHex != peerID, let nostrMessages = privateChats[noiseKeyHex], !nostrMessages.isEmpty {
-                if privateChats[peerID] == nil {
-                    privateChats[peerID] = []
-                }
-
-                let existingMessageIds = Set(privateChats[peerID]?.map { $0.id } ?? [])
-                for message in nostrMessages {
-                    if !existingMessageIds.contains(message.id) {
-                        // Update senderPeerID for correct read receipts
-                        let updatedMessage = BitchatMessage(
-                            id: message.id,
-                            sender: message.sender,
-                            content: message.content,
-                            timestamp: message.timestamp,
-                            isRelay: message.isRelay,
-                            originalSender: message.originalSender,
-                            isPrivate: message.isPrivate,
-                            recipientNickname: message.recipientNickname,
-                            senderPeerID: message.senderPeerID == meshService.myPeerID ? meshService.myPeerID : peerID,
-                            mentions: message.mentions,
-                            deliveryStatus: message.deliveryStatus
-                        )
-                        privateChats[peerID]?.append(updatedMessage)
-
-                        // Check for recent unread messages (< 60s, not sent by us, not already read)
-                        // Use persistedReadReceipts to correctly identify already-read messages after app restart
-                        if message.senderPeerID != meshService.myPeerID {
-                            let messageAge = Date().timeIntervalSince(message.timestamp)
-                            if messageAge < 60 && !persistedReadReceipts.contains(message.id) {
-                                hasUnreadMessages = true
-                            }
-                        }
-                    }
-                }
-
-                privateChats[peerID]?.sort { $0.timestamp < $1.timestamp }
-
-                if hasUnreadMessages {
-                    unreadMessages.insert(peerID)
-                } else if unreadMessages.contains(noiseKeyHex) {
-                    unreadMessages.remove(noiseKeyHex)
-                }
-
-                privateChats.removeValue(forKey: noiseKeyHex)
-            }
-        }
-
-        // 2. Consolidate from temporary Nostr peer IDs (nostr_* prefixed)
-        let normalizedNickname = peerNickname.lowercased()
-        var tempPeerIDsToConsolidate: [PeerID] = []
-
-        for (storedPeerID, messages) in privateChats {
-            if storedPeerID.isGeoDM && storedPeerID != peerID {
-                let nicknamesMatch = messages.allSatisfy { $0.sender.lowercased() == normalizedNickname }
-                if nicknamesMatch && !messages.isEmpty {
-                    tempPeerIDsToConsolidate.append(storedPeerID)
-                }
-            }
-        }
-
-        if !tempPeerIDsToConsolidate.isEmpty {
-            if privateChats[peerID] == nil {
-                privateChats[peerID] = []
-            }
-
-            let existingMessageIds = Set(privateChats[peerID]?.map { $0.id } ?? [])
-            var consolidatedCount = 0
-            var hadUnreadTemp = false
-
-            for tempPeerID in tempPeerIDsToConsolidate {
-                if unreadMessages.contains(tempPeerID) {
-                    hadUnreadTemp = true
-                }
-
-                if let tempMessages = privateChats[tempPeerID] {
-                    for message in tempMessages {
-                        if !existingMessageIds.contains(message.id) {
-                            let updatedMessage = BitchatMessage(
-                                id: message.id,
-                                sender: message.sender,
-                                content: message.content,
-                                timestamp: message.timestamp,
-                                isRelay: message.isRelay,
-                                originalSender: message.originalSender,
-                                isPrivate: message.isPrivate,
-                                recipientNickname: message.recipientNickname,
-                                senderPeerID: peerID,
-                                mentions: message.mentions,
-                                deliveryStatus: message.deliveryStatus
-                            )
-                            privateChats[peerID]?.append(updatedMessage)
-                            consolidatedCount += 1
-                        }
-                    }
-                    privateChats.removeValue(forKey: tempPeerID)
-                    unreadMessages.remove(tempPeerID)
-                }
-            }
-
-            if hadUnreadTemp {
-                unreadMessages.insert(peerID)
-                hasUnreadMessages = true
-                SecureLogger.debug("📬 Transferred unread status from temp peer IDs to \(peerID)", category: .session)
-            }
-
-            if consolidatedCount > 0 {
-                privateChats[peerID]?.sort { $0.timestamp < $1.timestamp }
-                SecureLogger.info("📥 Consolidated \(consolidatedCount) Nostr messages from temporary peer IDs to \(peerNickname)", category: .session)
-            }
-        }
-
-        return hasUnreadMessages
-    }
-
-    /// Syncs the read receipt tracking between manager and view model for sent messages
-    @MainActor
-    func syncReadReceiptsForSentMessages(peerID: PeerID, nickname: String, externalReceipts: inout Set<String>) {
-        guard let messages = privateChats[peerID] else { return }
-
-        for message in messages {
-            if message.sender == nickname {
-                if let status = message.deliveryStatus {
-                    switch status {
-                    case .read, .delivered:
-                        externalReceipts.insert(message.id)
-                        sentReadReceipts.insert(message.id)
-                    case .failed, .partiallyDelivered, .sending, .sent:
-                        break
-                    }
-                }
-            }
-        }
-    }
     
     /// Start a private chat with a peer
     func startChat(with peerID: PeerID) {

bitchat/Services/RelayController.swift

@@ -13,7 +13,6 @@ struct RelayController {
                        senderIsSelf: Bool,
                        isEncrypted: Bool,
                        isDirectedEncrypted: Bool,
-                       isFragment: Bool,
                        isDirectedFragment: Bool,
                        isHandshake: Bool,
                        isAnnounce: Bool,
@@ -37,16 +36,6 @@ struct RelayController {
             return RelayDecision(shouldRelay: true, newTTL: newTTL, delayMs: delayMs)
         }
 
-        if isFragment {
-            let ttlLimit = min(ttlCap, TransportConfig.bleFragmentRelayTtlCap)
-            guard ttlLimit > 1 else {
-                return RelayDecision(shouldRelay: false, newTTL: ttlLimit, delayMs: 0)
-            }
-            let newTTL = ttlLimit &- 1
-            let delayMs = Int.random(in: TransportConfig.bleFragmentRelayMinDelayMs...TransportConfig.bleFragmentRelayMaxDelayMs)
-            return RelayDecision(shouldRelay: true, newTTL: newTTL, delayMs: delayMs)
-        }
-
         // TTL clamping for broadcast
         // - Dense graphs: keep lower but still allow multi-hop bridging
         // - Announces get a bit more headroom

bitchat/Services/Transport.swift

@@ -45,7 +45,6 @@ protocol Transport: AnyObject {
 
     // Messaging
     func sendMessage(_ content: String, mentions: [String])
-    func sendMessage(_ content: String, mentions: [String], messageID: String, timestamp: Date)
     func sendPrivateMessage(_ content: String, to peerID: PeerID, recipientNickname: String, messageID: String)
     func sendReadReceipt(_ receipt: ReadReceipt, to peerID: PeerID)
     func sendFavoriteNotification(to peerID: PeerID, isFavorite: Bool)
@@ -66,10 +65,6 @@ extension Transport {
     func sendFileBroadcast(_ packet: BitchatFilePacket, transferId: String) {}
     func sendFilePrivate(_ packet: BitchatFilePacket, to peerID: PeerID, transferId: String) {}
     func cancelTransfer(_ transferId: String) {}
-
-    func sendMessage(_ content: String, mentions: [String], messageID: String, timestamp: Date) {
-        sendMessage(content, mentions: mentions)
-    }
 }
 
 protocol TransportPeerEventsDelegate: AnyObject {

bitchat/Services/TransportConfig.swift

@@ -8,10 +8,6 @@ enum TransportConfig {
     static let messageTTLDefault: UInt8 = 7                 // Default TTL for mesh flooding
     static let bleMaxInFlightAssemblies: Int = 128          // Cap concurrent fragment assemblies
     static let bleHighDegreeThreshold: Int = 6              // For adaptive TTL/probabilistic relays
-    static let bleMaxConcurrentTransfers: Int = 2           // Limit simultaneous large media sends
-    static let bleFragmentRelayMinDelayMs: Int = 8          // Faster forwarding for media fragments
-    static let bleFragmentRelayMaxDelayMs: Int = 25         // Upper jitter bound for fragment relays
-    static let bleFragmentRelayTtlCap: UInt8 = 5            // Clamp fragment TTL to contain floods
 
     // UI / Storage Caps
     static let privateChatCap: Int = 1337
@@ -70,7 +66,6 @@ enum TransportConfig {
     static let uiAnimationMediumSeconds: TimeInterval = 0.2
     static let uiAnimationSidebarSeconds: TimeInterval = 0.25
     static let uiRecentCutoffFiveMinutesSeconds: TimeInterval = 5 * 60
-    static let uiMeshEmptyConfirmationSeconds: TimeInterval = 30.0
 
     // BLE maintenance & thresholds
     static let bleMaintenanceInterval: TimeInterval = 5.0

bitchat/Sync/GossipSyncManager.swift

@@ -8,55 +8,6 @@ final class GossipSyncManager {
         func signPacketForBroadcast(_ packet: BitchatPacket) -> BitchatPacket
     }
 
-    private struct PacketStore {
-        private(set) var packets: [String: BitchatPacket] = [:]
-        private(set) var order: [String] = []
-
-        mutating func insert(idHex: String, packet: BitchatPacket, capacity: Int) {
-            guard capacity > 0 else { return }
-            if packets[idHex] != nil {
-                packets[idHex] = packet
-                return
-            }
-            packets[idHex] = packet
-            order.append(idHex)
-            while order.count > capacity {
-                let victim = order.removeFirst()
-                packets.removeValue(forKey: victim)
-            }
-        }
-
-        func allPackets(isFresh: (BitchatPacket) -> Bool) -> [BitchatPacket] {
-            order.compactMap { key in
-                guard let packet = packets[key], isFresh(packet) else { return nil }
-                return packet
-            }
-        }
-
-        mutating func remove(where shouldRemove: (BitchatPacket) -> Bool) {
-            var nextOrder: [String] = []
-            for key in order {
-                guard let packet = packets[key] else { continue }
-                if shouldRemove(packet) {
-                    packets.removeValue(forKey: key)
-                } else {
-                    nextOrder.append(key)
-                }
-            }
-            order = nextOrder
-        }
-
-        mutating func removeExpired(isFresh: (BitchatPacket) -> Bool) {
-            remove { !isFresh($0) }
-        }
-    }
-
-    private struct SyncSchedule {
-        let types: SyncTypeFlags
-        let interval: TimeInterval
-        var lastSent: Date
-    }
-
     struct Config {
         var seenCapacity: Int = 1000          // max packets per sync (cap across types)
         var gcsMaxBytes: Int = 400           // filter size budget (128..1024)
@@ -65,43 +16,25 @@ final class GossipSyncManager {
         var maintenanceIntervalSeconds: TimeInterval = 30.0
         var stalePeerCleanupIntervalSeconds: TimeInterval = 60.0
         var stalePeerTimeoutSeconds: TimeInterval = 60.0
-        var fragmentCapacity: Int = 600
-        var fileTransferCapacity: Int = 200
-        var fragmentSyncIntervalSeconds: TimeInterval = 30.0
-        var fileTransferSyncIntervalSeconds: TimeInterval = 60.0
-        var messageSyncIntervalSeconds: TimeInterval = 15.0
     }
 
     private let myPeerID: PeerID
     private let config: Config
     weak var delegate: Delegate?
 
-    // Storage: broadcast packets by type, and latest announce per sender
-    private var messages = PacketStore()
-    private var fragments = PacketStore()
-    private var fileTransfers = PacketStore()
-    private var latestAnnouncementByPeer: [PeerID: (id: String, packet: BitchatPacket)] = [:]
+    // Storage: broadcast messages (ordered by insert), and latest announce per sender
+    private var messages: [String: BitchatPacket] = [:] // idHex -> packet
+    private var messageOrder: [String] = []
+    private var latestAnnouncementByPeer: [String: (id: String, packet: BitchatPacket)] = [:]
 
     // Timer
     private var periodicTimer: DispatchSourceTimer?
     private let queue = DispatchQueue(label: "mesh.sync", qos: .utility)
     private var lastStalePeerCleanup: Date = .distantPast
-    private var syncSchedules: [SyncSchedule] = []
 
     init(myPeerID: PeerID, config: Config = Config()) {
         self.myPeerID = myPeerID
         self.config = config
-        var schedules: [SyncSchedule] = []
-        if config.seenCapacity > 0 && config.messageSyncIntervalSeconds > 0 {
-            schedules.append(SyncSchedule(types: .publicMessages, interval: config.messageSyncIntervalSeconds, lastSent: .distantPast))
-        }
-        if config.fragmentCapacity > 0 && config.fragmentSyncIntervalSeconds > 0 {
-            schedules.append(SyncSchedule(types: .fragment, interval: config.fragmentSyncIntervalSeconds, lastSent: .distantPast))
-        }
-        if config.fileTransferCapacity > 0 && config.fileTransferSyncIntervalSeconds > 0 {
-            schedules.append(SyncSchedule(types: .fileTransfer, interval: config.fileTransferSyncIntervalSeconds, lastSent: .distantPast))
-        }
-        syncSchedules = schedules
     }
 
     func start() {
@@ -122,18 +55,7 @@ final class GossipSyncManager {
 
     func scheduleInitialSyncToPeer(_ peerID: PeerID, delaySeconds: TimeInterval = 5.0) {
         queue.asyncAfter(deadline: .now() + delaySeconds) { [weak self] in
-            guard let self = self else { return }
-            self.sendRequestSync(to: peerID, types: .publicMessages)
-            if self.config.fragmentCapacity > 0 && self.config.fragmentSyncIntervalSeconds > 0 {
-                self.queue.asyncAfter(deadline: .now() + 0.5) { [weak self] in
-                    self?.sendRequestSync(to: peerID, types: .fragment)
-                }
-            }
-            if self.config.fileTransferCapacity > 0 && self.config.fileTransferSyncIntervalSeconds > 0 {
-                self.queue.asyncAfter(deadline: .now() + 1.0) { [weak self] in
-                    self?.sendRequestSync(to: peerID, types: .fileTransfer)
-                }
-            }
+            self?.sendRequestSync(to: peerID)
         }
     }
 
@@ -165,45 +87,47 @@ final class GossipSyncManager {
     }
 
     private func _onPublicPacketSeen(_ packet: BitchatPacket) {
-        guard let messageType = MessageType(rawValue: packet.type) else { return }
+        let mt = MessageType(rawValue: packet.type)
         let isBroadcastRecipient: Bool = {
             guard let r = packet.recipientID else { return true }
             return r.count == 8 && r.allSatisfy { $0 == 0xFF }
         }()
+        let isBroadcastMessage = (mt == .message && isBroadcastRecipient)
+        let isAnnounce = (mt == .announce)
+        guard isBroadcastMessage || isAnnounce else { return }
 
-        switch messageType {
-        case .announce:
-            guard isPacketFresh(packet) else { return }
+        // Reject expired packets to prevent ghost peers and old messages
+        guard isPacketFresh(packet) else { return }
+
+        if isAnnounce {
             guard isAnnouncementFresh(packet) else {
-                let sender = PeerID(hexData: packet.senderID)
-                removeState(for: sender)
+                let sender = packet.senderID.hexEncodedString().lowercased()
+                removeState(forNormalizedPeerID: sender)
                 return
             }
-            let idHex = PacketIdUtil.computeId(packet).hexEncodedString()
-            let sender = PeerID(hexData: packet.senderID)
+        }
+
+        let idHex = PacketIdUtil.computeId(packet).hexEncodedString()
+
+        if isBroadcastMessage {
+            if messages[idHex] == nil {
+                messages[idHex] = packet
+                messageOrder.append(idHex)
+                // Enforce capacity
+                let cap = max(1, config.seenCapacity)
+                while messageOrder.count > cap {
+                    let victim = messageOrder.removeFirst()
+                    messages.removeValue(forKey: victim)
+                }
+            }
+        } else if isAnnounce {
+            let sender = packet.senderID.hexEncodedString().lowercased()
             latestAnnouncementByPeer[sender] = (id: idHex, packet: packet)
-        case .message:
-            guard isBroadcastRecipient else { return }
-            guard isPacketFresh(packet) else { return }
-            let idHex = PacketIdUtil.computeId(packet).hexEncodedString()
-            messages.insert(idHex: idHex, packet: packet, capacity: max(1, config.seenCapacity))
-        case .fragment:
-            guard isBroadcastRecipient else { return }
-            guard isPacketFresh(packet) else { return }
-            let idHex = PacketIdUtil.computeId(packet).hexEncodedString()
-            fragments.insert(idHex: idHex, packet: packet, capacity: max(1, config.fragmentCapacity))
-        case .fileTransfer:
-            guard isBroadcastRecipient else { return }
-            guard isPacketFresh(packet) else { return }
-            let idHex = PacketIdUtil.computeId(packet).hexEncodedString()
-            fileTransfers.insert(idHex: idHex, packet: packet, capacity: max(1, config.fileTransferCapacity))
-        default:
-            break
         }
     }
 
-    private func sendRequestSync(for types: SyncTypeFlags) {
-        let payload = buildGcsPayload(for: types)
+    private func sendRequestSync() {
+        let payload = buildGcsPayload()
         let pkt = BitchatPacket(
             type: MessageType.requestSync.rawValue,
             senderID: Data(hexString: myPeerID.id) ?? Data(),
@@ -217,8 +141,8 @@ final class GossipSyncManager {
         delegate?.sendPacket(signed)
     }
 
-    private func sendRequestSync(to peerID: PeerID, types: SyncTypeFlags) {
-        let payload = buildGcsPayload(for: types)
+    private func sendRequestSync(to peerID: PeerID) {
+        let payload = buildGcsPayload()
         var recipient = Data()
         var temp = peerID.id
         while temp.count >= 2 && recipient.count < 8 {
@@ -246,7 +170,6 @@ final class GossipSyncManager {
     }
 
     private func _handleRequestSync(from peerID: PeerID, request: RequestSyncPacket) {
-        let requestedTypes = (request.types ?? .publicMessages)
         // Decode GCS into sorted set and prepare membership checker
         let sorted = GCSFilter.decodeToSortedSet(p: request.p, m: request.m, data: request.data)
         func mightContain(_ id: Data) -> Bool {
@@ -254,100 +177,60 @@ final class GossipSyncManager {
             return GCSFilter.contains(sortedValues: sorted, candidate: bucket)
         }
 
-        if requestedTypes.contains(.announce) {
-            for (_, pair) in latestAnnouncementByPeer {
-                let (idHex, pkt) = pair
-                guard isPacketFresh(pkt) else { continue }
-                let idBytes = Data(hexString: idHex) ?? Data()
-                if !mightContain(idBytes) {
-                    var toSend = pkt
-                    toSend.ttl = 0
-                    delegate?.sendPacket(to: peerID, packet: toSend)
-                }
+        // 1) Announcements: send latest per peer if requester lacks them (and not expired)
+        for (_, pair) in latestAnnouncementByPeer {
+            let (idHex, pkt) = pair
+            guard isPacketFresh(pkt) else { continue }
+            let idBytes = Data(hexString: idHex) ?? Data()
+            if !mightContain(idBytes) {
+                var toSend = pkt
+                toSend.ttl = 0
+                delegate?.sendPacket(to: peerID, packet: toSend)
             }
         }
 
-        if requestedTypes.contains(.message) {
-            let toSendMsgs = messages.allPackets(isFresh: isPacketFresh)
-            for pkt in toSendMsgs {
-                let idBytes = PacketIdUtil.computeId(pkt)
-                if !mightContain(idBytes) {
-                    var toSend = pkt
-                    toSend.ttl = 0
-                    delegate?.sendPacket(to: peerID, packet: toSend)
-                }
-            }
-        }
-
-        if requestedTypes.contains(.fragment) {
-            let frags = fragments.allPackets(isFresh: isPacketFresh)
-            for pkt in frags {
-                let idBytes = PacketIdUtil.computeId(pkt)
-                if !mightContain(idBytes) {
-                    var toSend = pkt
-                    toSend.ttl = 0
-                    delegate?.sendPacket(to: peerID, packet: toSend)
-                }
-            }
-        }
-
-        if requestedTypes.contains(.fileTransfer) {
-            let files = fileTransfers.allPackets(isFresh: isPacketFresh)
-            for pkt in files {
-                let idBytes = PacketIdUtil.computeId(pkt)
-                if !mightContain(idBytes) {
-                    var toSend = pkt
-                    toSend.ttl = 0
-                    delegate?.sendPacket(to: peerID, packet: toSend)
-                }
+        // 2) Broadcast messages: send all missing (and not expired)
+        let toSendMsgs = messageOrder.compactMap { messages[$0] }
+        for pkt in toSendMsgs {
+            guard isPacketFresh(pkt) else { continue }
+            let idBytes = PacketIdUtil.computeId(pkt)
+            if !mightContain(idBytes) {
+                var toSend = pkt
+                toSend.ttl = 0
+                delegate?.sendPacket(to: peerID, packet: toSend)
             }
         }
     }
 
     // Build REQUEST_SYNC payload using current candidates and GCS params
-    private func buildGcsPayload(for types: SyncTypeFlags) -> Data {
+    private func buildGcsPayload() -> Data {
+        // Collect candidates: latest announce per peer + broadcast messages (only fresh)
         var candidates: [BitchatPacket] = []
-        if types.contains(.announce) {
-            for (_, pair) in latestAnnouncementByPeer where isPacketFresh(pair.packet) {
+        candidates.reserveCapacity(latestAnnouncementByPeer.count + messageOrder.count)
+        for (_, pair) in latestAnnouncementByPeer {
+            if isPacketFresh(pair.packet) {
                 candidates.append(pair.packet)
             }
         }
-        if types.contains(.message) {
-            candidates.append(contentsOf: messages.allPackets(isFresh: isPacketFresh))
+        for id in messageOrder {
+            if let p = messages[id], isPacketFresh(p) {
+                candidates.append(p)
+            }
         }
-        if types.contains(.fragment) {
-            candidates.append(contentsOf: fragments.allPackets(isFresh: isPacketFresh))
-        }
-        if types.contains(.fileTransfer) {
-            candidates.append(contentsOf: fileTransfers.allPackets(isFresh: isPacketFresh))
-        }
-        if candidates.isEmpty {
-            let p = GCSFilter.deriveP(targetFpr: config.gcsTargetFpr)
-            let req = RequestSyncPacket(p: p, m: 1, data: Data(), types: types)
-            return req.encode()
-        }
-
         // Sort by timestamp desc
         candidates.sort { $0.timestamp > $1.timestamp }
 
         let p = GCSFilter.deriveP(targetFpr: config.gcsTargetFpr)
         let nMax = GCSFilter.estimateMaxElements(sizeBytes: config.gcsMaxBytes, p: p)
-        let cap: Int
-        if types == .fragment {
-            cap = max(1, config.fragmentCapacity)
-        } else if types == .fileTransfer {
-            cap = max(1, config.fileTransferCapacity)
-        } else {
-            cap = max(1, config.seenCapacity)
-        }
+        let cap = max(1, config.seenCapacity)
         let takeN = min(candidates.count, min(nMax, cap))
         if takeN <= 0 {
-            let req = RequestSyncPacket(p: p, m: 1, data: Data(), types: types)
+            let req = RequestSyncPacket(p: p, m: 1, data: Data())
             return req.encode()
         }
         let ids: [Data] = candidates.prefix(takeN).map { PacketIdUtil.computeId($0) }
         let params = GCSFilter.buildFilter(ids: ids, maxBytes: config.gcsMaxBytes, targetFpr: config.gcsTargetFpr)
-        let req = RequestSyncPacket(p: params.p, m: params.m, data: params.data, types: types)
+        let req = RequestSyncPacket(p: params.p, m: params.m, data: params.data)
         return req.encode()
     }
 
@@ -358,21 +241,20 @@ final class GossipSyncManager {
             isPacketFresh(pair.packet)
         }
 
-        messages.removeExpired(isFresh: isPacketFresh)
-        fragments.removeExpired(isFresh: isPacketFresh)
-        fileTransfers.removeExpired(isFresh: isPacketFresh)
+        // Remove expired messages
+        let expiredMessageIds = messages.compactMap { id, pkt in
+            isPacketFresh(pkt) ? nil : id
+        }
+        for id in expiredMessageIds {
+            messages.removeValue(forKey: id)
+            messageOrder.removeAll { $0 == id }
+        }
     }
 
     private func performPeriodicMaintenance(now: Date = Date()) {
         cleanupExpiredMessages()
         cleanupStaleAnnouncementsIfNeeded(now: now)
-        for index in syncSchedules.indices {
-            guard syncSchedules[index].interval > 0 else { continue }
-            if syncSchedules[index].lastSent == .distantPast || now.timeIntervalSince(syncSchedules[index].lastSent) >= syncSchedules[index].interval {
-                syncSchedules[index].lastSent = now
-                sendRequestSync(for: syncSchedules[index].types)
-            }
-        }
+        sendRequestSync()
     }
 
     private func cleanupStaleAnnouncementsIfNeeded(now: Date) {
@@ -388,27 +270,40 @@ final class GossipSyncManager {
         let nowMs = UInt64(now.timeIntervalSince1970 * 1000)
         guard nowMs >= timeoutMs else { return }
         let cutoff = nowMs - timeoutMs
-        let stalePeerIDs = latestAnnouncementByPeer.compactMap { peerID, pair in
-            pair.packet.timestamp < cutoff ? peerID : nil
+        let stalePeerIDs = latestAnnouncementByPeer.compactMap { (peerHex, pair) -> String? in
+            pair.packet.timestamp < cutoff ? peerHex.lowercased() : nil
         }
         guard !stalePeerIDs.isEmpty else { return }
         for peerKey in stalePeerIDs {
-            removeState(for: peerKey)
+            removeState(forNormalizedPeerID: peerKey)
         }
     }
 
     // Explicit removal hook for LEAVE/stale peer
     func removeAnnouncementForPeer(_ peerID: PeerID) {
         queue.async { [weak self] in
-            self?.removeState(for: peerID)
+            self?._removeAnnouncementForPeer(peerID)
         }
     }
 
-    private func removeState(for peerID: PeerID) {
-        _ = latestAnnouncementByPeer.removeValue(forKey: peerID)
-        messages.remove { PeerID(hexData: $0.senderID) == peerID }
-        fragments.remove { PeerID(hexData: $0.senderID) == peerID }
-        fileTransfers.remove { PeerID(hexData: $0.senderID) == peerID }
+    private func _removeAnnouncementForPeer(_ peerID: PeerID) {
+        let normalizedPeerID = peerID.id.lowercased()
+        removeState(forNormalizedPeerID: normalizedPeerID)
+    }
+
+    private func removeState(forNormalizedPeerID normalizedPeerID: String) {
+        _ = latestAnnouncementByPeer.removeValue(forKey: normalizedPeerID)
+        // Remove messages from this peer
+        // Collect IDs to remove first to avoid concurrent modification
+        let messageIdsToRemove = messages.compactMap { (id, message) -> String? in
+            message.senderID.hexEncodedString().lowercased() == normalizedPeerID ? id : nil
+        }
+        
+        // Remove messages and update messageOrder
+        for id in messageIdsToRemove {
+            messages.removeValue(forKey: id)
+            messageOrder.removeAll { $0 == id }
+        }
     }
 }
 
@@ -422,13 +317,13 @@ extension GossipSyncManager {
 
     func _hasAnnouncement(for peerID: PeerID) -> Bool {
         queue.sync {
-            latestAnnouncementByPeer[peerID] != nil
+            latestAnnouncementByPeer[peerID.id.lowercased()] != nil
         }
     }
 
     func _messageCount(for peerID: PeerID) -> Int {
         queue.sync {
-            messages.allPackets { _ in true }.filter { PeerID(hexData: $0.senderID) == peerID }.count
+            messages.values.filter { $0.senderID.hexEncodedString().lowercased() == peerID.id.lowercased() }.count
         }
     }
 }

bitchat/Sync/SyncTypeFlags.swift

@@ -1,104 +0,0 @@
-import Foundation
-
-/// Bitfield describing which message types are covered by a REQUEST_SYNC round.
-/// Matches the Android mapping (bit index -> message type).
-struct SyncTypeFlags: OptionSet {
-    let rawValue: UInt64
-
-    init(rawValue: UInt64) {
-        self.rawValue = rawValue & 0x00FF_FFFF_FFFF_FFFF // Trim to max 8 bytes
-    }
-
-    private static func bitIndex(for type: MessageType) -> Int? {
-        switch type {
-        case .announce: return 0
-        case .message: return 1
-        case .leave: return 2
-        case .noiseHandshake: return 3
-        case .noiseEncrypted: return 4
-        case .fragment: return 5
-        case .requestSync: return 6
-        case .fileTransfer: return 7
-        }
-    }
-
-    private static func type(forBit index: Int) -> MessageType? {
-        switch index {
-        case 0: return .announce
-        case 1: return .message
-        case 2: return .leave
-        case 3: return .noiseHandshake
-        case 4: return .noiseEncrypted
-        case 5: return .fragment
-        case 6: return .requestSync
-        case 7: return .fileTransfer
-        default:
-            return nil
-        }
-    }
-
-    static let announce = SyncTypeFlags(messageTypes: [.announce])
-    static let message = SyncTypeFlags(messageTypes: [.message])
-    static let fragment = SyncTypeFlags(messageTypes: [.fragment])
-    static let fileTransfer = SyncTypeFlags(messageTypes: [.fileTransfer])
-
-    static let publicMessages = SyncTypeFlags(messageTypes: [.announce, .message])
-
-    init(messageTypes: [MessageType]) {
-        var raw: UInt64 = 0
-        for type in messageTypes {
-            guard let bit = SyncTypeFlags.bitIndex(for: type) else { continue }
-            raw |= (1 << UInt64(bit))
-        }
-        self.init(rawValue: raw)
-    }
-
-    func contains(_ type: MessageType) -> Bool {
-        guard let bit = SyncTypeFlags.bitIndex(for: type) else { return false }
-        return contains(SyncTypeFlags(rawValue: 1 << UInt64(bit)))
-    }
-
-    func union(_ other: SyncTypeFlags) -> SyncTypeFlags {
-        SyncTypeFlags(rawValue: rawValue | other.rawValue)
-    }
-
-    func intersection(_ other: SyncTypeFlags) -> SyncTypeFlags {
-        SyncTypeFlags(rawValue: rawValue & other.rawValue)
-    }
-
-    func toMessageTypes() -> [MessageType] {
-        guard rawValue != 0 else { return [] }
-        var types: [MessageType] = []
-        for bit in 0..<64 {
-            guard (rawValue & (1 << UInt64(bit))) != 0 else { continue }
-            if let type = SyncTypeFlags.type(forBit: bit) {
-                types.append(type)
-            }
-        }
-        return types
-    }
-
-    func toData() -> Data? {
-        guard rawValue != 0 else { return nil }
-        var value = rawValue
-        var bytes: [UInt8] = []
-        while value > 0 && bytes.count < 8 {
-            bytes.append(UInt8(value & 0xFF))
-            value >>= 8
-        }
-        while let last = bytes.last, last == 0 {
-            bytes.removeLast()
-        }
-        guard !bytes.isEmpty, bytes.count <= 8 else { return nil }
-        return Data(bytes)
-    }
-
-    static func decode(_ data: Data) -> SyncTypeFlags? {
-        guard (1...8).contains(data.count) else { return nil }
-        var raw: UInt64 = 0
-        for (index, byte) in data.enumerated() {
-            raw |= UInt64(byte) << UInt64(index * 8)
-        }
-        return SyncTypeFlags(rawValue: raw)
-    }
-}

bitchat/Utils/CompressionUtil.swift

@@ -61,13 +61,15 @@ struct CompressionUtil {
         // 1. Data is too small
         // 2. Data appears to be already compressed (high entropy)
         guard data.count >= compressionThreshold else { return false }
-
-        // Quick uniqueness check — a high diversity of bytes usually means the
-        // payload is already compressed. We only need to know how many unique
-        // values exist rather than keeping full frequency counts.
-        let uniqueByteCount = Set(data).count
-        let sampleSize = min(data.count, 256)
-        let uniqueByteRatio = Double(uniqueByteCount) / Double(sampleSize)
+        
+        // Simple entropy check - count unique bytes
+        var byteFrequency = [UInt8: Int]()
+        for byte in data {
+            byteFrequency[byte, default: 0] += 1
+        }
+        
+        // If we have very high byte diversity, data is likely already compressed
+        let uniqueByteRatio = Double(byteFrequency.count) / Double(min(data.count, 256))
         return uniqueByteRatio < 0.9 // Compress if less than 90% unique bytes
     }
 }

bitchat/Utils/FileTransferLimits.swift

@@ -5,9 +5,9 @@ enum FileTransferLimits {
     /// Absolute ceiling enforced for any file payload (voice, image, other).
     static let maxPayloadBytes: Int = 1 * 1024 * 1024 // 1 MiB
     /// Voice notes stay small for low-latency relays.
-    static let maxVoiceNoteBytes: Int = 512 * 1024 // 512 KiB
+    static let maxVoiceNoteBytes: Int = 1 * 1024 * 1024 // 1 MiB
     /// Compressed images after downscaling should comfortably fit under this budget.
-    static let maxImageBytes: Int = 512 * 1024 // 512 KiB
+    static let maxImageBytes: Int = 1 * 1024 * 1024 // 1 MiB
     /// Worst-case size once TLV metadata and binary packet framing are included for the largest payloads.
     static let maxFramedFileBytes: Int = {
         let maxMetadataBytes = Int(UInt16.max) * 2 // fileName + mimeType TLVs

bitchat/Utils/InputValidator.swift

@@ -1,5 +1,4 @@
 import Foundation
-import BitLogger
 
 /// Comprehensive input validation for BitChat protocol
 /// Prevents injection attacks, buffer overflows, and malformed data
@@ -17,28 +16,29 @@ struct InputValidator {
     // MARK: - String Content Validation
     
     /// Validates and sanitizes user-provided strings used in UI
-    ///
-    /// Rejects strings containing control characters to prevent potential security issues
-    /// and UI rendering problems. This strict approach ensures data integrity at input time.
     static func validateUserString(_ string: String, maxLength: Int) -> String? {
+        // Check empty
+        guard !string.isEmpty else { return nil }
+
+        // Trim whitespace
         let trimmed = string.trimmingCharacters(in: .whitespacesAndNewlines)
         guard !trimmed.isEmpty else { return nil }
+
+        // Check length
         guard trimmed.count <= maxLength else { return nil }
 
-        // Reject control characters outright instead of rewriting the string.
-        // This prevents injection attacks and ensures consistent UI rendering.
+        // Remove control characters
         let controlChars = CharacterSet.controlCharacters
-        if !trimmed.unicodeScalars.allSatisfy({ !controlChars.contains($0) }) {
-            // Log rejection for monitoring, without exposing actual content for privacy
-            let controlCharCount = trimmed.unicodeScalars.filter { controlChars.contains($0) }.count
-            SecureLogger.debug(
-                "Input validation rejected string (length: \(trimmed.count), control chars: \(controlCharCount))",
-                category: .security
-            )
-            return nil
-        }
-
-        return trimmed
+        let cleaned = trimmed.components(separatedBy: controlChars).joined()
+        
+        // Ensure valid UTF-8 (should already be, but double-check)
+        guard cleaned.data(using: .utf8) != nil else { return nil }
+        
+        // Prevent zero-width characters and other invisible unicode
+        let invisibleChars = CharacterSet(charactersIn: "\u{200B}\u{200C}\u{200D}\u{FEFF}")
+        let visible = cleaned.components(separatedBy: invisibleChars).joined()
+        
+        return visible.isEmpty ? nil : visible
     }
     
     /// Validates nickname

bitchat/Utils/MessageDeduplicator.swift

@@ -2,98 +2,38 @@ import Foundation
 
 // MARK: - Message Deduplicator (shared)
 
-/// Thread-safe deduplicator with LRU eviction and time-based expiry.
-/// Used for both message ID deduplication (network layer) and content key deduplication (UI layer).
 final class MessageDeduplicator {
     private struct Entry {
-        let id: String
+        let messageID: String
         let timestamp: Date
     }
 
     private var entries: [Entry] = []
     private var head: Int = 0
-    private var lookup: [String: Date] = [:]  // id -> timestamp for O(1) lookup
+    private var lookup = Set<String>()
     private let lock = NSLock()
-    private let maxAge: TimeInterval
-    private let maxCount: Int
-
-    /// Initialize with default config from TransportConfig
-    convenience init() {
-        self.init(
-            maxAge: TransportConfig.messageDedupMaxAgeSeconds,
-            maxCount: TransportConfig.messageDedupMaxCount
-        )
-    }
-
-    /// Initialize with custom config for content deduplication
-    init(maxAge: TimeInterval, maxCount: Int) {
-        self.maxAge = maxAge
-        self.maxCount = maxCount
-    }
+    private let maxAge: TimeInterval = TransportConfig.messageDedupMaxAgeSeconds  // 5 minutes
+    private let maxCount = TransportConfig.messageDedupMaxCount
 
     /// Check if message is duplicate and add if not
-    func isDuplicate(_ id: String) -> Bool {
+    func isDuplicate(_ messageID: String) -> Bool {
         lock.lock()
         defer { lock.unlock() }
 
         cleanupOldEntries()
 
-        if lookup[id] != nil {
+        if lookup.contains(messageID) {
             return true
         }
 
-        let now = Date()
-        entries.append(Entry(id: id, timestamp: now))
-        lookup[id] = now
-        trimIfNeeded()
+        entries.append(Entry(messageID: messageID, timestamp: Date()))
+        lookup.insert(messageID)
 
-        return false
-    }
-
-    /// Record an ID with a specific timestamp (for content key tracking)
-    func record(_ id: String, timestamp: Date) {
-        lock.lock()
-        defer { lock.unlock() }
-
-        if lookup[id] == nil {
-            entries.append(Entry(id: id, timestamp: timestamp))
-        }
-        lookup[id] = timestamp
-        trimIfNeeded()
-    }
-
-    /// Add an ID without checking (for announce-back tracking)
-    func markProcessed(_ id: String) {
-        lock.lock()
-        defer { lock.unlock() }
-
-        if lookup[id] == nil {
-            let now = Date()
-            entries.append(Entry(id: id, timestamp: now))
-            lookup[id] = now
-        }
-    }
-
-    /// Check if ID exists without adding
-    func contains(_ id: String) -> Bool {
-        lock.lock()
-        defer { lock.unlock() }
-        return lookup[id] != nil
-    }
-
-    /// Get timestamp for an ID (for content deduplication time-window checks)
-    func timestampFor(_ id: String) -> Date? {
-        lock.lock()
-        defer { lock.unlock() }
-        return lookup[id]
-    }
-
-    private func trimIfNeeded() {
         // Soft-cap and advance head by a chunk to avoid O(n) shifting
         if (entries.count - head) > maxCount {
             let removeCount = min(100, entries.count - head)
             for i in head..<(head + removeCount) {
-                lookup.removeValue(forKey: entries[i].id)
+                lookup.remove(entries[i].messageID)
             }
             head += removeCount
             // Periodically compact to reclaim memory
@@ -102,6 +42,26 @@ final class MessageDeduplicator {
                 head = 0
             }
         }
+
+        return false
+    }
+
+    /// Add an ID without checking (for announce-back tracking)
+    func markProcessed(_ messageID: String) {
+        lock.lock()
+        defer { lock.unlock() }
+
+        if !lookup.contains(messageID) {
+            entries.append(Entry(messageID: messageID, timestamp: Date()))
+            lookup.insert(messageID)
+        }
+    }
+
+    /// Check if ID exists without adding
+    func contains(_ messageID: String) -> Bool {
+        lock.lock()
+        defer { lock.unlock() }
+        return lookup.contains(messageID)
     }
 
     /// Clear all entries
@@ -129,7 +89,7 @@ final class MessageDeduplicator {
     private func cleanupOldEntries() {
         let cutoff = Date().addingTimeInterval(-maxAge)
         while head < entries.count, entries[head].timestamp < cutoff {
-            lookup.removeValue(forKey: entries[head].id)
+            lookup.remove(entries[head].messageID)
             head += 1
         }
         if head > 0 && head > entries.count / 2 {

bitchat/ViewModels/Extensions/ChatViewModel+Nostr.swift

@@ -1,814 +0,0 @@
-//
-// ChatViewModel+Nostr.swift
-// bitchat
-//
-// Geohash and Nostr logic for ChatViewModel
-//
-
-import Foundation
-import Combine
-import BitLogger
-import SwiftUI
-import Tor
-
-extension ChatViewModel {
-
-    // MARK: - Geohash Subscription
-
-    // Resubscribe to the active geohash channel without clearing timeline
-    @MainActor
-    func resubscribeCurrentGeohash() {
-        guard case .location(let ch) = activeChannel else { return }
-        guard let subID = geoSubscriptionID else {
-            // No existing subscription; set it up
-            switchLocationChannel(to: activeChannel)
-            return
-        }
-        // Ensure participant decay timer is running
-        participantTracker.startRefreshTimer()
-        // Unsubscribe + resubscribe
-        NostrRelayManager.shared.unsubscribe(id: subID)
-        let filter = NostrFilter.geohashEphemeral(
-            ch.geohash,
-            since: Date().addingTimeInterval(-TransportConfig.nostrGeohashInitialLookbackSeconds),
-            limit: TransportConfig.nostrGeohashInitialLimit
-        )
-        let subRelays = GeoRelayDirectory.shared.closestRelays(
-            toGeohash: ch.geohash,
-            count: TransportConfig.nostrGeoRelayCount
-        )
-        NostrRelayManager.shared.subscribe(filter: filter, id: subID, relayUrls: subRelays) { [weak self] event in
-            self?.subscribeNostrEvent(event)
-        }
-        // Resubscribe geohash DMs for this identity
-        if let dmSub = geoDmSubscriptionID {
-            NostrRelayManager.shared.unsubscribe(id: dmSub); geoDmSubscriptionID = nil
-        }
-        
-        if let id = try? idBridge.deriveIdentity(forGeohash: ch.geohash) {
-            let dmSub = "geo-dm-\(ch.geohash)"
-            geoDmSubscriptionID = dmSub
-            let dmFilter = NostrFilter.giftWrapsFor(pubkey: id.publicKeyHex, since: Date().addingTimeInterval(-TransportConfig.nostrDMSubscribeLookbackSeconds))
-            NostrRelayManager.shared.subscribe(filter: dmFilter, id: dmSub) { [weak self] giftWrap in
-                self?.subscribeGiftWrap(giftWrap, id: id)
-            }
-        }
-    }
-    
-    func subscribeNostrEvent(_ event: NostrEvent) {
-        guard event.kind == NostrProtocol.EventKind.ephemeralEvent.rawValue,
-              !deduplicationService.hasProcessedNostrEvent(event.id)
-        else {
-            return
-        }
-
-        deduplicationService.recordNostrEvent(event.id)
-        
-        if let gh = currentGeohash,
-           let myGeoIdentity = try? idBridge.deriveIdentity(forGeohash: gh),
-           myGeoIdentity.publicKeyHex.lowercased() == event.pubkey.lowercased() {
-            // Skip very recent self-echo from relay, but allow older events (e.g., after app restart)
-            let eventTime = Date(timeIntervalSince1970: TimeInterval(event.created_at))
-            if Date().timeIntervalSince(eventTime) < 15 {
-                return
-            }
-        }
-        
-        if let nickTag = event.tags.first(where: { $0.first == "n" }), nickTag.count >= 2 {
-            let nick = nickTag[1].trimmingCharacters(in: .whitespacesAndNewlines)
-            geoNicknames[event.pubkey.lowercased()] = nick
-        }
-        
-        // Store mapping for geohash sender IDs used in messages (ensures consistent colors)
-        nostrKeyMapping[PeerID(nostr_: event.pubkey)] = event.pubkey
-        nostrKeyMapping[PeerID(nostr: event.pubkey)] = event.pubkey
-
-        // Update participants last-seen for this pubkey
-        participantTracker.recordParticipant(pubkeyHex: event.pubkey)
-        
-        // Track teleported tag (only our format ["t","teleport"]) for icon state
-        let hasTeleportTag = event.tags.contains(where: { tag in
-            tag.count >= 2 && tag[0].lowercased() == "t" && tag[1].lowercased() == "teleport"
-        })
-        
-        if hasTeleportTag {
-            let key = event.pubkey.lowercased()
-            // Do not mark our own key from historical events; rely on manager.teleported for self
-            let isSelf: Bool = {
-                if let gh = currentGeohash, let my = try? idBridge.deriveIdentity(forGeohash: gh) {
-                    return my.publicKeyHex.lowercased() == key
-                }
-                return false
-            }()
-            if !isSelf {
-                Task { @MainActor in
-                    teleportedGeo = teleportedGeo.union([key])
-                }
-            }
-        }
-        
-        let senderName = displayNameForNostrPubkey(event.pubkey)
-        let content = event.content.trimmingCharacters(in: .whitespacesAndNewlines)
-        
-        // Clamp future timestamps to now to avoid future-dated messages skewing order
-        let rawTs = Date(timeIntervalSince1970: TimeInterval(event.created_at))
-        let timestamp = min(rawTs, Date())
-        let mentions = parseMentions(from: content)
-        let msg = BitchatMessage(
-            id: event.id,
-            sender: senderName,
-            content: content,
-            timestamp: timestamp,
-            isRelay: false,
-            senderPeerID: PeerID(nostr: event.pubkey),
-            mentions: mentions.isEmpty ? nil : mentions
-        )
-        Task { @MainActor in
-            handlePublicMessage(msg)
-            checkForMentions(msg)
-            sendHapticFeedback(for: msg)
-        }
-    }
-    
-    func subscribeGiftWrap(_ giftWrap: NostrEvent, id: NostrIdentity) {
-        guard !deduplicationService.hasProcessedNostrEvent(giftWrap.id) else { return }
-        deduplicationService.recordNostrEvent(giftWrap.id)
-        
-        guard let (content, senderPubkey, rumorTs) = try? NostrProtocol.decryptPrivateMessage(giftWrap: giftWrap, recipientIdentity: id),
-              content.hasPrefix("bitchat1:"),
-              let packetData = Self.base64URLDecode(String(content.dropFirst("bitchat1:".count))),
-              let packet = BitchatPacket.from(packetData),
-              packet.type == MessageType.noiseEncrypted.rawValue,
-              let noisePayload = NoisePayload.decode(packet.payload)
-        else {
-            return
-        }
-        
-        let messageTimestamp = Date(timeIntervalSince1970: TimeInterval(rumorTs))
-        let convKey = PeerID(nostr_: senderPubkey)
-        nostrKeyMapping[convKey] = senderPubkey
-        
-        switch noisePayload.type {
-        case .privateMessage:
-            handlePrivateMessage(noisePayload, senderPubkey: senderPubkey, convKey: convKey, id: id, messageTimestamp: messageTimestamp)
-        case .delivered:
-            handleDelivered(noisePayload, senderPubkey: senderPubkey, convKey: convKey)
-        case .readReceipt:
-            handleReadReceipt(noisePayload, senderPubkey: senderPubkey, convKey: convKey)
-        case .verifyChallenge, .verifyResponse:
-            // QR verification payloads over Nostr are not supported; ignore in geohash DMs
-            break
-        }
-    }
-
-    // MARK: - Geohash Channel Handling
-
-    @MainActor
-    func switchLocationChannel(to channel: ChannelID) {
-        // Reset pending public batches to avoid cross-channel bleed
-        publicMessagePipeline.reset()
-        
-        activeChannel = channel
-        publicMessagePipeline.updateActiveChannel(channel)
-        
-        // Reset deduplication set and optionally hydrate timeline for mesh
-        deduplicationService.clearNostrCaches()
-        switch channel {
-        case .mesh:
-            refreshVisibleMessages(from: .mesh)
-            // Debug: log if any empty messages are present
-            let emptyMesh = messages.filter { $0.content.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty }.count
-            if emptyMesh > 0 {
-                SecureLogger.debug("RenderGuard: mesh timeline contains \(emptyMesh) empty messages", category: .session)
-            }
-            participantTracker.stopRefreshTimer()
-            participantTracker.setActiveGeohash(nil)
-            teleportedGeo.removeAll()
-        case .location:
-            refreshVisibleMessages(from: channel)
-        }
-        // If switching to a location channel, flush any pending geohash-only system messages
-        if case .location = channel {
-            for content in timelineStore.drainPendingGeohashSystemMessages() {
-                addPublicSystemMessage(content)
-            }
-        }
-        // Unsubscribe previous
-        if let sub = geoSubscriptionID {
-            NostrRelayManager.shared.unsubscribe(id: sub)
-            geoSubscriptionID = nil
-        }
-        if let dmSub = geoDmSubscriptionID {
-            NostrRelayManager.shared.unsubscribe(id: dmSub)
-            geoDmSubscriptionID = nil
-        }
-        currentGeohash = nil
-        participantTracker.setActiveGeohash(nil)
-        // Reset nickname cache for geochat participants
-        geoNicknames.removeAll()
-
-        guard case .location(let ch) = channel else { return }
-        currentGeohash = ch.geohash
-        participantTracker.setActiveGeohash(ch.geohash)
-        
-        // Ensure self appears immediately in the people list; mark teleported state only when truly teleported
-        if let id = try? idBridge.deriveIdentity(forGeohash: ch.geohash) {
-            participantTracker.recordParticipant(pubkeyHex: id.publicKeyHex)
-            let hasRegional = !LocationChannelManager.shared.availableChannels.isEmpty
-            let inRegional = LocationChannelManager.shared.availableChannels.contains { $0.geohash == ch.geohash }
-            let key = id.publicKeyHex.lowercased()
-            if LocationChannelManager.shared.teleported && hasRegional && !inRegional {
-                teleportedGeo = teleportedGeo.union([key])
-                SecureLogger.info("GeoTeleport: channel switch mark self teleported key=\(key.prefix(8))… total=\(teleportedGeo.count)", category: .session)
-            } else {
-                teleportedGeo.remove(key)
-            }
-        }
-        
-        let subID = "geo-\(ch.geohash)"
-        geoSubscriptionID = subID
-        participantTracker.startRefreshTimer()
-        let ts = Date().addingTimeInterval(-TransportConfig.nostrGeohashInitialLookbackSeconds)
-        let filter = NostrFilter.geohashEphemeral(ch.geohash, since: ts, limit: TransportConfig.nostrGeohashInitialLimit)
-        let subRelays = GeoRelayDirectory.shared.closestRelays(toGeohash: ch.geohash, count: 5)
-        NostrRelayManager.shared.subscribe(filter: filter, id: subID, relayUrls: subRelays) { [weak self] event in
-            self?.handleNostrEvent(event)
-        }
-
-        subscribeToGeoChat(ch)
-    }
-    
-    func handleNostrEvent(_ event: NostrEvent) {
-        // Only handle ephemeral kind 20000 with matching tag
-        guard event.kind == NostrProtocol.EventKind.ephemeralEvent.rawValue else { return }
-        
-        // Deduplicate
-        if deduplicationService.hasProcessedNostrEvent(event.id) { return }
-        deduplicationService.recordNostrEvent(event.id)
-        
-        // Log incoming tags for diagnostics
-        let tagSummary = event.tags.map { "[" + $0.joined(separator: ",") + "]" }.joined(separator: ",")
-        SecureLogger.debug("GeoTeleport: recv pub=\(event.pubkey.prefix(8))… tags=\(tagSummary)", category: .session)
-        
-        // Track teleport tag for participants – only our format ["t", "teleport"]
-        let hasTeleportTag: Bool = event.tags.contains { tag in
-            tag.count >= 2 && tag[0].lowercased() == "t" && tag[1].lowercased() == "teleport"
-        }
-        
-        let isSelf: Bool = {
-            if let gh = currentGeohash, let my = try? idBridge.deriveIdentity(forGeohash: gh) {
-                return my.publicKeyHex.lowercased() == event.pubkey.lowercased()
-            }
-            return false
-        }()
-
-        if hasTeleportTag {
-            // Avoid marking our own key from historical events; rely on manager.teleported for self
-            if !isSelf {
-                let key = event.pubkey.lowercased()
-                Task { @MainActor in
-                    teleportedGeo = teleportedGeo.union([key])
-                    SecureLogger.info("GeoTeleport: mark peer teleported key=\(key.prefix(8))… total=\(teleportedGeo.count)", category: .session)
-                }
-            }
-        }
-        
-        // Skip only very recent self-echo from relay; include older self events for hydration
-        if isSelf {
-            let eventTime = Date(timeIntervalSince1970: TimeInterval(event.created_at))
-            if Date().timeIntervalSince(eventTime) < 15 {
-                return
-            }
-        }
-        
-        // Cache nickname from tag if present
-        if let nickTag = event.tags.first(where: { $0.first == "n" }), nickTag.count >= 2 {
-            let nick = nickTag[1].trimmingCharacters(in: .whitespacesAndNewlines)
-            geoNicknames[event.pubkey.lowercased()] = nick
-        }
-        
-        // If this pubkey is blocked, skip mapping, participants, and timeline
-        if identityManager.isNostrBlocked(pubkeyHexLowercased: event.pubkey) {
-            return
-        }
-        
-        // Store mapping for geohash DM initiation
-        nostrKeyMapping[PeerID(nostr_: event.pubkey)] = event.pubkey
-        nostrKeyMapping[PeerID(nostr: event.pubkey)] = event.pubkey
-        
-        // Update participants last-seen for this pubkey
-        participantTracker.recordParticipant(pubkeyHex: event.pubkey)
-        
-        let senderName = displayNameForNostrPubkey(event.pubkey)
-        let content = event.content
-        
-        // If this is a teleport presence event (no content), don't add to timeline
-        if let teleTag = event.tags.first(where: { $0.first == "t" }), teleTag.count >= 2, (teleTag[1] == "teleport"),
-           content.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
-            return
-        }
-        
-        // Clamp future timestamps
-        let rawTs = Date(timeIntervalSince1970: TimeInterval(event.created_at))
-        let mentions = parseMentions(from: content)
-        let msg = BitchatMessage(
-            id: event.id,
-            sender: senderName,
-            content: content,
-            timestamp: min(rawTs, Date()),
-            isRelay: false,
-            senderPeerID: PeerID(nostr: event.pubkey),
-            mentions: mentions.isEmpty ? nil : mentions
-        )
-        
-        Task { @MainActor in
-            handlePublicMessage(msg)
-            checkForMentions(msg)
-            sendHapticFeedback(for: msg)
-        }
-    }
-    
-    @MainActor
-    func subscribeToGeoChat(_ ch: GeohashChannel) {
-        guard let id = try? idBridge.deriveIdentity(forGeohash: ch.geohash) else { return }
-        
-        let dmSub = "geo-dm-\(ch.geohash)"
-        geoDmSubscriptionID = dmSub
-        // pared back logging: subscribe debug only
-        // Log GeoDM subscribe only when Tor is ready to avoid early noise
-        if TorManager.shared.isReady {
-            SecureLogger.debug("GeoDM: subscribing DMs pub=\(id.publicKeyHex.prefix(8))… sub=\(dmSub)", category: .session)
-        }
-        let dmFilter = NostrFilter.giftWrapsFor(pubkey: id.publicKeyHex, since: Date().addingTimeInterval(-TransportConfig.nostrDMSubscribeLookbackSeconds))
-        NostrRelayManager.shared.subscribe(filter: dmFilter, id: dmSub) { [weak self] giftWrap in
-            self?.handleGiftWrap(giftWrap, id: id)
-        }
-    }
-    
-    func handleGiftWrap(_ giftWrap: NostrEvent, id: NostrIdentity) {
-        if deduplicationService.hasProcessedNostrEvent(giftWrap.id) {
-            return
-        }
-        deduplicationService.recordNostrEvent(giftWrap.id)
-        
-        // Decrypt with per-geohash identity
-        guard let (content, senderPubkey, rumorTs) = try? NostrProtocol.decryptPrivateMessage(giftWrap: giftWrap, recipientIdentity: id) else {
-            SecureLogger.warning("GeoDM: failed decrypt giftWrap id=\(giftWrap.id.prefix(8))…", category: .session)
-            return
-        }
-        
-        SecureLogger.debug("GeoDM: decrypted gift-wrap id=\(giftWrap.id.prefix(16))... from=\(senderPubkey.prefix(8))...", category: .session)
-        
-        guard content.hasPrefix("bitchat1:"),
-              let packetData = Self.base64URLDecode(String(content.dropFirst("bitchat1:".count))),
-              let packet = BitchatPacket.from(packetData),
-              packet.type == MessageType.noiseEncrypted.rawValue,
-              let payload = NoisePayload.decode(packet.payload)
-        else {
-            return
-        }
-        
-        let convKey = PeerID(nostr_: senderPubkey)
-        nostrKeyMapping[convKey] = senderPubkey
-        
-        switch payload.type {
-        case .privateMessage:
-            let messageTimestamp = Date(timeIntervalSince1970: TimeInterval(rumorTs))
-            handlePrivateMessage(payload, senderPubkey: senderPubkey, convKey: convKey, id: id, messageTimestamp: messageTimestamp)
-        case .delivered:
-            handleDelivered(payload, senderPubkey: senderPubkey, convKey: convKey)
-        case .readReceipt:
-            handleReadReceipt(payload, senderPubkey: senderPubkey, convKey: convKey)
-        
-        // Explicitly list other cases so we get compile-time check if a new case is added in the future
-        case .verifyChallenge, .verifyResponse:
-            break
-        }
-    }
-
-    @MainActor
-    func sendGeohash(context: GeoOutgoingContext) {
-        let ch = context.channel
-        let event = context.event
-        let identity = context.identity
-
-        let targetRelays = GeoRelayDirectory.shared.closestRelays(
-            toGeohash: ch.geohash,
-            count: TransportConfig.nostrGeoRelayCount
-        )
-
-        if targetRelays.isEmpty {
-            SecureLogger.warning("Geo: no geohash relays available for \(ch.geohash); not sending", category: .session)
-        } else {
-            NostrRelayManager.shared.sendEvent(event, to: targetRelays)
-        }
-
-        // Track ourselves as active participant
-        participantTracker.recordParticipant(pubkeyHex: identity.publicKeyHex)
-        nostrKeyMapping[PeerID(nostr: identity.publicKeyHex)] = identity.publicKeyHex
-        SecureLogger.debug("GeoTeleport: sent geo message pub=\(identity.publicKeyHex.prefix(8))… teleported=\(context.teleported)", category: .session)
-
-        // If we tagged this as teleported, also mark our pubkey in teleportedGeo for UI
-        // Only when not in our regional set (and regional list is known)
-        let hasRegional = !LocationChannelManager.shared.availableChannels.isEmpty
-        let inRegional = LocationChannelManager.shared.availableChannels.contains { $0.geohash == ch.geohash }
-
-        if context.teleported && hasRegional && !inRegional {
-            let key = identity.publicKeyHex.lowercased()
-            teleportedGeo = teleportedGeo.union([key])
-            SecureLogger.info("GeoTeleport: mark self teleported key=\(key.prefix(8))… total=\(teleportedGeo.count)", category: .session)
-        }
-
-        deduplicationService.recordNostrEvent(event.id)
-    }
-
-    // MARK: - Sampling
-
-    /// Begin sampling multiple geohashes (used by channel sheet) without changing active channel.
-    @MainActor
-    func beginGeohashSampling(for geohashes: [String]) {
-        // Disable sampling when app is backgrounded (Tor is stopped there)
-        if !TorManager.shared.isForeground() {
-            endGeohashSampling()
-            return
-        }
-        // Determine which to add and which to remove
-        let desired = Set(geohashes)
-        let current = Set(geoSamplingSubs.values)
-        let toAdd = desired.subtracting(current)
-        let toRemove = current.subtracting(desired)
-
-        for (subID, gh) in geoSamplingSubs where toRemove.contains(gh) {
-            NostrRelayManager.shared.unsubscribe(id: subID)
-            geoSamplingSubs.removeValue(forKey: subID)
-        }
-
-        for gh in toAdd {
-            subscribe(gh)
-        }
-    }
-    
-    @MainActor
-    func subscribe(_ gh: String) {
-        let subID = "geo-sample-\(gh)"
-        geoSamplingSubs[subID] = gh
-        let filter = NostrFilter.geohashEphemeral(
-            gh,
-            since: Date().addingTimeInterval(-TransportConfig.nostrGeohashSampleLookbackSeconds),
-            limit: TransportConfig.nostrGeohashSampleLimit
-        )
-        let subRelays = GeoRelayDirectory.shared.closestRelays(toGeohash: gh, count: 5)
-        NostrRelayManager.shared.subscribe(filter: filter, id: subID, relayUrls: subRelays) { [weak self] event in
-            self?.subscribeNostrEvent(event, gh: gh)
-        }
-    }
-    
-    func subscribeNostrEvent(_ event: NostrEvent, gh: String) {
-        guard event.kind == NostrProtocol.EventKind.ephemeralEvent.rawValue else { return }
-
-        // Compute current participant count (5-minute window) BEFORE updating with this event
-        let existingCount = participantTracker.participantCount(for: gh)
-
-        // Update participants for this specific geohash
-        participantTracker.recordParticipant(pubkeyHex: event.pubkey, geohash: gh)
-        
-        // Notify only on rising-edge: previously zero people, now someone sends a chat
-        let content = event.content.trimmingCharacters(in: .whitespacesAndNewlines)
-        guard !content.isEmpty else { return }
-        
-        // Respect geohash blocks
-        if identityManager.isNostrBlocked(pubkeyHexLowercased: event.pubkey.lowercased()) { return }
-        
-        // Skip self identity for this geohash
-        if let my = try? idBridge.deriveIdentity(forGeohash: gh), my.publicKeyHex.lowercased() == event.pubkey.lowercased() { return }
-        
-        // Only trigger when there were zero participants in this geohash recently
-        guard existingCount == 0 else { return }
-        
-        // Avoid notifications for old sampled events when launching or (re)subscribing
-        let eventTime = Date(timeIntervalSince1970: TimeInterval(event.created_at))
-        if Date().timeIntervalSince(eventTime) > 30 { return }
-        
-        // Foreground-only notifications: app must be active, and not already viewing this geohash
-        #if os(iOS)
-        guard UIApplication.shared.applicationState == .active else { return }
-        if case .location(let ch) = activeChannel, ch.geohash == gh { return }
-        #elseif os(macOS)
-        guard NSApplication.shared.isActive else { return }
-        if case .location(let ch) = activeChannel, ch.geohash == gh { return }
-        #endif
-        
-        cooldownPerGeohash(gh, content: content, event: event)
-    }
-    
-    func cooldownPerGeohash(_ gh: String, content: String, event: NostrEvent) {
-        let now = Date()
-        let last = lastGeoNotificationAt[gh] ?? .distantPast
-        if now.timeIntervalSince(last) < TransportConfig.uiGeoNotifyCooldownSeconds { return }
-        
-        // Compose a short preview
-        let preview: String = {
-            let maxLen = TransportConfig.uiGeoNotifySnippetMaxLen
-            if content.count <= maxLen { return content }
-            let idx = content.index(content.startIndex, offsetBy: maxLen)
-            return String(content[..<idx]) + "…"
-        }()
-
-        Task { @MainActor in
-            lastGeoNotificationAt[gh] = now
-            // Pre-populate the target geohash timeline so the triggering message appears when user opens it
-            let senderSuffix = String(event.pubkey.suffix(4))
-            let nick = geoNicknames[event.pubkey.lowercased()]
-            let senderName = (nick?.isEmpty == false ? nick! : "anon") + "#" + senderSuffix
-            
-            // Clamp future timestamps
-            let rawTs = Date(timeIntervalSince1970: TimeInterval(event.created_at))
-            let ts = min(rawTs, Date())
-            let mentions = self.parseMentions(from: content)
-            let msg = BitchatMessage(
-                id: event.id,
-                sender: senderName,
-                content: content,
-                timestamp: ts,
-                isRelay: false,
-                senderPeerID: PeerID(nostr: event.pubkey),
-                mentions: mentions.isEmpty ? nil : mentions
-            )
-            if timelineStore.appendIfAbsent(msg, toGeohash: gh) {
-                NotificationService.shared.sendGeohashActivityNotification(geohash: gh, bodyPreview: preview)
-            }
-        }
-    }
-
-    /// Stop sampling all extra geohashes.
-    @MainActor
-    func endGeohashSampling() {
-        for subID in geoSamplingSubs.keys { NostrRelayManager.shared.unsubscribe(id: subID) }
-        geoSamplingSubs.removeAll()
-    }
-
-    // MARK: - Nostr DM Handling
-
-    func setupNostrMessageHandling() {
-        guard let currentIdentity = try? idBridge.getCurrentNostrIdentity() else {
-            SecureLogger.warning("⚠️ No Nostr identity available for message handling", category: .session)
-            return
-        }
-        
-        SecureLogger.debug("🔑 Setting up Nostr subscription for pubkey: \(currentIdentity.publicKeyHex.prefix(16))...", category: .session)
-        
-        // Subscribe to Nostr messages
-        let filter = NostrFilter.giftWrapsFor(
-            pubkey: currentIdentity.publicKeyHex,
-            since: Date().addingTimeInterval(-TransportConfig.nostrDMSubscribeLookbackSeconds)  // Last 24 hours
-        )
-        
-        nostrRelayManager?.subscribe(filter: filter, id: "chat-messages") { [weak self] event in
-            self?.handleNostrMessage(event)
-        }
-    }
-    
-    func handleNostrMessage(_ giftWrap: NostrEvent) {
-        // Deduplicate messages by ID
-        if deduplicationService.hasProcessedNostrEvent(giftWrap.id) { return }
-        deduplicationService.recordNostrEvent(giftWrap.id)
-        
-        // Ensure we're on a background queue for decryption
-        Task.detached(priority: .userInitiated) { [weak self] in
-            await self?.processNostrMessage(giftWrap)
-        }
-    }
-    
-    func processNostrMessage(_ giftWrap: NostrEvent) async {
-        guard let currentIdentity = try? idBridge.getCurrentNostrIdentity() else { return }
-        
-        do {
-            let (content, senderPubkey, rumorTimestamp) = try NostrProtocol.decryptPrivateMessage(
-                giftWrap: giftWrap,
-                recipientIdentity: currentIdentity
-            )
-            
-            // Handle verification payloads first
-            if content.hasPrefix("verify:") {
-                // Ignore verification payloads arriving via Nostr path for now
-                // Verification should ideally happen over mesh for security binding
-                return
-            }
-            
-            // Check if it's a BitChat packet embedded in the content (bitchat1:...)
-            if content.hasPrefix("bitchat1:") {
-                guard let packetData = Self.base64URLDecode(String(content.dropFirst("bitchat1:".count))),
-                      let packet = BitchatPacket.from(packetData) else {
-                    SecureLogger.error("Failed to decode embedded BitChat packet from Nostr DM", category: .session)
-                    return
-                }
-                
-                // Map sender by Nostr pubkey to Noise key when possible
-                let actualSenderNoiseKey = findNoiseKey(for: senderPubkey)
-                
-                // Stable target ID if we know Noise key; otherwise temporary Nostr-based peer
-                let targetPeerID = PeerID(str: actualSenderNoiseKey?.hexEncodedString()) ?? PeerID(nostr_: senderPubkey)
-                
-                if packet.type == MessageType.noiseEncrypted.rawValue {
-                    if let payload = NoisePayload.decode(packet.payload) {
-                        let messageTimestamp = Date(timeIntervalSince1970: TimeInterval(rumorTimestamp))
-                        // Store Nostr mapping
-                        await MainActor.run {
-                            nostrKeyMapping[targetPeerID] = senderPubkey
-                            
-                            // Handle packet types
-                            switch payload.type {
-                            case .privateMessage:
-                                handlePrivateMessage(payload, senderPubkey: senderPubkey, convKey: targetPeerID, id: currentIdentity, messageTimestamp: messageTimestamp)
-                            case .delivered:
-                                handleDelivered(payload, senderPubkey: senderPubkey, convKey: targetPeerID)
-                            case .readReceipt:
-                                handleReadReceipt(payload, senderPubkey: senderPubkey, convKey: targetPeerID)
-                            case .verifyChallenge, .verifyResponse:
-                                break
-                            }
-                        }
-                    }
-                }
-            } else {
-                SecureLogger.debug("Ignoring non-embedded Nostr DM content", category: .session)
-            }
-        } catch {
-            SecureLogger.error("Failed to decrypt Nostr message: \(error)", category: .session)
-        }
-    }
-
-    func findNoiseKey(for nostrPubkey: String) -> Data? {
-        // Check favorites for this Nostr key
-        let favorites = FavoritesPersistenceService.shared.favorites.values
-        var npubToMatch = nostrPubkey
-        
-        // Convert hex to npub if needed for comparison
-        if !nostrPubkey.hasPrefix("npub") {
-            if let pubkeyData = Data(hexString: nostrPubkey),
-               let encoded = try? Bech32.encode(hrp: "npub", data: pubkeyData) {
-                npubToMatch = encoded
-            } else {
-                SecureLogger.warning("⚠️ Invalid hex public key format or encoding failed: \(nostrPubkey.prefix(16))...", category: .session)
-            }
-        }
-        
-        for relationship in favorites {
-            // Search through favorites for matching Nostr pubkey
-            if let storedNostrKey = relationship.peerNostrPublicKey {
-                // Compare against stored key (could be hex or npub)
-                if storedNostrKey == npubToMatch {
-                    // SecureLogger.debug("✅ Found Noise key for Nostr sender (npub match)", category: .session)
-                    return relationship.peerNoisePublicKey
-                }
-                
-                // Also try comparing raw hex if stored key is hex
-                if !storedNostrKey.hasPrefix("npub") && storedNostrKey == nostrPubkey {
-                    SecureLogger.debug("✅ Found Noise key for Nostr sender (hex match)", category: .session)
-                    return relationship.peerNoisePublicKey
-                }
-            }
-        }
-        
-        SecureLogger.debug("⚠️ No matching Noise key found for Nostr pubkey: \(nostrPubkey.prefix(16))... (tried npub: \(npubToMatch.prefix(16))...)", category: .session)
-        return nil
-    }
-
-    func sendDeliveryAckViaNostrEmbedded(_ message: BitchatMessage, wasReadBefore: Bool, senderPubkey: String, key: Data?) {
-        // If we have a Noise key, try to route securely if possible, otherwise fallback to direct
-        if let _ = key {
-             // Ideally we would use MessageRouter here, but for simplicity in this direct callback:
-             // check if we have an identity
-             if let id = try? idBridge.getCurrentNostrIdentity() {
-                 let nt = NostrTransport(keychain: keychain, idBridge: idBridge)
-                 nt.senderPeerID = meshService.myPeerID
-                 nt.sendDeliveryAckGeohash(for: message.id, toRecipientHex: senderPubkey, from: id)
-             }
-        } else if let id = try? idBridge.getCurrentNostrIdentity() {
-            // Fallback: no Noise mapping yet — send directly to sender's Nostr pubkey
-            let nt = NostrTransport(keychain: keychain, idBridge: idBridge)
-            nt.senderPeerID = meshService.myPeerID
-            nt.sendDeliveryAckGeohash(for: message.id, toRecipientHex: senderPubkey, from: id)
-            SecureLogger.debug("Sent DELIVERED ack directly to Nostr pub=\(senderPubkey.prefix(8))… for mid=\(message.id.prefix(8))…", category: .session)
-        }
-        
-        // Same for READ receipt if viewing
-        if !wasReadBefore && selectedPrivateChatPeer == message.senderPeerID {
-             if let _ = key {
-                 if let id = try? idBridge.getCurrentNostrIdentity() {
-                     let nt = NostrTransport(keychain: keychain, idBridge: idBridge)
-                     nt.senderPeerID = meshService.myPeerID
-                     nt.sendReadReceiptGeohash(message.id, toRecipientHex: senderPubkey, from: id)
-                 }
-             } else if let id = try? idBridge.getCurrentNostrIdentity() {
-                 let nt = NostrTransport(keychain: keychain, idBridge: idBridge)
-                 nt.senderPeerID = meshService.myPeerID
-                 nt.sendReadReceiptGeohash(message.id, toRecipientHex: senderPubkey, from: id)
-                 SecureLogger.debug("Viewing chat; sent READ ack directly to Nostr pub=\(senderPubkey.prefix(8))… for mid=\(message.id.prefix(8))…", category: .session)
-             }
-        }
-    }
-
-    func handleFavoriteNotification(content: String, from nostrPubkey: String) {
-        // Try to find Noise key associated with this Nostr pubkey
-        guard let senderNoiseKey = findNoiseKey(for: nostrPubkey) else { return }
-        
-        let isFavorite = content.contains("FAVORITE:TRUE")
-        let senderNickname = content.components(separatedBy: "|").last ?? "Unknown"
-        
-        // Update favorite status
-        if isFavorite {
-            FavoritesPersistenceService.shared.addFavorite(
-                peerNoisePublicKey: senderNoiseKey,
-                peerNostrPublicKey: nostrPubkey,
-                peerNickname: senderNickname
-            )
-        } else {
-            // Only remove if we don't have it set locally
-            // Logic handled by persistence service usually, here we just update remote state
-            // Actually for now we just process the notification
-        }
-        
-        // Extract Nostr public key if included
-        var extractedNostrPubkey: String? = nil
-        if let range = content.range(of: "NPUB:") {
-            let suffix = content[range.upperBound...]
-            let parts = suffix.components(separatedBy: "|")
-            if let key = parts.first {
-                extractedNostrPubkey = String(key)
-            }
-        } else if content.contains(":") {
-             // Fallback: simple format FAVORITE:TRUE:npub...
-             let parts = content.components(separatedBy: ":")
-             if parts.count >= 3 {
-                 extractedNostrPubkey = String(parts[2])
-             }
-        }
-        
-        SecureLogger.info("📝 Received favorite notification from \(senderNickname): \(isFavorite)", category: .session)
-        
-        // If they favorited us and provided their Nostr key, ensure it's stored
-        if isFavorite && extractedNostrPubkey != nil {
-            SecureLogger.info("💾 Storing Nostr key association for \(senderNickname): \(extractedNostrPubkey!.prefix(16))...", category: .session)
-             FavoritesPersistenceService.shared.addFavorite(
-                peerNoisePublicKey: senderNoiseKey,
-                peerNostrPublicKey: extractedNostrPubkey,
-                peerNickname: senderNickname
-            )
-        }
-        
-        // Show notification
-        NotificationService.shared.sendLocalNotification(
-            title: isFavorite ? "New Favorite" : "Favorite Removed",
-            body: "\(senderNickname) \(isFavorite ? "favorited" : "unfavorited") you",
-            identifier: "fav-\(UUID().uuidString)"
-        )
-    }
-
-    func sendFavoriteNotificationViaNostr(noisePublicKey: Data, isFavorite: Bool) {
-        // Find peer Nostr key
-        guard let relationship = FavoritesPersistenceService.shared.getFavoriteStatus(for: noisePublicKey),
-              relationship.peerNostrPublicKey != nil else {
-            SecureLogger.warning("⚠️ Cannot send favorite notification - no Nostr key for peer", category: .session)
-            return
-        }
-        
-        let peerID = PeerID(hexData: noisePublicKey)
-        
-        // Route via message router
-        messageRouter.sendFavoriteNotification(to: peerID, isFavorite: isFavorite)
-    }
-
-    // MARK: - Geohash Nickname Resolution (for /block in geohash)
-
-    func nostrPubkeyForDisplayName(_ name: String) -> String? {
-        // Look up current visible geohash participants for an exact displayName match
-        for p in visibleGeohashPeople() {
-            if p.displayName == name {
-                return p.id
-            }
-        }
-        // Also check nickname cache directly
-        for (pub, nick) in geoNicknames {
-            if nick == name { return pub }
-        }
-        return nil
-    }
-    
-    func startGeohashDM(withPubkeyHex hex: String) {
-        let convKey = PeerID(nostr_: hex)
-        nostrKeyMapping[convKey] = hex
-        startPrivateChat(with: convKey)
-    }
-    
-    func fullNostrHex(forSenderPeerID senderID: PeerID) -> String? {
-        return nostrKeyMapping[senderID]
-    }
-    
-    func geohashDisplayName(for convKey: PeerID) -> String {
-        guard let full = nostrKeyMapping[convKey] else {
-            return convKey.bare
-        }
-        return displayNameForNostrPubkey(full)
-    }
-}

bitchat/ViewModels/Extensions/ChatViewModel+Tor.swift

@@ -1,64 +0,0 @@
-//
-// ChatViewModel+Tor.swift
-// bitchat
-//
-// Tor lifecycle handling for ChatViewModel
-//
-
-import Foundation
-import Combine
-import Tor
-
-extension ChatViewModel {
-    
-    // MARK: - Tor notifications
-    
-    @objc func handleTorWillStart() {
-        Task { @MainActor in
-            if !self.torStatusAnnounced && TorManager.shared.torEnforced {
-                self.torStatusAnnounced = true
-                // Post only in geohash channels (queue if not active)
-                self.addGeohashOnlySystemMessage(
-                    String(localized: "system.tor.starting", comment: "System message when Tor is starting")
-                )
-            }
-        }
-    }
-    
-    @objc func handleTorWillRestart() {
-        Task { @MainActor in
-            self.torRestartPending = true
-            // Post only in geohash channels (queue if not active)
-            self.addGeohashOnlySystemMessage(
-                String(localized: "system.tor.restarting", comment: "System message when Tor is restarting")
-            )
-        }
-    }
-
-    @objc func handleTorDidBecomeReady() {
-        Task { @MainActor in
-            // Only announce "restarted" if we actually restarted this session
-            if self.torRestartPending {
-                // Post only in geohash channels (queue if not active)
-                self.addGeohashOnlySystemMessage(
-                    String(localized: "system.tor.restarted", comment: "System message when Tor has restarted")
-                )
-                self.torRestartPending = false
-            } else if TorManager.shared.torEnforced && !self.torInitialReadyAnnounced {
-                // Initial start completed
-                self.addGeohashOnlySystemMessage(
-                    String(localized: "system.tor.started", comment: "System message when Tor has started")
-                )
-                self.torInitialReadyAnnounced = true
-            }
-        }
-    }
-
-    @objc func handleTorPreferenceChanged(_ notification: Notification) {
-        Task { @MainActor in
-            self.torStatusAnnounced = false
-            self.torInitialReadyAnnounced = false
-            self.torRestartPending = false
-        }
-    }
-}

bitchat/ViewModels/Extensions/README.md

@@ -1,9 +0,0 @@
-# ChatViewModel Extensions
-
-This directory contains extensions to `ChatViewModel` to modularize its functionality.
-
-- `ChatViewModel+Tor.swift`: Handles Tor lifecycle events and notifications.
-- `ChatViewModel+PrivateChat.swift`: Manages private chat logic, media transfers (images, voice notes), and file handling.
-- `ChatViewModel+Nostr.swift`: Contains all logic related to Nostr integration, Geohash channels, and Nostr identity management.
-
-The main `ChatViewModel.swift` retains core state, initialization, and coordination logic.

bitchat/ViewModels/GeoChannelCoordinator.swift

@@ -1,118 +0,0 @@
-//
-// GeoChannelCoordinator.swift
-// bitchat
-//
-// Centralizes Combine wiring for location channel selection and sampling.
-//
-
-import Combine
-import Foundation
-import Tor
-
-@MainActor
-final class GeoChannelCoordinator {
-    private let locationManager: LocationChannelManager
-    private let bookmarksStore: GeohashBookmarksStore
-    private let torManager: TorManager
-
-    private let onChannelSwitch: (ChannelID) -> Void
-    private let beginSampling: ([String]) -> Void
-    private let endSampling: () -> Void
-
-    private var cancellables = Set<AnyCancellable>()
-    private var regionalGeohashes: [String] = []
-    private var bookmarkedGeohashes: [String] = []
-
-    init(
-        locationManager: LocationChannelManager? = nil,
-        bookmarksStore: GeohashBookmarksStore? = nil,
-        torManager: TorManager? = nil,
-        onChannelSwitch: @escaping (ChannelID) -> Void,
-        beginSampling: @escaping ([String]) -> Void,
-        endSampling: @escaping () -> Void
-    ) {
-        self.locationManager = locationManager ?? Self.defaultLocationManager()
-        self.bookmarksStore = bookmarksStore ?? GeohashBookmarksStore.shared
-        self.torManager = torManager ?? Self.defaultTorManager()
-        self.onChannelSwitch = onChannelSwitch
-        self.beginSampling = beginSampling
-        self.endSampling = endSampling
-
-        start()
-    }
-
-    func start() {
-        regionalGeohashes = locationManager.availableChannels.map { $0.geohash }
-        bookmarkedGeohashes = bookmarksStore.bookmarks
-
-        locationManager.$selectedChannel
-            .receive(on: DispatchQueue.main)
-            .sink { [weak self] channel in
-                guard let self else { return }
-                Task { @MainActor in
-                    self.onChannelSwitch(channel)
-                }
-            }
-            .store(in: &cancellables)
-
-        locationManager.$availableChannels
-            .receive(on: DispatchQueue.main)
-            .sink { [weak self] channels in
-                guard let self else { return }
-                self.regionalGeohashes = channels.map { $0.geohash }
-                self.updateSampling()
-            }
-            .store(in: &cancellables)
-
-        bookmarksStore.$bookmarks
-            .receive(on: DispatchQueue.main)
-            .sink { [weak self] bookmarks in
-                guard let self else { return }
-                self.bookmarkedGeohashes = bookmarks
-                self.updateSampling()
-            }
-            .store(in: &cancellables)
-
-        locationManager.$permissionState
-            .receive(on: DispatchQueue.main)
-            .sink { [weak self] state in
-                guard let self, state == .authorized else { return }
-                Task { @MainActor [weak self] in
-                    self?.locationManager.refreshChannels()
-                }
-            }
-            .store(in: &cancellables)
-
-        Task { @MainActor in
-            self.onChannelSwitch(self.locationManager.selectedChannel)
-        }
-        updateSampling()
-    }
-
-    private func updateSampling() {
-        let union = Array(Set(regionalGeohashes).union(bookmarkedGeohashes))
-        Task { @MainActor in
-            guard !union.isEmpty else {
-                endSampling()
-                return
-            }
-            if torManager.isForeground() {
-                beginSampling(union)
-            } else {
-                endSampling()
-            }
-        }
-    }
-
-    func refreshSampling() {
-        updateSampling()
-    }
-    private static func defaultLocationManager() -> LocationChannelManager {
-        LocationChannelManager.shared
-    }
-
-    @MainActor
-    private static func defaultTorManager() -> TorManager {
-        TorManager.shared
-    }
-}

bitchat/ViewModels/MessageRateLimiter.swift

@@ -1,77 +0,0 @@
-//
-// MessageRateLimiter.swift
-// bitchat
-//
-// Handles per-sender and per-content token buckets for public message intake.
-//
-
-import Foundation
-
-struct MessageRateLimiter {
-    private struct TokenBucket {
-        var capacity: Double
-        var tokens: Double
-        var refillPerSec: Double
-        var lastRefill: Date
-
-        mutating func allow(cost: Double = 1.0, now: Date = Date()) -> Bool {
-            let dt = now.timeIntervalSince(lastRefill)
-            if dt > 0 {
-                tokens = min(capacity, tokens + dt * refillPerSec)
-                lastRefill = now
-            }
-            if tokens >= cost {
-                tokens -= cost
-                return true
-            }
-            return false
-        }
-    }
-
-    private var senderBuckets: [String: TokenBucket] = [:]
-    private var contentBuckets: [String: TokenBucket] = [:]
-
-    private let senderCapacity: Double
-    private let senderRefill: Double
-    private let contentCapacity: Double
-    private let contentRefill: Double
-
-    init(
-        senderCapacity: Double,
-        senderRefillPerSec: Double,
-        contentCapacity: Double,
-        contentRefillPerSec: Double
-    ) {
-        self.senderCapacity = senderCapacity
-        self.senderRefill = senderRefillPerSec
-        self.contentCapacity = contentCapacity
-        self.contentRefill = contentRefillPerSec
-    }
-
-    mutating func allow(senderKey: String, contentKey: String, now: Date = Date()) -> Bool {
-        var senderBucket = senderBuckets[senderKey] ?? TokenBucket(
-            capacity: senderCapacity,
-            tokens: senderCapacity,
-            refillPerSec: senderRefill,
-            lastRefill: now
-        )
-        let senderAllowed = senderBucket.allow(now: now)
-        senderBuckets[senderKey] = senderBucket
-
-        var contentBucket = contentBuckets[contentKey] ?? TokenBucket(
-            capacity: contentCapacity,
-            tokens: contentCapacity,
-            refillPerSec: contentRefill,
-            lastRefill: now
-        )
-        let contentAllowed = contentBucket.allow(now: now)
-        contentBuckets[contentKey] = contentBucket
-
-        return senderAllowed && contentAllowed
-    }
-
-    mutating func reset() {
-        senderBuckets.removeAll()
-        contentBuckets.removeAll()
-    }
-}

bitchat/ViewModels/MinimalDistancePalette.swift

@@ -1,210 +0,0 @@
-//
-// MinimalDistancePalette.swift
-// bitchat
-//
-// Lightweight palette generator that keeps peer colors evenly spaced.
-//
-
-import Foundation
-import SwiftUI
-
-final class MinimalDistancePalette {
-    struct Config {
-        let slotCount: Int
-        let avoidCenterHue: Double
-        let avoidHueDelta: Double
-        let saturationLight: Double
-        let saturationDark: Double
-        let baseBrightnessLight: Double
-        let baseBrightnessDark: Double
-        let ringBrightnessDeltaLight: Double
-        let ringBrightnessDeltaDark: Double
-        let preferredBiasWeight: Double
-        let goldenStep: Int
-
-        init(
-            slotCount: Int,
-            avoidCenterHue: Double,
-            avoidHueDelta: Double,
-            saturationLight: Double,
-            saturationDark: Double,
-            baseBrightnessLight: Double,
-            baseBrightnessDark: Double,
-            ringBrightnessDeltaLight: Double,
-            ringBrightnessDeltaDark: Double,
-            preferredBiasWeight: Double = 0.05,
-            goldenStep: Int = 7
-        ) {
-            self.slotCount = slotCount
-            self.avoidCenterHue = avoidCenterHue
-            self.avoidHueDelta = avoidHueDelta
-            self.saturationLight = saturationLight
-            self.saturationDark = saturationDark
-            self.baseBrightnessLight = baseBrightnessLight
-            self.baseBrightnessDark = baseBrightnessDark
-            self.ringBrightnessDeltaLight = ringBrightnessDeltaLight
-            self.ringBrightnessDeltaDark = ringBrightnessDeltaDark
-            self.preferredBiasWeight = preferredBiasWeight
-            self.goldenStep = goldenStep
-        }
-    }
-
-    private struct Entry {
-        let slot: Int
-        let ring: Int
-        let hue: Double
-    }
-
-    private let config: Config
-    private var currentSeeds: [String: String] = [:]
-    private var entries: [String: Entry] = [:]
-    private var previousEntries: [String: Entry] = [:]
-
-    init(config: Config) {
-        self.config = config
-    }
-
-    @MainActor
-    func ensurePalette(for seeds: [String: String]) {
-        guard seeds != currentSeeds || entries.count != seeds.count else { return }
-        previousEntries = entries
-        currentSeeds = seeds
-        rebuildEntries()
-    }
-
-    @MainActor
-    func color(for identifier: String, isDark: Bool) -> Color? {
-        guard let entry = entries[identifier] else { return nil }
-        let saturation = isDark ? config.saturationDark : config.saturationLight
-        let baseBrightness = isDark ? config.baseBrightnessDark : config.baseBrightnessLight
-        let ringDelta = isDark ? config.ringBrightnessDeltaDark : config.ringBrightnessDeltaLight
-        let brightness = min(1.0, max(0.0, baseBrightness + ringDelta * Double(entry.ring)))
-        return Color(hue: entry.hue, saturation: saturation, brightness: brightness)
-    }
-
-    @MainActor
-    func reset() {
-        currentSeeds.removeAll()
-        entries.removeAll()
-        previousEntries.removeAll()
-    }
-
-    @MainActor
-    private func rebuildEntries() {
-        guard !currentSeeds.isEmpty else {
-            entries.removeAll()
-            return
-        }
-
-        let slotCount = max(8, config.slotCount)
-        var slots: [Double] = []
-        for idx in 0..<slotCount {
-            let hue = Double(idx) / Double(slotCount)
-            if abs(hue - config.avoidCenterHue) < config.avoidHueDelta {
-                continue
-            }
-            slots.append(hue)
-        }
-        if slots.isEmpty {
-            for idx in 0..<slotCount {
-                slots.append(Double(idx) / Double(slotCount))
-            }
-        }
-
-        func circularDistance(_ a: Double, _ b: Double) -> Double {
-            let diff = abs(a - b)
-            return diff > 0.5 ? 1.0 - diff : diff
-        }
-
-        let peerIDs = currentSeeds.keys.sorted()
-        let preferredIndex: [String: Int] = Dictionary(uniqueKeysWithValues: peerIDs.map { id in
-            let seed = currentSeeds[id] ?? id
-            let hash = seed.djb2()
-            let index = Int(hash % UInt64(slots.count))
-            return (id, index)
-        })
-
-        var mapping: [String: Entry] = [:]
-        var usedSlots = Set<Int>()
-        var usedHues: [Double] = []
-
-        let prior = entries.isEmpty ? previousEntries : entries
-        for (id, entry) in prior {
-            guard currentSeeds.keys.contains(id), entry.slot < slots.count else { continue }
-            let hue = slots[entry.slot]
-            mapping[id] = Entry(slot: entry.slot, ring: entry.ring, hue: hue)
-            usedSlots.insert(entry.slot)
-            usedHues.append(hue)
-        }
-
-        let unassigned = peerIDs.filter { mapping[$0] == nil }
-        for id in unassigned {
-            let preferred = preferredIndex[id] ?? 0
-            if !usedSlots.contains(preferred), preferred < slots.count {
-                let hue = slots[preferred]
-                mapping[id] = Entry(slot: preferred, ring: 0, hue: hue)
-                usedSlots.insert(preferred)
-                usedHues.append(hue)
-                continue
-            }
-
-            var bestSlot: Int?
-            var bestScore = -Double.infinity
-            for slot in 0..<slots.count where !usedSlots.contains(slot) {
-                let hue = slots[slot]
-                let minDistance = usedHues.isEmpty ? 1.0 : usedHues.map { circularDistance(hue, $0) }.min() ?? 1.0
-                let bias = 1.0 - (Double((abs(slot - (preferredIndex[id] ?? 0)) % slots.count)) / Double(slots.count))
-                let score = minDistance + config.preferredBiasWeight * bias
-                if score > bestScore {
-                    bestScore = score
-                    bestSlot = slot
-                }
-            }
-
-            if let slot = bestSlot {
-                let hue = slots[slot]
-                mapping[id] = Entry(slot: slot, ring: 0, hue: hue)
-                usedSlots.insert(slot)
-                usedHues.append(hue)
-            }
-        }
-
-        let remaining = peerIDs.filter { mapping[$0] == nil }
-        if !remaining.isEmpty {
-            for (index, id) in remaining.enumerated() {
-                let preferred = preferredIndex[id] ?? 0
-                let slot = (preferred + index * config.goldenStep) % slots.count
-                let hue = slots[slot]
-                mapping[id] = Entry(slot: slot, ring: 1, hue: hue)
-            }
-        }
-
-        entries = mapping
-    }
-}
-
-extension MinimalDistancePalette.Config {
-    static let mesh = MinimalDistancePalette.Config(
-        slotCount: TransportConfig.uiPeerPaletteSlots,
-        avoidCenterHue: 30.0 / 360.0,
-        avoidHueDelta: TransportConfig.uiColorHueAvoidanceDelta,
-        saturationLight: 0.70,
-        saturationDark: 0.80,
-        baseBrightnessLight: 0.45,
-        baseBrightnessDark: 0.75,
-        ringBrightnessDeltaLight: TransportConfig.uiPeerPaletteRingBrightnessDeltaLight,
-        ringBrightnessDeltaDark: TransportConfig.uiPeerPaletteRingBrightnessDeltaDark
-    )
-
-    static let nostr = MinimalDistancePalette.Config(
-        slotCount: TransportConfig.uiPeerPaletteSlots,
-        avoidCenterHue: 30.0 / 360.0,
-        avoidHueDelta: TransportConfig.uiColorHueAvoidanceDelta,
-        saturationLight: 0.70,
-        saturationDark: 0.80,
-        baseBrightnessLight: 0.45,
-        baseBrightnessDark: 0.75,
-        ringBrightnessDeltaLight: TransportConfig.uiPeerPaletteRingBrightnessDeltaLight,
-        ringBrightnessDeltaDark: TransportConfig.uiPeerPaletteRingBrightnessDeltaDark
-    )
-}

bitchat/ViewModels/PublicMessagePipeline.swift

@@ -1,190 +0,0 @@
-//
-// PublicMessagePipeline.swift
-// bitchat
-//
-// Handles batching and deduplication of public chat messages before surfacing them to the UI.
-//
-
-import Foundation
-
-@MainActor
-protocol PublicMessagePipelineDelegate: AnyObject {
-    func pipelineCurrentMessages(_ pipeline: PublicMessagePipeline) -> [BitchatMessage]
-    func pipeline(_ pipeline: PublicMessagePipeline, setMessages messages: [BitchatMessage])
-    func pipeline(_ pipeline: PublicMessagePipeline, normalizeContent content: String) -> String
-    func pipeline(_ pipeline: PublicMessagePipeline, contentTimestampForKey key: String) -> Date?
-    func pipeline(_ pipeline: PublicMessagePipeline, recordContentKey key: String, timestamp: Date)
-    func pipelineTrimMessages(_ pipeline: PublicMessagePipeline)
-    func pipelinePrewarmMessage(_ pipeline: PublicMessagePipeline, message: BitchatMessage)
-    func pipelineSetBatchingState(_ pipeline: PublicMessagePipeline, isBatching: Bool)
-}
-
-@MainActor
-final class PublicMessagePipeline {
-    weak var delegate: PublicMessagePipelineDelegate?
-
-    private var buffer: [BitchatMessage] = []
-    private var timer: Timer?
-    private let baseFlushInterval: TimeInterval
-    private var dynamicFlushInterval: TimeInterval
-    private var recentBatchSizes: [Int] = []
-    private let maxRecentBatchSamples: Int
-    private let dedupWindow: TimeInterval
-    private var activeChannel: ChannelID = .mesh
-
-    init(
-        baseFlushInterval: TimeInterval = TransportConfig.basePublicFlushInterval,
-        maxRecentBatchSamples: Int = 10,
-        dedupWindow: TimeInterval = 1.0
-    ) {
-        self.baseFlushInterval = baseFlushInterval
-        self.dynamicFlushInterval = baseFlushInterval
-        self.maxRecentBatchSamples = maxRecentBatchSamples
-        self.dedupWindow = dedupWindow
-    }
-
-    deinit {
-        timer?.invalidate()
-    }
-
-    func updateActiveChannel(_ channel: ChannelID) {
-        activeChannel = channel
-    }
-
-    func enqueue(_ message: BitchatMessage) {
-        buffer.append(message)
-        scheduleFlush()
-    }
-
-    func flushIfNeeded() {
-        flushBuffer()
-    }
-
-    func reset() {
-        timer?.invalidate()
-        timer = nil
-        buffer.removeAll(keepingCapacity: false)
-    }
-
-}
-
-private extension PublicMessagePipeline {
-    func scheduleFlush() {
-        guard timer == nil else { return }
-        timer = Timer.scheduledTimer(withTimeInterval: dynamicFlushInterval, repeats: false) { [weak self] _ in
-            guard let self else { return }
-            Task { @MainActor in
-                self.flushBuffer()
-            }
-        }
-    }
-
-    func flushBuffer() {
-        timer?.invalidate()
-        timer = nil
-        guard !buffer.isEmpty else { return }
-        guard let delegate = delegate else {
-            buffer.removeAll(keepingCapacity: false)
-            return
-        }
-
-        delegate.pipelineSetBatchingState(self, isBatching: true)
-
-        var existingIDs = Set(delegate.pipelineCurrentMessages(self).map { $0.id })
-        var pending: [(message: BitchatMessage, contentKey: String)] = []
-        var batchContentLatest: [String: Date] = [:]
-
-        for message in buffer {
-            if existingIDs.contains(message.id) { continue }
-            let contentKey = delegate.pipeline(self, normalizeContent: message.content)
-            if let ts = delegate.pipeline(self, contentTimestampForKey: contentKey),
-               abs(ts.timeIntervalSince(message.timestamp)) < dedupWindow {
-                continue
-            }
-            if let ts = batchContentLatest[contentKey],
-               abs(ts.timeIntervalSince(message.timestamp)) < dedupWindow {
-                continue
-            }
-            existingIDs.insert(message.id)
-            pending.append((message, contentKey))
-            batchContentLatest[contentKey] = message.timestamp
-        }
-
-        buffer.removeAll(keepingCapacity: true)
-        guard !pending.isEmpty else {
-            delegate.pipelineSetBatchingState(self, isBatching: false)
-            if !buffer.isEmpty { scheduleFlush() }
-            return
-        }
-
-        pending.sort { $0.message.timestamp < $1.message.timestamp }
-
-        var messages = delegate.pipelineCurrentMessages(self)
-        let threshold = lateInsertThreshold(for: activeChannel)
-        let lastTimestamp = messages.last?.timestamp ?? .distantPast
-
-        for item in pending {
-            let message = item.message
-            if threshold == 0 || message.timestamp < lastTimestamp.addingTimeInterval(-threshold) {
-                let index = insertionIndex(for: message.timestamp, in: messages)
-                if index >= messages.count {
-                    messages.append(message)
-                } else {
-                    messages.insert(message, at: index)
-                }
-            } else {
-                messages.append(message)
-            }
-            delegate.pipeline(self, recordContentKey: item.contentKey, timestamp: message.timestamp)
-        }
-
-        delegate.pipeline(self, setMessages: messages)
-        delegate.pipelineTrimMessages(self)
-
-        updateFlushInterval(withBatchSize: pending.count)
-
-        for item in pending {
-            delegate.pipelinePrewarmMessage(self, message: item.message)
-        }
-
-        delegate.pipelineSetBatchingState(self, isBatching: false)
-
-        if !buffer.isEmpty {
-            scheduleFlush()
-        }
-    }
-
-    func updateFlushInterval(withBatchSize size: Int) {
-        recentBatchSizes.append(size)
-        if recentBatchSizes.count > maxRecentBatchSamples {
-            recentBatchSizes.removeFirst(recentBatchSizes.count - maxRecentBatchSamples)
-        }
-        let avg = recentBatchSizes.isEmpty
-            ? 0.0
-            : Double(recentBatchSizes.reduce(0, +)) / Double(recentBatchSizes.count)
-        dynamicFlushInterval = avg > 100.0 ? 0.12 : baseFlushInterval
-    }
-
-    func lateInsertThreshold(for channel: ChannelID) -> TimeInterval {
-        switch channel {
-        case .mesh:
-            return TransportConfig.uiLateInsertThreshold
-        case .location:
-            return TransportConfig.uiLateInsertThresholdGeo
-        }
-    }
-
-    func insertionIndex(for timestamp: Date, in messages: [BitchatMessage]) -> Int {
-        var low = 0
-        var high = messages.count
-        while low < high {
-            let mid = (low + high) / 2
-            if messages[mid].timestamp < timestamp {
-                low = mid + 1
-            } else {
-                high = mid
-            }
-        }
-        return low
-    }
-}

bitchat/ViewModels/PublicTimelineStore.swift

@@ -1,124 +0,0 @@
-//
-// PublicTimelineStore.swift
-// bitchat
-//
-// Maintains mesh and geohash public timelines with simple caps and helpers.
-//
-
-import Foundation
-
-struct PublicTimelineStore {
-    private var meshTimeline: [BitchatMessage] = []
-    private var geohashTimelines: [String: [BitchatMessage]] = [:]
-    private var pendingGeohashSystemMessages: [String] = []
-
-    private let meshCap: Int
-    private let geohashCap: Int
-
-    init(meshCap: Int, geohashCap: Int) {
-        self.meshCap = meshCap
-        self.geohashCap = geohashCap
-    }
-
-    mutating func append(_ message: BitchatMessage, to channel: ChannelID) {
-        switch channel {
-        case .mesh:
-            guard !meshTimeline.contains(where: { $0.id == message.id }) else { return }
-            meshTimeline.append(message)
-            trimMeshTimelineIfNeeded()
-        case .location(let channel):
-            append(message, toGeohash: channel.geohash)
-        }
-    }
-
-    mutating func append(_ message: BitchatMessage, toGeohash geohash: String) {
-        var timeline = geohashTimelines[geohash] ?? []
-        guard !timeline.contains(where: { $0.id == message.id }) else { return }
-        timeline.append(message)
-        trimGeohashTimelineIfNeeded(&timeline)
-        geohashTimelines[geohash] = timeline
-    }
-
-    /// Append message if absent, returning true when stored.
-    mutating func appendIfAbsent(_ message: BitchatMessage, toGeohash geohash: String) -> Bool {
-        var timeline = geohashTimelines[geohash] ?? []
-        guard !timeline.contains(where: { $0.id == message.id }) else { return false }
-        timeline.append(message)
-        trimGeohashTimelineIfNeeded(&timeline)
-        geohashTimelines[geohash] = timeline
-        return true
-    }
-
-    mutating func messages(for channel: ChannelID) -> [BitchatMessage] {
-        switch channel {
-        case .mesh:
-            return meshTimeline
-        case .location(let channel):
-            let cleaned = geohashTimelines[channel.geohash]?.cleanedAndDeduped() ?? []
-            geohashTimelines[channel.geohash] = cleaned
-            return cleaned
-        }
-    }
-
-    mutating func clear(channel: ChannelID) {
-        switch channel {
-        case .mesh:
-            meshTimeline.removeAll()
-        case .location(let channel):
-            geohashTimelines[channel.geohash] = []
-        }
-    }
-
-    @discardableResult
-    mutating func removeMessage(withID id: String) -> BitchatMessage? {
-        if let index = meshTimeline.firstIndex(where: { $0.id == id }) {
-            return meshTimeline.remove(at: index)
-        }
-
-        for key in Array(geohashTimelines.keys) {
-            var timeline = geohashTimelines[key] ?? []
-            if let index = timeline.firstIndex(where: { $0.id == id }) {
-                let removed = timeline.remove(at: index)
-                geohashTimelines[key] = timeline.isEmpty ? nil : timeline
-                return removed
-            }
-        }
-
-        return nil
-    }
-
-    mutating func removeMessages(in geohash: String, where predicate: (BitchatMessage) -> Bool) {
-        var timeline = geohashTimelines[geohash] ?? []
-        timeline.removeAll(where: predicate)
-        geohashTimelines[geohash] = timeline.isEmpty ? nil : timeline
-    }
-
-    mutating func mutateGeohash(_ geohash: String, _ transform: (inout [BitchatMessage]) -> Void) {
-        var timeline = geohashTimelines[geohash] ?? []
-        transform(&timeline)
-        geohashTimelines[geohash] = timeline.isEmpty ? nil : timeline
-    }
-
-    mutating func queueGeohashSystemMessage(_ content: String) {
-        pendingGeohashSystemMessages.append(content)
-    }
-
-    mutating func drainPendingGeohashSystemMessages() -> [String] {
-        defer { pendingGeohashSystemMessages.removeAll(keepingCapacity: false) }
-        return pendingGeohashSystemMessages
-    }
-
-    func geohashKeys() -> [String] {
-        Array(geohashTimelines.keys)
-    }
-
-    private mutating func trimMeshTimelineIfNeeded() {
-        guard meshTimeline.count > meshCap else { return }
-        meshTimeline = Array(meshTimeline.suffix(meshCap))
-    }
-
-    private func trimGeohashTimelineIfNeeded(_ timeline: inout [BitchatMessage]) {
-        guard timeline.count > geohashCap else { return }
-        timeline = Array(timeline.suffix(geohashCap))
-    }
-}

bitchat/Views/Components/CommandSuggestionsView.swift

@@ -1,90 +0,0 @@
-//
-//  CommandSuggestionsView.swift
-//  bitchat
-//
-//  Created by Islam on 29/10/2025.
-//
-
-import SwiftUI
-
-struct CommandSuggestionsView: View {
-    @EnvironmentObject private var viewModel: ChatViewModel
-    @ObservedObject private var locationManager = LocationChannelManager.shared
-    
-    @Binding var messageText: String
-    
-    let textColor: Color
-    let backgroundColor: Color
-    let secondaryTextColor: Color
-    
-    private var filteredCommands: [CommandInfo] {
-        guard messageText.hasPrefix("/") && !messageText.contains(" ") else { return [] }
-        let isGeoPublic = locationManager.selectedChannel.isLocation
-        let isGeoDM = viewModel.selectedPrivateChatPeer?.isGeoDM == true
-        return CommandInfo.all(isGeoPublic: isGeoPublic, isGeoDM: isGeoDM).filter { command in
-            command.alias.starts(with: messageText.lowercased())
-        }
-    }
-    
-    var body: some View {
-        VStack(alignment: .leading, spacing: 0) {
-            ForEach(filteredCommands) { command in
-                Button {
-                    messageText = command.alias + " "
-                } label: {
-                    buttonRow(for: command)
-                }
-                .buttonStyle(.plain)
-                .background(Color.gray.opacity(0.1))
-            }
-        }
-        .background(backgroundColor)
-        .overlay(
-            RoundedRectangle(cornerRadius: 4)
-                .stroke(secondaryTextColor.opacity(0.3), lineWidth: 1)
-        )
-    }
-    
-    private func buttonRow(for command: CommandInfo) -> some View {
-        HStack {
-            Text(command.alias)
-                .font(.bitchatSystem(size: 11, design: .monospaced))
-                .foregroundColor(textColor)
-                .fontWeight(.medium)
-            
-            if let placeholder = command.placeholder {
-                Text(placeholder)
-                    .font(.bitchatSystem(size: 10, design: .monospaced))
-                    .foregroundColor(secondaryTextColor.opacity(0.8))
-            }
-
-            Spacer()
-            
-            Text(command.description)
-                .font(.bitchatSystem(size: 10, design: .monospaced))
-                .foregroundColor(secondaryTextColor)
-        }
-        .padding(.horizontal, 12)
-        .padding(.vertical, 3)
-        .frame(maxWidth: .infinity, alignment: .leading)
-    }
-}
-
-@available(iOS 17, macOS 14, *)
-#Preview {
-    @Previewable @State var messageText: String = "/"
-    let keychain = KeychainManager()
-    let viewModel = ChatViewModel(
-        keychain: keychain,
-        idBridge: NostrIdentityBridge(),
-        identityManager: SecureIdentityStateManager(keychain)
-    )
-    
-    CommandSuggestionsView(
-        messageText: $messageText,
-        textColor: .green,
-        backgroundColor: .primary,
-        secondaryTextColor: .secondary
-    )
-    .environmentObject(viewModel)
-}

bitchat/Views/ContentView.swift

@@ -27,6 +27,37 @@ private struct MessageDisplayItem: Identifiable {
     let message: BitchatMessage
 }
 
+// MARK: - Sheet Management
+
+private enum SheetType: Identifiable {
+    case peopleOrChat
+    case appInfo
+    case fingerprint(PeerID)
+    case imagePreview(URL)
+    case verification
+    case locationChannels
+    case locationNotes
+
+    var id: String {
+        switch self {
+        case .peopleOrChat:
+            return "peopleOrChat"
+        case .appInfo:
+            return "appInfo"
+        case .fingerprint(let peerID):
+            return "fingerprint-\(peerID.id)"
+        case .imagePreview(let url):
+            return "imagePreview-\(url.path)"
+        case .verification:
+            return "verification"
+        case .locationChannels:
+            return "locationChannels"
+        case .locationNotes:
+            return "locationNotes"
+        }
+    }
+}
+
 // MARK: - Main Content View
 
 struct ContentView: View {
@@ -43,9 +74,11 @@ struct ContentView: View {
     @State private var showPeerList = false
     @State private var showSidebar = false
     @State private var showAppInfo = false
+    @State private var showCommandSuggestions = false
+    @State private var commandSuggestions: [String] = []
     @State private var showMessageActions = false
     @State private var selectedMessageSender: String?
-    @State private var selectedMessageSenderID: PeerID?
+    @State private var selectedMessageSenderID: String?
     @FocusState private var isNicknameFieldFocused: Bool
     @State private var isAtBottomPublic: Bool = true
     @State private var isAtBottomPrivate: Bool = true
@@ -119,8 +152,96 @@ struct ContentView: View {
             return viewModel.visibleGeohashPeople().count
         }
     }
-    
-    
+
+    // MARK: - Sheet Management
+
+    /// Determines which sheet should currently be active based on all state variables.
+    /// Priority is determined by the order of checks (first match wins).
+    private var currentSheet: SheetType? {
+        // People or private chat sheet (highest priority - primary navigation)
+        if showSidebar || viewModel.selectedPrivateChatPeer != nil {
+            return .peopleOrChat
+        }
+
+        // Verification sheet
+        if showVerifySheet {
+            return .verification
+        }
+
+        // Location channels sheet
+        if showLocationChannelsSheet {
+            return .locationChannels
+        }
+
+        // Location notes sheet
+        if showLocationNotes {
+            return .locationNotes
+        }
+
+        // App info sheet
+        if showAppInfo {
+            return .appInfo
+        }
+
+        // Fingerprint sheet
+        if let peerID = viewModel.showingFingerprintFor {
+            return .fingerprint(peerID)
+        }
+
+        // Image preview sheet
+        if let url = imagePreviewURL {
+            return .imagePreview(url)
+        }
+
+        return nil
+    }
+
+    /// Binding that maps between the SheetType enum and the individual state variables.
+    /// When a sheet is presented, it reads from currentSheet.
+    /// When a sheet is dismissed, it clears all related state variables.
+    private var sheetBinding: Binding<SheetType?> {
+        Binding(
+            get: {
+                return currentSheet
+            },
+            set: { newSheet in
+                // First, clear all sheet-related state to ensure clean transitions
+                showSidebar = false
+                if viewModel.selectedPrivateChatPeer != nil {
+                    viewModel.endPrivateChat()
+                }
+                showAppInfo = false
+                viewModel.showingFingerprintFor = nil
+                imagePreviewURL = nil
+                showVerifySheet = false
+                showLocationChannelsSheet = false
+                showLocationNotes = false
+                notesGeohash = nil
+
+                // Now set the new sheet state if one was requested
+                if let sheet = newSheet {
+                    switch sheet {
+                    case .peopleOrChat:
+                        showSidebar = true
+                    case .appInfo:
+                        showAppInfo = true
+                    case .fingerprint(let peerID):
+                        viewModel.showingFingerprintFor = peerID
+                    case .imagePreview(let url):
+                        imagePreviewURL = url
+                    case .verification:
+                        showVerifySheet = true
+                    case .locationChannels:
+                        showLocationChannelsSheet = true
+                    case .locationNotes:
+                        showLocationNotes = true
+                    }
+                }
+            }
+        )
+    }
+
+
     private struct PrivateHeaderContext {
         let headerPeerID: PeerID
         let peer: BitchatPeer?
@@ -130,7 +251,7 @@ struct ContentView: View {
 
 // MARK: - Body
 
-    var body: some View {
+    private var mainContent: some View {
         VStack(spacing: 0) {
             mainHeaderView
                 .onAppear {
@@ -174,37 +295,97 @@ struct ContentView: View {
                 showSidebar = true
             }
         }
-        .sheet(
-            isPresented: Binding(
-                get: { showSidebar || viewModel.selectedPrivateChatPeer != nil },
-                set: { isPresented in
-                    if !isPresented {
-                        showSidebar = false
-                        viewModel.endPrivateChat()
+    }
+
+    var body: some View {
+        mainContent
+        // MARK: - Consolidated Sheet Presentation
+        .sheet(item: sheetBinding) { sheet in
+            switch sheet {
+            case .peopleOrChat:
+                peopleSheetView
+
+            case .appInfo:
+                AppInfoView()
+                    .onAppear { viewModel.isAppInfoPresented = true }
+                    .onDisappear { viewModel.isAppInfoPresented = false }
+
+            case .fingerprint(let peerID):
+                FingerprintView(viewModel: viewModel, peerID: peerID)
+
+            case .imagePreview(let url):
+                ImagePreviewView(url: url)
+
+            case .verification:
+                VerificationSheetView(isPresented: $showVerifySheet)
+                    .environmentObject(viewModel)
+
+            case .locationChannels:
+                LocationChannelsSheet(isPresented: $showLocationChannelsSheet)
+                    .onAppear { viewModel.isLocationChannelsSheetPresented = true }
+                    .onDisappear { viewModel.isLocationChannelsSheetPresented = false }
+
+            case .locationNotes:
+                Group {
+                    if let gh = notesGeohash ?? LocationChannelManager.shared.availableChannels.first(where: { $0.level == .building })?.geohash {
+                        LocationNotesView(geohash: gh)
+                            .environmentObject(viewModel)
+                    } else {
+                        VStack(spacing: 12) {
+                            HStack {
+                                Text("content.notes.title")
+                                    .font(.bitchatSystem(size: 16, weight: .bold, design: .monospaced))
+                                Spacer()
+                                Button(action: { showLocationNotes = false }) {
+                                    Image(systemName: "xmark")
+                                        .font(.bitchatSystem(size: 13, weight: .semibold, design: .monospaced))
+                                        .foregroundColor(textColor)
+                                        .frame(width: 32, height: 32)
+                                }
+                                .buttonStyle(.plain)
+                                .accessibilityLabel(String(localized: "common.close", comment: "Accessibility label for close buttons"))
+                            }
+                            .frame(height: headerHeight)
+                            .padding(.horizontal, 12)
+                            .background(backgroundColor.opacity(0.95))
+                            Text("content.notes.location_unavailable")
+                                .font(.bitchatSystem(size: 14, design: .monospaced))
+                                .foregroundColor(secondaryTextColor)
+                            Button("content.location.enable") {
+                                LocationChannelManager.shared.enableLocationChannels()
+                                LocationChannelManager.shared.refreshChannels()
+                            }
+                            .buttonStyle(.bordered)
+                            Spacer()
+                        }
+                        .background(backgroundColor)
+                        .foregroundColor(textColor)
+                    }
+                }
+                .onAppear {
+                    LocationChannelManager.shared.enableLocationChannels()
+                    LocationChannelManager.shared.beginLiveRefresh()
+                }
+                .onDisappear {
+                    LocationChannelManager.shared.endLiveRefresh()
+                }
+                .onChange(of: locationManager.availableChannels) { channels in
+                    if let current = channels.first(where: { $0.level == .building })?.geohash,
+                        notesGeohash != current {
+                        notesGeohash = current
+                        #if os(iOS)
+                        let generator = UIImpactFeedbackGenerator(style: .light)
+                        generator.prepare()
+                        generator.impactOccurred()
+                        #endif
                     }
                 }
-            )
-        ) {
-            peopleSheetView
-        }
-        .sheet(isPresented: $showAppInfo) {
-            AppInfoView()
-                .environmentObject(viewModel)
-                .onAppear { viewModel.isAppInfoPresented = true }
-                .onDisappear { viewModel.isAppInfoPresented = false }
-        }
-        .sheet(isPresented: Binding(
-            get: { viewModel.showingFingerprintFor != nil },
-            set: { _ in viewModel.showingFingerprintFor = nil }
-        )) {
-            if let peerID = viewModel.showingFingerprintFor {
-                FingerprintView(viewModel: viewModel, peerID: peerID)
-                    .environmentObject(viewModel)
             }
         }
-#if os(iOS)
-        // Only present image picker from main view when NOT in a sheet
-        .fullScreenCover(isPresented: Binding(
+        // MARK: - Image Picker for Main View
+        // Only present when NOT in a DM or people sheet (parent-child pattern)
+        #if os(iOS)
+        .sheet(isPresented: Binding(
             get: { showImagePicker && !showSidebar && viewModel.selectedPrivateChatPeer == nil },
             set: { newValue in
                 if !newValue {
@@ -227,12 +408,10 @@ struct ContentView: View {
                     }
                 }
             }
-            .environmentObject(viewModel)
             .ignoresSafeArea()
         }
-#endif
-#if os(macOS)
-        // Only present Mac image picker from main view when NOT in a sheet
+        #endif
+        #if os(macOS)
         .sheet(isPresented: Binding(
             get: { showMacImagePicker && !showSidebar && viewModel.selectedPrivateChatPeer == nil },
             set: { newValue in
@@ -256,18 +435,8 @@ struct ContentView: View {
                     }
                 }
             }
-            .environmentObject(viewModel)
-        }
-#endif
-        .sheet(isPresented: Binding(
-            get: { imagePreviewURL != nil },
-            set: { presenting in if !presenting { imagePreviewURL = nil } }
-        )) {
-            if let url = imagePreviewURL {
-                ImagePreviewView(url: url)
-                    .environmentObject(viewModel)
-            }
         }
+        #endif
         .alert("Recording Error", isPresented: $showRecordingAlert, actions: {
             Button("OK", role: .cancel) {}
         }, message: {
@@ -288,12 +457,12 @@ struct ContentView: View {
 
             Button("content.actions.direct_message") {
                 if let peerID = selectedMessageSenderID {
-                    if peerID.isGeoChat {
-                        if let full = viewModel.fullNostrHex(forSenderPeerID: peerID) {
+                    if peerID.hasPrefix("nostr:") {
+                        if let full = viewModel.fullNostrHex(forSenderPeerID: PeerID(str: peerID)) {
                             viewModel.startGeohashDM(withPubkeyHex: full)
                         }
                     } else {
-                        viewModel.startPrivateChat(with: peerID)
+                        viewModel.startPrivateChat(with: PeerID(str: peerID))
                     }
                     withAnimation(.easeInOut(duration: TransportConfig.uiAnimationMediumSeconds)) {
                         showSidebar = true
@@ -315,8 +484,8 @@ struct ContentView: View {
 
             Button("content.actions.block", role: .destructive) {
                 // Prefer direct geohash block when we have a Nostr sender ID
-                if let peerID = selectedMessageSenderID, peerID.isGeoChat,
-                   let full = viewModel.fullNostrHex(forSenderPeerID: peerID),
+                if let peerID = selectedMessageSenderID, peerID.hasPrefix("nostr:"),
+                   let full = viewModel.fullNostrHex(forSenderPeerID: PeerID(str: peerID)),
                    let sender = selectedMessageSender {
                     viewModel.blockGeohashUser(pubkeyHexLowercased: full, displayName: sender)
                 } else if let sender = selectedMessageSender {
@@ -470,17 +639,17 @@ struct ContentView: View {
                     } else {
                         // Schedule a delayed scroll
                         scrollThrottleTimer?.invalidate()
-                        scrollThrottleTimer = Timer.scheduledTimer(withTimeInterval: TransportConfig.uiScrollThrottleSeconds, repeats: false) { [weak viewModel] _ in
-                            Task { @MainActor in
-                                lastScrollTime = Date()
-                                let contextKey: String = {
-                                    switch locationManager.selectedChannel {
-                                    case .mesh: return "mesh"
-                                    case .location(let ch): return "geo:\(ch.geohash)"
-                                    }
-                                }()
-                                let count = windowCountPublic
-                                let target = viewModel?.messages.suffix(count).last.map { "\(contextKey)|\($0.id)" }
+                        scrollThrottleTimer = Timer.scheduledTimer(withTimeInterval: TransportConfig.uiScrollThrottleSeconds, repeats: false) { _ in
+                            lastScrollTime = Date()
+                        let contextKey: String = {
+                            switch locationManager.selectedChannel {
+                            case .mesh: return "mesh"
+                            case .location(let ch): return "geo:\(ch.geohash)"
+                            }
+                        }()
+                            let count = windowCountPublic
+                            let target = viewModel.messages.suffix(count).last.map { "\(contextKey)|\($0.id)" }
+                            DispatchQueue.main.async {
                                 if let target = target { proxy.scrollTo(target, anchor: .bottom) }
                             }
                         }
@@ -608,12 +777,77 @@ struct ContentView: View {
                 .padding(.horizontal, 12)
             }
 
-            CommandSuggestionsView(
-                messageText: $messageText,
-                textColor: textColor,
-                backgroundColor: backgroundColor,
-                secondaryTextColor: secondaryTextColor
-            )
+            // Command suggestions
+            if showCommandSuggestions && !commandSuggestions.isEmpty {
+                VStack(alignment: .leading, spacing: 0) {
+                    // Define commands with aliases and syntax
+                    let baseInfo: [(commands: [String], syntax: String?, description: String)] = [
+                        (["/block"], "[nickname]", "block or list blocked peers"),
+                        (["/clear"], nil, "clear chat messages"),
+                        (["/hug"], "<nickname>", "send someone a warm hug"),
+                        (["/m", "/msg"], "<nickname> [message]", "send private message"),
+                        (["/slap"], "<nickname>", "slap someone with a trout"),
+                        (["/unblock"], "<nickname>", "unblock a peer"),
+                        (["/w"], nil, "see who's online")
+                    ]
+                    let isGeoPublic: Bool = { if case .location = locationManager.selectedChannel { return true }; return false }()
+                    let isGeoDM = viewModel.selectedPrivateChatPeer?.isGeoDM == true
+                    let favInfo: [(commands: [String], syntax: String?, description: String)] = [
+                        (["/fav"], "<nickname>", "add to favorites"),
+                        (["/unfav"], "<nickname>", "remove from favorites")
+                    ]
+                    let commandInfo = baseInfo + ((isGeoPublic || isGeoDM) ? [] : favInfo)
+
+                    // Build the display
+                    let allCommands = commandInfo
+
+                    // Show matching commands
+                    ForEach(commandSuggestions, id: \.self) { command in
+                        // Find the command info for this suggestion
+                        if let info = allCommands.first(where: { $0.commands.contains(command) }) {
+                            Button(action: {
+                                // Replace current text with selected command
+                                messageText = command + " "
+                                showCommandSuggestions = false
+                                commandSuggestions = []
+                            }) {
+                                HStack {
+                                    // Show all aliases together
+                                    Text(info.commands.joined(separator: ", "))
+                                        .font(.bitchatSystem(size: 11, design: .monospaced))
+                                        .foregroundColor(textColor)
+                                        .fontWeight(.medium)
+
+                                    // Show syntax if any
+                                    if let syntax = info.syntax {
+                                        Text(syntax)
+                                            .font(.bitchatSystem(size: 10, design: .monospaced))
+                                            .foregroundColor(secondaryTextColor.opacity(0.8))
+                                    }
+
+                                    Spacer()
+
+                                    // Show description
+                                    Text(info.description)
+                                        .font(.bitchatSystem(size: 10, design: .monospaced))
+                                        .foregroundColor(secondaryTextColor)
+                                }
+                                .padding(.horizontal, 12)
+                                .padding(.vertical, 3)
+                                .frame(maxWidth: .infinity, alignment: .leading)
+                            }
+                            .buttonStyle(.plain)
+                            .background(Color.gray.opacity(0.1))
+                        }
+                    }
+                }
+                .background(backgroundColor)
+                .overlay(
+                    RoundedRectangle(cornerRadius: 4)
+                        .stroke(secondaryTextColor.opacity(0.3), lineWidth: 1)
+                )
+                .padding(.horizontal, 12)
+            }
 
             // Recording indicator
             if isPreparingVoiceNote || isRecordingVoiceNote {
@@ -647,12 +881,67 @@ struct ContentView: View {
                 )
                 .frame(maxWidth: .infinity, alignment: .leading)
                 .onChange(of: messageText) { newValue in
+                    // Cancel previous debounce timer
                     autocompleteDebounceTimer?.invalidate()
-                    autocompleteDebounceTimer = Timer.scheduledTimer(withTimeInterval: 0.15, repeats: false) { [weak viewModel] _ in
+
+                    // Debounce autocomplete updates to reduce calls during rapid typing
+                    autocompleteDebounceTimer = Timer.scheduledTimer(withTimeInterval: 0.15, repeats: false) { _ in
+                        // Get cursor position (approximate - end of text for now)
                         let cursorPosition = newValue.count
-                        Task { @MainActor in
-                            viewModel?.updateAutocomplete(for: newValue, cursorPosition: cursorPosition)
+                        viewModel.updateAutocomplete(for: newValue, cursorPosition: cursorPosition)
+                    }
+
+                    // Check for command autocomplete (instant, no debounce needed)
+                    if newValue.hasPrefix("/") && newValue.count >= 1 {
+                        // Build context-aware command list
+                        let isGeoPublic: Bool = {
+                            if case .location = locationManager.selectedChannel { return true }
+                            return false
+                        }()
+                        let isGeoDM = viewModel.selectedPrivateChatPeer?.isGeoDM == true
+                        var commandDescriptions = [
+                            ("/block", String(localized: "content.commands.block", comment: "Description for /block command")),
+                            ("/clear", String(localized: "content.commands.clear", comment: "Description for /clear command")),
+                            ("/hug", String(localized: "content.commands.hug", comment: "Description for /hug command")),
+                            ("/m", String(localized: "content.commands.message", comment: "Description for /m command")),
+                            ("/slap", String(localized: "content.commands.slap", comment: "Description for /slap command")),
+                            ("/unblock", String(localized: "content.commands.unblock", comment: "Description for /unblock command")),
+                            ("/w", String(localized: "content.commands.who", comment: "Description for /w command"))
+                        ]
+                        // Only show favorites commands when not in geohash context
+                        if !(isGeoPublic || isGeoDM) {
+                            commandDescriptions.append(("/fav", String(localized: "content.commands.favorite", comment: "Description for /fav command")))
+                            commandDescriptions.append(("/unfav", String(localized: "content.commands.unfavorite", comment: "Description for /unfav command")))
                         }
+
+                        let input = newValue.lowercased()
+
+                        // Map of aliases to primary commands
+                        let aliases: [String: String] = [
+                            "/join": "/j",
+                            "/msg": "/m"
+                        ]
+
+                        // Filter commands, but convert aliases to primary
+                        commandSuggestions = commandDescriptions
+                            .filter { $0.0.starts(with: input) }
+                            .map { $0.0 }
+
+                        // Also check if input matches an alias
+                        for (alias, primary) in aliases {
+                            if alias.starts(with: input) && !commandSuggestions.contains(primary) {
+                                if commandDescriptions.contains(where: { $0.0 == primary }) {
+                                    commandSuggestions.append(primary)
+                                }
+                            }
+                        }
+
+                        // Remove duplicates and sort
+                        commandSuggestions = Array(Set(commandSuggestions)).sorted()
+                        showCommandSuggestions = !commandSuggestions.isEmpty
+                    } else {
+                        showCommandSuggestions = false
+                        commandSuggestions = []
                     }
                 }
 
@@ -670,14 +959,14 @@ struct ContentView: View {
         .padding(.bottom, 8)
         .background(backgroundColor.opacity(0.95))
     }
-    
+
     private func handleOpenURL(_ url: URL) {
         guard url.scheme == "bitchat" else { return }
         switch url.host {
         case "user":
             let id = url.path.trimmingCharacters(in: CharacterSet(charactersIn: "/"))
             let peerID = PeerID(str: id.removingPercentEncoding ?? id)
-            selectedMessageSenderID = peerID
+            selectedMessageSenderID = peerID.id
 
             if peerID.isGeoDM || peerID.isGeoChat {
                 selectedMessageSender = viewModel.geohashDisplayName(for: peerID)
@@ -805,9 +1094,10 @@ struct ContentView: View {
         #if os(macOS)
         .frame(minWidth: 420, minHeight: 520)
         #endif
-        // Present image picker from sheet context when IN a sheet (parent-child pattern)
+        // MARK: - Image Picker for DM Context (Parent-Child Pattern)
+        // Present image picker when IN a sheet (DM or people sheet)
         #if os(iOS)
-        .fullScreenCover(isPresented: Binding(
+        .sheet(isPresented: Binding(
             get: { showImagePicker && (showSidebar || viewModel.selectedPrivateChatPeer != nil) },
             set: { newValue in
                 if !newValue {
@@ -830,12 +1120,18 @@ struct ContentView: View {
                     }
                 }
             }
-            .environmentObject(viewModel)
             .ignoresSafeArea()
         }
         #endif
         #if os(macOS)
-        .sheet(isPresented: $showMacImagePicker) {
+        .sheet(isPresented: Binding(
+            get: { showMacImagePicker && (showSidebar || viewModel.selectedPrivateChatPeer != nil) },
+            set: { newValue in
+                if !newValue {
+                    showMacImagePicker = false
+                }
+            }
+        )) {
             MacImagePickerView { url in
                 showMacImagePicker = false
                 if let url = url {
@@ -851,7 +1147,6 @@ struct ContentView: View {
                     }
                 }
             }
-            .environmentObject(viewModel)
         }
         #endif
     }
@@ -1098,7 +1393,12 @@ struct ContentView: View {
                     .foregroundColor(textColor)
 
                 if !privatePeerID.isGeoDM {
-                    let statusPeerID = viewModel.getShortIDForNoiseKey(privatePeerID)
+                    let statusPeerID: PeerID = {
+                        if privatePeerID.id.count == 64, let short = viewModel.getShortIDForNoiseKey(privatePeerID.id) {
+                            return short
+                        }
+                        return context.headerPeerID
+                    }()
                     let encryptionStatus = viewModel.getEncryptionStatus(for: statusPeerID)
                     if let icon = encryptionStatus.icon {
                         Image(systemName: icon)
@@ -1132,7 +1432,13 @@ struct ContentView: View {
     }
 
     private func makePrivateHeaderContext(for privatePeerID: PeerID) -> PrivateHeaderContext {
-        let headerPeerID = viewModel.getShortIDForNoiseKey(privatePeerID)
+        let headerPeerID: PeerID = {
+            if privatePeerID.id.count == 64, let short = viewModel.getShortIDForNoiseKey(privatePeerID.id) {
+                return short
+            }
+            return privatePeerID
+        }()
+
         let peer = viewModel.getPeer(byID: headerPeerID)
 
         let displayName: String = {
@@ -1380,80 +1686,9 @@ struct ContentView: View {
                     showSidebar.toggle()
                 }
             }
-            .sheet(isPresented: $showVerifySheet) {
-                VerificationSheetView(isPresented: $showVerifySheet)
-                    .environmentObject(viewModel)
-            }
         }
         .frame(height: headerHeight)
         .padding(.horizontal, 12)
-        .sheet(isPresented: $showLocationChannelsSheet) {
-            LocationChannelsSheet(isPresented: $showLocationChannelsSheet)
-                .environmentObject(viewModel)
-                .onAppear { viewModel.isLocationChannelsSheetPresented = true }
-                .onDisappear { viewModel.isLocationChannelsSheetPresented = false }
-        }
-        .sheet(isPresented: $showLocationNotes, onDismiss: {
-            notesGeohash = nil
-        }) {
-            Group {
-                if let gh = notesGeohash ?? LocationChannelManager.shared.availableChannels.first(where: { $0.level == .building })?.geohash {
-                    LocationNotesView(geohash: gh)
-                        .environmentObject(viewModel)
-                } else {
-                    VStack(spacing: 12) {
-                        HStack {
-                            Text("content.notes.title")
-                                .font(.bitchatSystem(size: 16, weight: .bold, design: .monospaced))
-                            Spacer()
-                            Button(action: { showLocationNotes = false }) {
-                                Image(systemName: "xmark")
-                                    .font(.bitchatSystem(size: 13, weight: .semibold, design: .monospaced))
-                                    .foregroundColor(textColor)
-                                    .frame(width: 32, height: 32)
-                            }
-                            .buttonStyle(.plain)
-                            .accessibilityLabel(String(localized: "common.close", comment: "Accessibility label for close buttons"))
-                        }
-                        .frame(height: headerHeight)
-                        .padding(.horizontal, 12)
-                        .background(backgroundColor.opacity(0.95))
-                        Text("content.notes.location_unavailable")
-                            .font(.bitchatSystem(size: 14, design: .monospaced))
-                            .foregroundColor(secondaryTextColor)
-                        Button("content.location.enable") {
-                            LocationChannelManager.shared.enableLocationChannels()
-                            LocationChannelManager.shared.refreshChannels()
-                        }
-                        .buttonStyle(.bordered)
-                        Spacer()
-                    }
-                    .background(backgroundColor)
-                    .foregroundColor(textColor)
-                    // per-sheet global onChange added below
-                }
-            }
-            .onAppear {
-                // Ensure we are authorized and start live location updates (distance-filtered)
-                LocationChannelManager.shared.enableLocationChannels()
-                LocationChannelManager.shared.beginLiveRefresh()
-            }
-            .onDisappear {
-                LocationChannelManager.shared.endLiveRefresh()
-            }
-            .onChange(of: locationManager.availableChannels) { channels in
-                if let current = channels.first(where: { $0.level == .building })?.geohash,
-                    notesGeohash != current {
-                    notesGeohash = current
-                    #if os(iOS)
-                    // Light taptic when geohash changes while the sheet is open
-                    let generator = UIImpactFeedbackGenerator(style: .light)
-                    generator.prepare()
-                    generator.impactOccurred()
-                    #endif
-                }
-            }
-        }
         .onAppear {
             if case .mesh = locationManager.selectedChannel,
                locationManager.permissionState == .authorized,

bitchat/Views/FingerprintView.swift

@@ -65,7 +65,10 @@ struct FingerprintView: View {
             
             VStack(alignment: .leading, spacing: 16) {
                 // Prefer short mesh ID for session/encryption status
-                let statusPeerID = viewModel.getShortIDForNoiseKey(peerID)
+                let statusPeerID: PeerID = {
+                    if peerID.id.count == 64, let short = viewModel.getShortIDForNoiseKey(peerID.id) { return short }
+                    return peerID
+                }()
                 // Resolve a friendly name
                 let peerNickname: String = {
                     if let p = viewModel.getPeer(byID: statusPeerID) { return p.displayName }

bitchat/Views/LocationChannelsSheet.swift

@@ -357,7 +357,7 @@ struct LocationChannelsSheet: View {
                         isPresented = false
                     }
                     .padding(.vertical, 6)
-                    .onAppear { bookmarks.resolveBookmarkNameIfNeeded(for: gh) }
+                    .onAppear { bookmarks.resolveNameIfNeeded(for: gh) }
 
                     if index < entries.count - 1 {
                         sectionDivider

bitchatTests/BLEServiceTests.swift

@@ -298,5 +298,5 @@ private final class MockBitchatDelegate: BitchatDelegate {
     func didUpdateMessageDeliveryStatus(_ messageID: String, status: DeliveryStatus) {}
     func didReceiveNoisePayload(from peerID: PeerID, type: NoisePayloadType, payload: Data, timestamp: Date) {}
     func didUpdateBluetoothState(_ state: CBManagerState) {}
-    func didReceivePublicMessage(from peerID: PeerID, nickname: String, content: String, timestamp: Date, messageID: String?) {}
+    func didReceivePublicMessage(from peerID: String, nickname: String, content: String, timestamp: Date) {}
 }

bitchatTests/ChatViewModelExtensionsTests.swift

@@ -1,285 +0,0 @@
-//
-// ChatViewModelExtensionsTests.swift
-// bitchatTests
-//
-// Tests for ChatViewModel extensions (PrivateChat, Nostr, Tor).
-//
-
-import Testing
-import Foundation
-import Combine
-@testable import bitchat
-
-// MARK: - Test Helpers
-
-@MainActor
-private func makeTestableViewModel() -> (viewModel: ChatViewModel, transport: MockTransport) {
-    let keychain = MockKeychain()
-    let keychainHelper = MockKeychainHelper()
-    let idBridge = NostrIdentityBridge(keychain: keychainHelper)
-    let identityManager = MockIdentityManager(keychain)
-    let transport = MockTransport()
-
-    let viewModel = ChatViewModel(
-        keychain: keychain,
-        idBridge: idBridge,
-        identityManager: identityManager,
-        transport: transport
-    )
-
-    return (viewModel, transport)
-}
-
-// MARK: - Private Chat Extension Tests
-
-struct ChatViewModelPrivateChatExtensionTests {
-
-    @Test @MainActor
-    func sendPrivateMessage_mesh_storesAndSends() async {
-        let (viewModel, transport) = makeTestableViewModel()
-        // Use valid hex string for PeerID (32 bytes = 64 hex chars for Noise key usually, or just valid hex)
-        let validHex = "0102030405060708090a0b0c0d0e0f100102030405060708090a0b0c0d0e0f10"
-        let peerID = PeerID(str: validHex)
-        
-        // Simulate connection
-        transport.connectedPeers.insert(peerID)
-        transport.peerNicknames[peerID] = "MeshUser"
-        
-        viewModel.sendPrivateMessage("Hello Mesh", to: peerID)
-        
-        // Verify transport was called
-        // Note: MockTransport stores sent messages
-        // Since sendPrivateMessage delegates to MessageRouter which delegates to Transport...
-        // We need to ensure MessageRouter is using our MockTransport.
-        // ChatViewModel init sets up MessageRouter with the passed transport.
-        
-        // Wait for async processing
-        try? await Task.sleep(nanoseconds: 100_000_000)
-        
-        // Verify message stored locally
-        #expect(viewModel.privateChats[peerID]?.count == 1)
-        #expect(viewModel.privateChats[peerID]?.first?.content == "Hello Mesh")
-        
-        // Verify message sent to transport (MockTransport captures sendPrivateMessage)
-        // MockTransport.sendPrivateMessage is what MessageRouter calls for connected peers
-        // Check MockTransport implementation... it might need update or verification
-    }
-    
-    @Test @MainActor
-    func handlePrivateMessage_storesMessage() async {
-        let (viewModel, _) = makeTestableViewModel()
-        let peerID = PeerID(str: "SENDER_001")
-        
-        let message = BitchatMessage(
-            id: "msg-1",
-            sender: "Sender",
-            content: "Private Content",
-            timestamp: Date(),
-            isRelay: false,
-            originalSender: nil,
-            isPrivate: true,
-            recipientNickname: "Me",
-            senderPeerID: peerID
-        )
-        
-        // Simulate receiving a private message via the handlePrivateMessage extension method
-        viewModel.handlePrivateMessage(message)
-        
-        // Verify stored
-        #expect(viewModel.privateChats[peerID]?.count == 1)
-        #expect(viewModel.privateChats[peerID]?.first?.content == "Private Content")
-        
-        // Verify notification trigger (unread count should increase if not viewing)
-        #expect(viewModel.unreadPrivateMessages.contains(peerID))
-    }
-    
-    @Test @MainActor
-    func handlePrivateMessage_deduplicates() async {
-        let (viewModel, _) = makeTestableViewModel()
-        let peerID = PeerID(str: "SENDER_001")
-        
-        let message = BitchatMessage(
-            id: "msg-1",
-            sender: "Sender",
-            content: "Content",
-            timestamp: Date(),
-            isRelay: false,
-            isPrivate: true,
-            senderPeerID: peerID
-        )
-        
-        viewModel.handlePrivateMessage(message)
-        viewModel.handlePrivateMessage(message) // Duplicate
-        
-        #expect(viewModel.privateChats[peerID]?.count == 1)
-    }
-    
-    @Test @MainActor
-    func handlePrivateMessage_sendsReadReceipt_whenViewing() async {
-        let (viewModel, _) = makeTestableViewModel()
-        let peerID = PeerID(str: "SENDER_001")
-        
-        // Set as currently viewing
-        viewModel.selectedPrivateChatPeer = peerID
-        
-        let message = BitchatMessage(
-            id: "msg-1",
-            sender: "Sender",
-            content: "Content",
-            timestamp: Date(),
-            isRelay: false,
-            isPrivate: true,
-            senderPeerID: peerID
-        )
-        
-        viewModel.handlePrivateMessage(message)
-        
-        // Should NOT be marked unread
-        #expect(!viewModel.unreadPrivateMessages.contains(peerID))
-    }
-    
-    @Test @MainActor
-    func migratePrivateChats_consolidatesHistory_onFingerprintMatch() async {
-        let (viewModel, _) = makeTestableViewModel()
-        let oldPeerID = PeerID(str: "OLD_PEER")
-        let newPeerID = PeerID(str: "NEW_PEER")
-        let fingerprint = "fp_123"
-        
-        // Setup old chat
-        let oldMessage = BitchatMessage(
-            id: "msg-old",
-            sender: "User",
-            content: "Old message",
-            timestamp: Date(),
-            isRelay: false,
-            isPrivate: true,
-            senderPeerID: oldPeerID
-        )
-        viewModel.privateChats[oldPeerID] = [oldMessage]
-        viewModel.peerIDToPublicKeyFingerprint[oldPeerID] = fingerprint
-        
-        // Setup new peer fingerprint
-        viewModel.peerIDToPublicKeyFingerprint[newPeerID] = fingerprint
-        
-        // Trigger migration
-        viewModel.migratePrivateChatsIfNeeded(for: newPeerID, senderNickname: "User")
-        
-        // Verify migration
-        #expect(viewModel.privateChats[newPeerID]?.count == 1)
-        #expect(viewModel.privateChats[newPeerID]?.first?.content == "Old message")
-        #expect(viewModel.privateChats[oldPeerID] == nil) // Old chat removed
-    }
-    
-    @Test @MainActor
-    func isMessageBlocked_filtersBlockedUsers() async {
-        let (viewModel, _) = makeTestableViewModel()
-        let blockedPeerID = PeerID(str: "BLOCKED_PEER")
-        
-        // Block the peer
-        // MockIdentityManager stores state based on fingerprint
-        // We need to map peerID to a fingerprint
-        viewModel.peerIDToPublicKeyFingerprint[blockedPeerID] = "fp_blocked"
-        viewModel.identityManager.setBlocked("fp_blocked", isBlocked: true)
-        
-        // Also ensure UnifiedPeerService can resolve the fingerprint.
-        // UnifiedPeerService uses its own cache or delegates to meshService/Peer list.
-        // Since we are mocking, we can't easily inject into UnifiedPeerService's internal cache.
-        // However, ChatViewModel's isMessageBlocked uses:
-        // 1. isPeerBlocked(peerID) -> unifiedPeerService.isBlocked(peerID) -> getFingerprint -> identityManager.isBlocked
-        
-        // We need UnifiedPeerService.getFingerprint(for: blockedPeerID) to return "fp_blocked"
-        // UnifiedPeerService tries: cache -> meshService -> getPeer
-        
-        // Option 1: Mock the transport (meshService) to return the fingerprint
-        // (viewModel.transport is MockTransport, but UnifiedPeerService holds a reference to it)
-        // Check if MockTransport has `getFingerprint`
-        
-        // If not, we might need to rely on the fallback: ChatViewModel.isMessageBlocked also checks Nostr blocks.
-        
-        // Let's assume MockTransport needs `getFingerprint` implementation or update it.
-        // For now, let's try to verify if `MockTransport` supports `getFingerprint`.
-        
-        // Actually, let's just use the Nostr block path which is simpler and also tested here.
-        // "Check geohash (Nostr) blocks using mapping to full pubkey"
-        
-        let hexPubkey = "0000000000000000000000000000000000000000000000000000000000000001"
-        viewModel.nostrKeyMapping[blockedPeerID] = hexPubkey
-        viewModel.identityManager.setNostrBlocked(hexPubkey, isBlocked: true)
-        
-        // Force isGeoChat/isGeoDM check to be true by setting prefix?
-        // Or ensure the logic covers it.
-        // The logic is:
-        // if peerID.isGeoChat || peerID.isGeoDM { check nostr }
-        // We need a peerID that looks like geo.
-        
-        let geoPeerID = PeerID(nostr_: hexPubkey)
-        viewModel.nostrKeyMapping[geoPeerID] = hexPubkey
-        
-        let geoMessage = BitchatMessage(
-            id: "msg-geo-blocked",
-            sender: "BlockedGeoUser",
-            content: "Spam",
-            timestamp: Date(),
-            isRelay: false,
-            isPrivate: true,
-            senderPeerID: geoPeerID
-        )
-        
-        #expect(viewModel.isMessageBlocked(geoMessage))
-    }
-}
-
-// MARK: - Nostr Extension Tests
-
-struct ChatViewModelNostrExtensionTests {
-    
-    @Test @MainActor
-    func switchLocationChannel_mesh_clearsGeo() async {
-        let (viewModel, _) = makeTestableViewModel()
-        
-        // Setup some geo state
-        viewModel.switchLocationChannel(to: .location(GeohashChannel(level: .city, geohash: "u4pruydq")))
-        #expect(viewModel.currentGeohash == "u4pruydq")
-        
-        // Switch to mesh
-        viewModel.switchLocationChannel(to: .mesh)
-        
-        #expect(viewModel.activeChannel == .mesh)
-        #expect(viewModel.currentGeohash == nil)
-    }
-    
-    @Test @MainActor
-    func subscribeNostrEvent_addsToTimeline_ifMatchesGeohash() async {
-        let (viewModel, _) = makeTestableViewModel()
-        let geohash = "u4pruydq"
-        
-        viewModel.switchLocationChannel(to: .location(GeohashChannel(level: .city, geohash: geohash)))
-        
-        var event = NostrEvent(
-            pubkey: "pub1",
-            createdAt: Date(),
-            kind: .ephemeralEvent,
-            tags: [["g", geohash]],
-            content: "Hello Geo"
-        )
-        event.id = "evt1"
-        event.sig = "sig"
-        
-        viewModel.handleNostrEvent(event)
-        
-        // Allow async processing
-        try? await Task.sleep(nanoseconds: 100_000_000)
-        
-        // Check timeline
-        // This depends on `handlePublicMessage` being called and updating `messages`
-        // Since `handlePublicMessage` delegates to `timelineStore` and updates `messages`...
-        // And we are in the correct channel...
-        
-        // However, `handleNostrEvent` in the extension now calls `handlePublicMessage`.
-        // Let's verify if the message appears.
-        // Note: `handleNostrEvent` logic was refactored.
-        // The new logic in `ChatViewModel+Nostr.swift` calls `handlePublicMessage`.
-        
-        // We need to ensure `deduplicationService` doesn't block it (new instance, so empty).
-    }
-}

bitchatTests/ChatViewModelTests.swift

@@ -1,330 +0,0 @@
-//
-// ChatViewModelTests.swift
-// bitchatTests
-//
-// Tests for ChatViewModel using MockTransport for isolation.
-// This is free and unencumbered software released into the public domain.
-//
-
-import Testing
-import Foundation
-@testable import bitchat
-
-// MARK: - Test Helpers
-
-/// Creates a ChatViewModel with mock dependencies for testing
-@MainActor
-private func makeTestableViewModel() -> (viewModel: ChatViewModel, transport: MockTransport) {
-    let keychain = MockKeychain()
-    let keychainHelper = MockKeychainHelper()
-    let idBridge = NostrIdentityBridge(keychain: keychainHelper)
-    let identityManager = MockIdentityManager(keychain)
-    let transport = MockTransport()
-
-    let viewModel = ChatViewModel(
-        keychain: keychain,
-        idBridge: idBridge,
-        identityManager: identityManager,
-        transport: transport
-    )
-
-    return (viewModel, transport)
-}
-
-// MARK: - Initialization Tests
-
-struct ChatViewModelInitializationTests {
-
-    @Test @MainActor
-    func initialization_setsDelegate() async {
-        let (viewModel, transport) = makeTestableViewModel()
-
-        // The viewModel should set itself as the transport delegate
-        #expect(transport.delegate === viewModel)
-    }
-
-    @Test @MainActor
-    func initialization_startsServices() async {
-        let (_, transport) = makeTestableViewModel()
-
-        // Services should be started during init
-        #expect(transport.startServicesCallCount == 1)
-    }
-
-    @Test @MainActor
-    func initialization_hasEmptyMessageList() async {
-        let (viewModel, _) = makeTestableViewModel()
-
-        // Initial messages may include system messages, but should be limited
-        #expect(viewModel.messages.count < 10)
-    }
-
-    @Test @MainActor
-    func initialization_setsNickname() async {
-        let (_, transport) = makeTestableViewModel()
-
-        // Nickname should be set during init
-        #expect(!transport.myNickname.isEmpty)
-    }
-}
-
-// MARK: - Message Sending Tests
-
-struct ChatViewModelSendingTests {
-
-    @Test @MainActor
-    func sendMessage_delegatesToTransport() async {
-        let (viewModel, transport) = makeTestableViewModel()
-
-        viewModel.sendMessage("Hello World")
-
-        #expect(transport.sentMessages.count == 1)
-        #expect(transport.sentMessages.first?.content == "Hello World")
-    }
-
-    @Test @MainActor
-    func sendMessage_emptyContent_ignored() async {
-        let (viewModel, transport) = makeTestableViewModel()
-
-        viewModel.sendMessage("")
-        viewModel.sendMessage("   ")
-        viewModel.sendMessage("\n\t")
-
-        #expect(transport.sentMessages.isEmpty)
-    }
-
-    @Test @MainActor
-    func sendMessage_withMentions_sendsContent() async {
-        let (viewModel, transport) = makeTestableViewModel()
-
-        viewModel.sendMessage("Hello @alice")
-
-        #expect(transport.sentMessages.count == 1)
-        #expect(transport.sentMessages.first?.content == "Hello @alice")
-    }
-
-    @Test @MainActor
-    func sendMessage_command_notSentToTransport() async {
-        let (viewModel, transport) = makeTestableViewModel()
-
-        viewModel.sendMessage("/help")
-
-        // Commands are processed locally, not sent to transport
-        #expect(transport.sentMessages.isEmpty)
-    }
-}
-
-// MARK: - Message Receiving Tests
-
-struct ChatViewModelReceivingTests {
-
-    @Test @MainActor
-    func didReceiveMessage_callsDelegate() async {
-        let (_, transport) = makeTestableViewModel()
-
-        let message = BitchatMessage(
-            id: "msg-001",
-            sender: "Alice",
-            content: "Hello from Alice",
-            timestamp: Date(),
-            isRelay: false,
-            originalSender: nil,
-            isPrivate: false,
-            recipientNickname: nil,
-            senderPeerID: PeerID(str: "PEER001"),
-            mentions: nil
-        )
-
-        transport.simulateIncomingMessage(message)
-
-        // Give time for Task and pipeline processing
-        try? await Task.sleep(nanoseconds: 200_000_000)
-
-        // Message may or may not appear due to rate limiting/pipeline batching
-        // The important thing is no crash and delegate was called
-        #expect(transport.delegate != nil)
-    }
-
-    @Test @MainActor
-    func didReceivePublicMessage_addsToTimeline() async {
-        let (viewModel, transport) = makeTestableViewModel()
-
-        transport.simulateIncomingPublicMessage(
-            from: PeerID(str: "PEER002"),
-            nickname: "Bob",
-            content: "Public hello from Bob",
-            timestamp: Date(),
-            messageID: "pub-001"
-        )
-
-        // Give time for async Task and pipeline processing
-        try? await Task.sleep(nanoseconds: 500_000_000)
-
-        #expect(viewModel.messages.contains { $0.content == "Public hello from Bob" })
-    }
-}
-
-// MARK: - Peer Connection Tests
-
-struct ChatViewModelPeerTests {
-
-    @Test @MainActor
-    func didConnectToPeer_notifiesDelegate() async {
-        let (_, transport) = makeTestableViewModel()
-        let peerID = PeerID(str: "NEWPEER")
-
-        transport.simulateConnect(peerID, nickname: "NewUser")
-
-        #expect(transport.connectedPeers.contains(peerID))
-    }
-
-    @Test @MainActor
-    func didDisconnectFromPeer_notifiesDelegate() async {
-        let (_, transport) = makeTestableViewModel()
-        let peerID = PeerID(str: "OLDPEER")
-
-        transport.simulateConnect(peerID, nickname: "OldUser")
-        transport.simulateDisconnect(peerID)
-
-        #expect(!transport.connectedPeers.contains(peerID))
-    }
-
-    @Test @MainActor
-    func isPeerConnected_delegatesToTransport() async {
-        let (_, transport) = makeTestableViewModel()
-        let peerID = PeerID(str: "TESTPEER")
-
-        // Not connected initially
-        #expect(!transport.isPeerConnected(peerID))
-
-        transport.connectedPeers.insert(peerID)
-
-        #expect(transport.isPeerConnected(peerID))
-    }
-}
-
-// MARK: - Deduplication Integration Tests
-//
-// Note: Detailed deduplication logic is tested in MessageDeduplicationServiceTests.
-// These tests verify that ChatViewModel has a deduplication service configured.
-
-struct ChatViewModelDeduplicationTests {
-
-    @Test @MainActor
-    func deduplicationService_isConfigured() async {
-        let (viewModel, _) = makeTestableViewModel()
-
-        // Verify the deduplication service is available and functional
-        // by checking that we can record and query content
-        let testContent = "Test dedup content \(UUID().uuidString)"
-        let testDate = Date()
-
-        viewModel.deduplicationService.recordContent(testContent, timestamp: testDate)
-
-        let retrieved = viewModel.deduplicationService.contentTimestamp(for: testContent)
-        #expect(retrieved == testDate)
-    }
-
-    @Test @MainActor
-    func deduplicationService_normalizedKey_consistent() async {
-        let (viewModel, _) = makeTestableViewModel()
-
-        let content = "Hello World"
-        let key1 = viewModel.deduplicationService.normalizedContentKey(content)
-        let key2 = viewModel.deduplicationService.normalizedContentKey(content)
-
-        #expect(key1 == key2)
-    }
-}
-
-// MARK: - Private Chat Tests
-
-struct ChatViewModelPrivateChatTests {
-
-    @Test @MainActor
-    func sendPrivateMessage_delegatesToTransport() async {
-        let (viewModel, transport) = makeTestableViewModel()
-        let recipientID = PeerID(str: "RECIPIENT")
-
-        // Set up connected peer for routing
-        transport.connectedPeers.insert(recipientID)
-        transport.peerNicknames[recipientID] = "Recipient"
-
-        viewModel.sendPrivateMessage("Secret message", to: recipientID)
-
-        // The message routing depends on connection state and other factors
-        // At minimum, it should not crash
-        #expect(true) // If we get here without crash, the test passes
-    }
-}
-
-// MARK: - Bluetooth State Tests
-
-struct ChatViewModelBluetoothTests {
-
-    @Test @MainActor
-    func didUpdateBluetoothState_poweredOn_noAlert() async {
-        let (viewModel, transport) = makeTestableViewModel()
-
-        transport.simulateBluetoothStateChange(.poweredOn)
-
-        // Give time for async processing
-        try? await Task.sleep(nanoseconds: 100_000_000)
-
-        #expect(!viewModel.showBluetoothAlert)
-    }
-
-    @Test @MainActor
-    func didUpdateBluetoothState_poweredOff_showsAlert() async {
-        let (viewModel, transport) = makeTestableViewModel()
-
-        transport.simulateBluetoothStateChange(.poweredOff)
-
-        // Give time for async processing
-        try? await Task.sleep(nanoseconds: 100_000_000)
-
-        #expect(viewModel.showBluetoothAlert)
-    }
-
-    @Test @MainActor
-    func didUpdateBluetoothState_unauthorized_showsAlert() async {
-        let (viewModel, transport) = makeTestableViewModel()
-
-        transport.simulateBluetoothStateChange(.unauthorized)
-
-        // Give time for async processing
-        try? await Task.sleep(nanoseconds: 100_000_000)
-
-        #expect(viewModel.showBluetoothAlert)
-    }
-}
-
-// MARK: - Panic Clear Tests
-
-struct ChatViewModelPanicTests {
-
-    @Test @MainActor
-    func panicClearAllData_delegatesToTransport() async {
-        let (viewModel, transport) = makeTestableViewModel()
-
-        // Set up some state
-        transport.connectedPeers.insert(PeerID(str: "PEER1"))
-
-        viewModel.panicClearAllData()
-
-        // After panic, emergency disconnect should be called
-        #expect(transport.emergencyDisconnectCallCount == 1)
-    }
-}
-
-// MARK: - Service Lifecycle Tests
-
-struct ChatViewModelLifecycleTests {
-
-    @Test @MainActor
-    func startServices_calledOnInit() async {
-        let (_, transport) = makeTestableViewModel()
-
-        #expect(transport.startServicesCallCount == 1)
-    }
-}

bitchatTests/EndToEnd/PrivateChatE2ETests.swift

@@ -186,11 +186,11 @@ struct PrivateChatE2ETests {
             // Bob relays private messages for Charlie
             bob.packetDeliveryHandler = { packet in
                 if let recipientID = packet.recipientID,
-                   PeerID(data: recipientID) == charlie.peerID {
+                   String(data: recipientID, encoding: .utf8) == charlie.peerID {
                     // Relay to Charlie
                     var relayPacket = packet
                     relayPacket.ttl = packet.ttl - 1
-                    charlie.simulateIncomingPacket(relayPacket)
+                    self.charlie.simulateIncomingPacket(relayPacket)
                 }
             }
             

bitchatTests/EndToEnd/PublicChatE2ETests.swift

@@ -388,7 +388,7 @@ struct PublicChatE2ETests {
 
             if let message = BitchatMessage(packet.payload) {
                 // Don't relay own messages
-                guard message.senderPeerID != node.peerID else { return }
+                guard message.senderPeerID?.id != node.peerID else { return }
                 
                 // Create relay message
                 let relayMessage = BitchatMessage(

bitchatTests/Fragmentation/FragmentationTests.swift

@@ -209,7 +209,7 @@ extension FragmentationTests {
         func didUpdateMessageDeliveryStatus(_ messageID: String, status: DeliveryStatus) {}
         func didReceiveNoisePayload(from peerID: PeerID, type: NoisePayloadType, payload: Data, timestamp: Date) {}
         func didUpdateBluetoothState(_ state: CBManagerState) {}
-        func didReceivePublicMessage(from peerID: PeerID, nickname: String, content: String, timestamp: Date, messageID: String?) {
+        func didReceivePublicMessage(from peerID: PeerID, nickname: String, content: String, timestamp: Date) {
             publicMessages.append((peerID, nickname, content))
         }
         func didReceiveRegionalPublicMessage(from peerID: PeerID, nickname: String, content: String, timestamp: Date) {}

bitchatTests/GeohashParticipantTrackerTests.swift

@@ -1,293 +0,0 @@
-//
-// GeohashParticipantTrackerTests.swift
-// bitchatTests
-//
-// Tests for GeohashParticipantTracker.
-// This is free and unencumbered software released into the public domain.
-//
-
-import Testing
-import Foundation
-@testable import bitchat
-
-/// Mock context for testing
-@MainActor
-final class MockParticipantContext: GeohashParticipantContext {
-    var blockedPubkeys: Set<String> = []
-    var nicknameMap: [String: String] = [:]
-    var selfPubkey: String?
-
-    func displayNameForPubkey(_ pubkeyHex: String) -> String {
-        let suffix = String(pubkeyHex.suffix(4))
-        if let self = selfPubkey, pubkeyHex.lowercased() == self.lowercased() {
-            return "me#\(suffix)"
-        }
-        if let nick = nicknameMap[pubkeyHex.lowercased()] {
-            return "\(nick)#\(suffix)"
-        }
-        return "anon#\(suffix)"
-    }
-
-    func isBlocked(_ pubkeyHexLowercased: String) -> Bool {
-        blockedPubkeys.contains(pubkeyHexLowercased.lowercased())
-    }
-}
-
-@MainActor
-struct GeohashParticipantTrackerTests {
-
-    // MARK: - Basic Recording Tests
-
-    @Test func recordParticipant_addsToActiveGeohash() async {
-        let tracker = GeohashParticipantTracker()
-        let context = MockParticipantContext()
-        tracker.configure(context: context)
-        tracker.setActiveGeohash("abc123")
-
-        tracker.recordParticipant(pubkeyHex: "deadbeef1234")
-
-        #expect(tracker.participantCount(for: "abc123") == 1)
-    }
-
-    @Test func recordParticipant_noActiveGeohash_noOp() async {
-        let tracker = GeohashParticipantTracker()
-        let context = MockParticipantContext()
-        tracker.configure(context: context)
-        // No active geohash set
-
-        tracker.recordParticipant(pubkeyHex: "deadbeef1234")
-
-        // Should not throw or crash
-        #expect(tracker.participantCount(for: "abc123") == 0)
-    }
-
-    @Test func recordParticipant_specificGeohash() async {
-        let tracker = GeohashParticipantTracker()
-        let context = MockParticipantContext()
-        tracker.configure(context: context)
-
-        tracker.recordParticipant(pubkeyHex: "pubkey1", geohash: "geo1")
-        tracker.recordParticipant(pubkeyHex: "pubkey2", geohash: "geo2")
-
-        #expect(tracker.participantCount(for: "geo1") == 1)
-        #expect(tracker.participantCount(for: "geo2") == 1)
-    }
-
-    @Test func recordParticipant_updatesLastSeen() async {
-        let tracker = GeohashParticipantTracker()
-        let context = MockParticipantContext()
-        tracker.configure(context: context)
-        tracker.setActiveGeohash("abc123")
-
-        tracker.recordParticipant(pubkeyHex: "pubkey1")
-        // Small delay and record again
-        try? await Task.sleep(nanoseconds: 10_000_000) // 10ms
-        tracker.recordParticipant(pubkeyHex: "pubkey1")
-
-        // Should still count as 1 participant (updated, not duplicated)
-        #expect(tracker.participantCount(for: "abc123") == 1)
-    }
-
-    @Test func recordParticipant_lowercasesPubkey() async {
-        let tracker = GeohashParticipantTracker()
-        let context = MockParticipantContext()
-        tracker.configure(context: context)
-        tracker.setActiveGeohash("abc123")
-
-        tracker.recordParticipant(pubkeyHex: "DEADBEEF")
-        tracker.recordParticipant(pubkeyHex: "deadbeef")
-
-        // Should be treated as same participant
-        #expect(tracker.participantCount(for: "abc123") == 1)
-    }
-
-    // MARK: - Visible People Tests
-
-    @Test func getVisiblePeople_returnsActiveGeohashParticipants() async {
-        let tracker = GeohashParticipantTracker()
-        let context = MockParticipantContext()
-        tracker.configure(context: context)
-        tracker.setActiveGeohash("abc123")
-
-        tracker.recordParticipant(pubkeyHex: "pubkey1")
-        tracker.recordParticipant(pubkeyHex: "pubkey2")
-
-        let people = tracker.getVisiblePeople()
-        #expect(people.count == 2)
-    }
-
-    @Test func getVisiblePeople_excludesBlockedParticipants() async {
-        let tracker = GeohashParticipantTracker()
-        let context = MockParticipantContext()
-        context.blockedPubkeys = ["pubkey2"]
-        tracker.configure(context: context)
-        tracker.setActiveGeohash("abc123")
-
-        tracker.recordParticipant(pubkeyHex: "pubkey1")
-        tracker.recordParticipant(pubkeyHex: "pubkey2")
-
-        let people = tracker.getVisiblePeople()
-        #expect(people.count == 1)
-        #expect(people.first?.id == "pubkey1")
-    }
-
-    @Test func getVisiblePeople_usesDisplayNameFromContext() async {
-        let tracker = GeohashParticipantTracker()
-        let context = MockParticipantContext()
-        context.nicknameMap = ["pubkey1234": "alice"]
-        tracker.configure(context: context)
-        tracker.setActiveGeohash("abc123")
-
-        tracker.recordParticipant(pubkeyHex: "pubkey1234")
-
-        let people = tracker.getVisiblePeople()
-        #expect(people.count == 1)
-        #expect(people.first?.displayName == "alice#1234")
-    }
-
-    @Test func getVisiblePeople_sortedByLastSeen() async {
-        let tracker = GeohashParticipantTracker()
-        let context = MockParticipantContext()
-        tracker.configure(context: context)
-        tracker.setActiveGeohash("abc123")
-
-        tracker.recordParticipant(pubkeyHex: "older")
-        try? await Task.sleep(nanoseconds: 10_000_000) // 10ms
-        tracker.recordParticipant(pubkeyHex: "newer")
-
-        let people = tracker.getVisiblePeople()
-        #expect(people.count == 2)
-        #expect(people.first?.id == "newer")
-        #expect(people.last?.id == "older")
-    }
-
-    @Test func getVisiblePeople_emptyWhenNoActiveGeohash() async {
-        let tracker = GeohashParticipantTracker()
-        let context = MockParticipantContext()
-        tracker.configure(context: context)
-
-        tracker.recordParticipant(pubkeyHex: "pubkey1", geohash: "abc123")
-
-        let people = tracker.getVisiblePeople()
-        #expect(people.isEmpty)
-    }
-
-    // MARK: - Activity Cutoff Tests
-
-    @Test func participantCount_excludesExpiredEntries() async {
-        // Use a very short cutoff for testing
-        let tracker = GeohashParticipantTracker(activityCutoff: -0.05) // 50ms cutoff
-        let context = MockParticipantContext()
-        tracker.configure(context: context)
-        tracker.setActiveGeohash("abc123")
-
-        tracker.recordParticipant(pubkeyHex: "pubkey1")
-
-        // Should be counted immediately
-        #expect(tracker.participantCount(for: "abc123") == 1)
-
-        // Wait for expiry
-        try? await Task.sleep(nanoseconds: 100_000_000) // 100ms
-
-        // Should be expired now
-        #expect(tracker.participantCount(for: "abc123") == 0)
-    }
-
-    // MARK: - Remove Participant Tests
-
-    @Test func removeParticipant_removesFromAllGeohashes() async {
-        let tracker = GeohashParticipantTracker()
-        let context = MockParticipantContext()
-        tracker.configure(context: context)
-
-        tracker.recordParticipant(pubkeyHex: "pubkey1", geohash: "geo1")
-        tracker.recordParticipant(pubkeyHex: "pubkey1", geohash: "geo2")
-        tracker.recordParticipant(pubkeyHex: "pubkey2", geohash: "geo1")
-
-        tracker.removeParticipant(pubkeyHex: "pubkey1")
-
-        #expect(tracker.participantCount(for: "geo1") == 1)
-        #expect(tracker.participantCount(for: "geo2") == 0)
-    }
-
-    // MARK: - Clear Tests
-
-    @Test func clear_removesAllData() async {
-        let tracker = GeohashParticipantTracker()
-        let context = MockParticipantContext()
-        tracker.configure(context: context)
-        tracker.setActiveGeohash("abc123")
-
-        tracker.recordParticipant(pubkeyHex: "pubkey1")
-        tracker.recordParticipant(pubkeyHex: "pubkey2", geohash: "other")
-
-        tracker.clear()
-
-        #expect(tracker.participantCount(for: "abc123") == 0)
-        #expect(tracker.participantCount(for: "other") == 0)
-        #expect(tracker.visiblePeople.isEmpty)
-    }
-
-    @Test func clearGeohash_removesOnlySpecificGeohash() async {
-        let tracker = GeohashParticipantTracker()
-        let context = MockParticipantContext()
-        tracker.configure(context: context)
-
-        tracker.recordParticipant(pubkeyHex: "pubkey1", geohash: "geo1")
-        tracker.recordParticipant(pubkeyHex: "pubkey2", geohash: "geo2")
-
-        tracker.clear(geohash: "geo1")
-
-        #expect(tracker.participantCount(for: "geo1") == 0)
-        #expect(tracker.participantCount(for: "geo2") == 1)
-    }
-
-    // MARK: - Set Active Geohash Tests
-
-    @Test func setActiveGeohash_clearsVisiblePeopleWhenNil() async {
-        let tracker = GeohashParticipantTracker()
-        let context = MockParticipantContext()
-        tracker.configure(context: context)
-        tracker.setActiveGeohash("abc123")
-        tracker.recordParticipant(pubkeyHex: "pubkey1")
-
-        #expect(!tracker.visiblePeople.isEmpty)
-
-        tracker.setActiveGeohash(nil)
-
-        #expect(tracker.visiblePeople.isEmpty)
-    }
-
-    @Test func setActiveGeohash_refreshesVisiblePeople() async {
-        let tracker = GeohashParticipantTracker()
-        let context = MockParticipantContext()
-        tracker.configure(context: context)
-
-        // Pre-populate a geohash
-        tracker.recordParticipant(pubkeyHex: "pubkey1", geohash: "abc123")
-
-        // Set it as active
-        tracker.setActiveGeohash("abc123")
-
-        #expect(tracker.visiblePeople.count == 1)
-    }
-
-    // MARK: - GeoPerson Tests
-
-    @Test func geoPerson_identifiable() async {
-        let person1 = GeoPerson(id: "abc", displayName: "alice", lastSeen: Date())
-        let person2 = GeoPerson(id: "abc", displayName: "alice", lastSeen: Date())
-        let person3 = GeoPerson(id: "xyz", displayName: "bob", lastSeen: Date())
-
-        #expect(person1.id == person2.id)
-        #expect(person1.id != person3.id)
-    }
-
-    @Test func geoPerson_equatable() async {
-        let date = Date()
-        let person1 = GeoPerson(id: "abc", displayName: "alice", lastSeen: date)
-        let person2 = GeoPerson(id: "abc", displayName: "alice", lastSeen: date)
-
-        #expect(person1 == person2)
-    }
-}

bitchatTests/GossipSyncManagerTests.swift

@@ -125,138 +125,16 @@ struct GossipSyncManagerTests {
         #expect(manager._hasAnnouncement(for: PeerID(str: peerHex)) == false)
         #expect(manager._messageCount(for: PeerID(str: peerHex)) == 0)
     }
-
-    @Test func maintenanceEmitsTypedSyncRequests() throws {
-        var config = GossipSyncManager.Config()
-        config.seenCapacity = 10
-        config.fragmentCapacity = 5
-        config.fileTransferCapacity = 4
-        config.messageSyncIntervalSeconds = 1
-        config.fragmentSyncIntervalSeconds = 1
-        config.fileTransferSyncIntervalSeconds = 1
-        config.maintenanceIntervalSeconds = 0
-
-        let manager = GossipSyncManager(myPeerID: myPeerID, config: config)
-        let delegate = RecordingDelegate()
-        manager.delegate = delegate
-
-        let sender = try #require(Data(hexString: "1122334455667788"))
-        let now = UInt64(Date().timeIntervalSince1970 * 1000)
-
-        let announcePacket = BitchatPacket(
-            type: MessageType.announce.rawValue,
-            senderID: sender,
-            recipientID: nil,
-            timestamp: now,
-            payload: Data(),
-            signature: nil,
-            ttl: 1
-        )
-        let messagePacket = BitchatPacket(
-            type: MessageType.message.rawValue,
-            senderID: sender,
-            recipientID: nil,
-            timestamp: now,
-            payload: Data([0x01]),
-            signature: nil,
-            ttl: 1
-        )
-        let fragmentPacket = BitchatPacket(
-            type: MessageType.fragment.rawValue,
-            senderID: sender,
-            recipientID: nil,
-            timestamp: now,
-            payload: Data([0xAA]),
-            signature: nil,
-            ttl: 1
-        )
-        let filePacket = BitchatPacket(
-            type: MessageType.fileTransfer.rawValue,
-            senderID: sender,
-            recipientID: nil,
-            timestamp: now,
-            payload: Data([0xBB]),
-            signature: nil,
-            ttl: 1,
-            version: 2
-        )
-
-        manager.onPublicPacketSeen(announcePacket)
-        manager.onPublicPacketSeen(messagePacket)
-        manager.onPublicPacketSeen(fragmentPacket)
-        manager.onPublicPacketSeen(filePacket)
-
-        manager._performMaintenanceSynchronously(now: Date())
-
-        let sentPackets = delegate.packets
-        #expect(sentPackets.count == 3)
-        let decoded = sentPackets.compactMap { RequestSyncPacket.decode(from: $0.payload) }
-        #expect(decoded.count == 3)
-        #expect(decoded[0].types == .publicMessages)
-        #expect(decoded[1].types == .fragment)
-        #expect(decoded[2].types == .fileTransfer)
-    }
-
-    @Test func handleRequestSyncHonorsTypeFilter() async throws {
-        var config = GossipSyncManager.Config()
-        config.seenCapacity = 5
-        config.fragmentCapacity = 5
-        config.fileTransferCapacity = 0
-        config.messageSyncIntervalSeconds = 0
-        config.fragmentSyncIntervalSeconds = 0
-        config.fileTransferSyncIntervalSeconds = 0
-
-        let manager = GossipSyncManager(myPeerID: myPeerID, config: config)
-        let delegate = RecordingDelegate()
-        manager.delegate = delegate
-
-        let sender = try #require(Data(hexString: "aabbccddeeff0011"))
-        let now = UInt64(Date().timeIntervalSince1970 * 1000)
-
-        let messagePacket = BitchatPacket(
-            type: MessageType.message.rawValue,
-            senderID: sender,
-            recipientID: nil,
-            timestamp: now,
-            payload: Data([0x10]),
-            signature: nil,
-            ttl: 1
-        )
-
-        let fragmentPacket = BitchatPacket(
-            type: MessageType.fragment.rawValue,
-            senderID: sender,
-            recipientID: nil,
-            timestamp: now,
-            payload: Data([0x20]),
-            signature: nil,
-            ttl: 1
-        )
-
-        manager.onPublicPacketSeen(messagePacket)
-        manager.onPublicPacketSeen(fragmentPacket)
-
-        let peer = PeerID(str: "FFFFFFFFFFFFFFFF")
-        let request = RequestSyncPacket(p: 4, m: 1, data: Data(), types: .fragment)
-        manager.handleRequestSync(from: peer, request: request)
-
-        try await sleep(0.01)
-        let sentPackets = delegate.packets
-        #expect(sentPackets.count == 1)
-        #expect(sentPackets[0].type == MessageType.fragment.rawValue)
-    }
 }
 
 private final class RecordingDelegate: GossipSyncManager.Delegate {
     var onSend: (() -> Void)?
     private(set) var lastPacket: BitchatPacket?
-    private(set) var packets: [BitchatPacket] = []
     private let lock = NSLock()
 
     func sendPacket(_ packet: BitchatPacket) {
         lock.lock()
         lastPacket = packet
-        packets.append(packet)
         lock.unlock()
         onSend?()
     }

bitchatTests/InputValidatorTests.swift

@@ -1,192 +0,0 @@
-//
-// InputValidatorTests.swift
-// bitchatTests
-//
-// This is free and unencumbered software released into the public domain.
-// For more information, see <https://unlicense.org>
-//
-
-import Testing
-import Foundation
-@testable import bitchat
-
-struct InputValidatorTests {
-
-    // MARK: - Basic Validation Tests
-
-    @Test func validStringPassesValidation() throws {
-        let result = InputValidator.validateUserString("Hello World", maxLength: 100)
-        #expect(result == "Hello World")
-    }
-
-    @Test func emptyStringReturnsNil() throws {
-        let result = InputValidator.validateUserString("", maxLength: 100)
-        #expect(result == nil)
-    }
-
-    @Test func whitespaceOnlyStringReturnsNil() throws {
-        let result = InputValidator.validateUserString("   \n\t  ", maxLength: 100)
-        #expect(result == nil)
-    }
-
-    @Test func stringExceedingMaxLengthReturnsNil() throws {
-        let longString = String(repeating: "a", count: 101)
-        let result = InputValidator.validateUserString(longString, maxLength: 100)
-        #expect(result == nil)
-    }
-
-    @Test func stringAtMaxLengthIsAccepted() throws {
-        let exactString = String(repeating: "a", count: 100)
-        let result = InputValidator.validateUserString(exactString, maxLength: 100)
-        #expect(result == exactString)
-    }
-
-    @Test func whitespaceIsTrimmed() throws {
-        let result = InputValidator.validateUserString("  Hello  ", maxLength: 100)
-        #expect(result == "Hello")
-    }
-
-    // MARK: - Control Character Tests
-
-    @Test func nullCharacterIsRejected() throws {
-        let stringWithNull = "Hello\u{0000}World"
-        let result = InputValidator.validateUserString(stringWithNull, maxLength: 100)
-        #expect(result == nil)
-    }
-
-    @Test func bellCharacterIsRejected() throws {
-        let stringWithBell = "Hello\u{0007}World"
-        let result = InputValidator.validateUserString(stringWithBell, maxLength: 100)
-        #expect(result == nil)
-    }
-
-    @Test func backspaceCharacterIsRejected() throws {
-        let stringWithBackspace = "Hello\u{0008}World"
-        let result = InputValidator.validateUserString(stringWithBackspace, maxLength: 100)
-        #expect(result == nil)
-    }
-
-    @Test func escapeCharacterIsRejected() throws {
-        let stringWithEscape = "Hello\u{001B}World"
-        let result = InputValidator.validateUserString(stringWithEscape, maxLength: 100)
-        #expect(result == nil)
-    }
-
-    @Test func deleteCharacterIsRejected() throws {
-        let stringWithDelete = "Hello\u{007F}World"
-        let result = InputValidator.validateUserString(stringWithDelete, maxLength: 100)
-        #expect(result == nil)
-    }
-
-    @Test func multipleControlCharactersAreRejected() throws {
-        let stringWithMultiple = "Hello\u{0000}\u{0007}\u{001B}World"
-        let result = InputValidator.validateUserString(stringWithMultiple, maxLength: 100)
-        #expect(result == nil)
-    }
-
-    // MARK: - Unicode and Special Character Tests
-
-    @Test func emojiIsAccepted() throws {
-        let result = InputValidator.validateUserString("Hello 👋 World", maxLength: 100)
-        #expect(result == "Hello 👋 World")
-    }
-
-    @Test func unicodeCharactersAreAccepted() throws {
-        let result = InputValidator.validateUserString("Hello 世界 مرحبا", maxLength: 100)
-        #expect(result == "Hello 世界 مرحبا")
-    }
-
-    @Test func specialCharactersAreAccepted() throws {
-        let result = InputValidator.validateUserString("Hello!@#$%^&*()_+-=[]{}|;':\",./<>?", maxLength: 100)
-        #expect(result == "Hello!@#$%^&*()_+-=[]{}|;':\",./<>?")
-    }
-
-    // MARK: - Nickname Validation Tests
-
-    @Test func validNicknameIsAccepted() throws {
-        let result = InputValidator.validateNickname("Alice")
-        #expect(result == "Alice")
-    }
-
-    @Test func nicknameWithEmojiIsAccepted() throws {
-        let result = InputValidator.validateNickname("Alice 🚀")
-        #expect(result == "Alice 🚀")
-    }
-
-    @Test func nicknameTooLongIsRejected() throws {
-        let longNickname = String(repeating: "a", count: 51)
-        let result = InputValidator.validateNickname(longNickname)
-        #expect(result == nil)
-    }
-
-    @Test func nicknameAtMaxLengthIsAccepted() throws {
-        let exactNickname = String(repeating: "a", count: 50)
-        let result = InputValidator.validateNickname(exactNickname)
-        #expect(result == exactNickname)
-    }
-
-    @Test func nicknameWithControlCharacterIsRejected() throws {
-        let result = InputValidator.validateNickname("Alice\u{0000}")
-        #expect(result == nil)
-    }
-
-    // MARK: - Timestamp Validation Tests
-
-    @Test func currentTimestampIsValid() throws {
-        let now = Date()
-        let result = InputValidator.validateTimestamp(now)
-        #expect(result == true)
-    }
-
-    @Test func timestampWithinOneHourIsValid() throws {
-        let thirtyMinutesAgo = Date().addingTimeInterval(-30 * 60)
-        let result = InputValidator.validateTimestamp(thirtyMinutesAgo)
-        #expect(result == true)
-    }
-
-    @Test func timestampTwoHoursAgoIsInvalid() throws {
-        let twoHoursAgo = Date().addingTimeInterval(-2 * 3600)
-        let result = InputValidator.validateTimestamp(twoHoursAgo)
-        #expect(result == false)
-    }
-
-    @Test func timestampTwoHoursInFutureIsInvalid() throws {
-        let twoHoursFromNow = Date().addingTimeInterval(2 * 3600)
-        let result = InputValidator.validateTimestamp(twoHoursFromNow)
-        #expect(result == false)
-    }
-
-    @Test func timestampAtOneHourBoundaryIsValid() throws {
-        // Just slightly within the one-hour window
-        let almostOneHourAgo = Date().addingTimeInterval(-3599)
-        let result = InputValidator.validateTimestamp(almostOneHourAgo)
-        #expect(result == true)
-    }
-
-    // MARK: - Edge Cases
-
-    @Test func singleCharacterStringIsAccepted() throws {
-        let result = InputValidator.validateUserString("a", maxLength: 100)
-        #expect(result == "a")
-    }
-
-    @Test func stringWithOnlyNewlinesIsRejected() throws {
-        let result = InputValidator.validateUserString("\n\n\n", maxLength: 100)
-        #expect(result == nil)
-    }
-
-    @Test func stringWithMixedWhitespaceIsTrimmed() throws {
-        let result = InputValidator.validateUserString(" \t\nHello\n\t ", maxLength: 100)
-        #expect(result == "Hello")
-    }
-
-    @Test func stringWithLeadingControlCharacterIsRejected() throws {
-        let result = InputValidator.validateUserString("\u{0000}Hello", maxLength: 100)
-        #expect(result == nil)
-    }
-
-    @Test func stringWithTrailingControlCharacterIsRejected() throws {
-        let result = InputValidator.validateUserString("Hello\u{0000}", maxLength: 100)
-        #expect(result == nil)
-    }
-}

bitchatTests/MessageDeduplicationServiceTests.swift

@@ -1,470 +0,0 @@
-//
-// MessageDeduplicationServiceTests.swift
-// bitchatTests
-//
-// Tests for MessageDeduplicationService, LRUDeduplicationCache, and ContentNormalizer.
-// This is free and unencumbered software released into the public domain.
-//
-
-import Testing
-import Foundation
-@testable import bitchat
-
-// MARK: - LRU Deduplication Cache Tests
-
-struct LRUDeduplicationCacheTests {
-
-    // MARK: - Basic Operations
-
-    @Test func emptyCache_containsReturnsFalse() {
-        let cache = LRUDeduplicationCache<Int>(capacity: 10)
-        #expect(!cache.contains("key"))
-        #expect(cache.value(for: "key") == nil)
-        #expect(cache.count == 0)
-    }
-
-    @Test func record_addsEntry() {
-        let cache = LRUDeduplicationCache<Int>(capacity: 10)
-        cache.record("key1", value: 42)
-
-        #expect(cache.contains("key1"))
-        #expect(cache.value(for: "key1") == 42)
-        #expect(cache.count == 1)
-    }
-
-    @Test func record_updatesExistingEntry() {
-        let cache = LRUDeduplicationCache<Int>(capacity: 10)
-        cache.record("key1", value: 42)
-        cache.record("key1", value: 100)
-
-        #expect(cache.value(for: "key1") == 100)
-        #expect(cache.count == 1) // Should not increase count
-    }
-
-    @Test func record_multipleEntries() {
-        let cache = LRUDeduplicationCache<String>(capacity: 10)
-        cache.record("a", value: "alpha")
-        cache.record("b", value: "beta")
-        cache.record("c", value: "gamma")
-
-        #expect(cache.count == 3)
-        #expect(cache.value(for: "a") == "alpha")
-        #expect(cache.value(for: "b") == "beta")
-        #expect(cache.value(for: "c") == "gamma")
-    }
-
-    @Test func remove_removesEntry() {
-        let cache = LRUDeduplicationCache<Int>(capacity: 10)
-        cache.record("key1", value: 42)
-        cache.record("key2", value: 100)
-
-        cache.remove("key1")
-
-        #expect(!cache.contains("key1"))
-        #expect(cache.contains("key2"))
-    }
-
-    @Test func clear_removesAllEntries() {
-        let cache = LRUDeduplicationCache<Int>(capacity: 10)
-        cache.record("a", value: 1)
-        cache.record("b", value: 2)
-        cache.record("c", value: 3)
-
-        cache.clear()
-
-        #expect(cache.count == 0)
-        #expect(!cache.contains("a"))
-        #expect(!cache.contains("b"))
-        #expect(!cache.contains("c"))
-    }
-
-    // MARK: - Eviction Tests
-
-    @Test func eviction_removesOldestWhenOverCapacity() {
-        let cache = LRUDeduplicationCache<Int>(capacity: 3)
-        cache.record("a", value: 1)
-        cache.record("b", value: 2)
-        cache.record("c", value: 3)
-        cache.record("d", value: 4) // Should evict "a"
-
-        #expect(cache.count == 3)
-        #expect(!cache.contains("a")) // Evicted
-        #expect(cache.contains("b"))
-        #expect(cache.contains("c"))
-        #expect(cache.contains("d"))
-    }
-
-    @Test func eviction_maintainsCapacity() {
-        let cache = LRUDeduplicationCache<Int>(capacity: 2)
-
-        for i in 0..<100 {
-            cache.record("key\(i)", value: i)
-        }
-
-        #expect(cache.count == 2)
-        // Most recent entries should be present
-        #expect(cache.contains("key99"))
-        #expect(cache.contains("key98"))
-        // Older entries should be evicted
-        #expect(!cache.contains("key0"))
-        #expect(!cache.contains("key50"))
-    }
-
-    @Test func eviction_capacityOfOne() {
-        let cache = LRUDeduplicationCache<Int>(capacity: 1)
-        cache.record("a", value: 1)
-        cache.record("b", value: 2)
-
-        #expect(cache.count == 1)
-        #expect(!cache.contains("a"))
-        #expect(cache.contains("b"))
-    }
-
-    @Test func eviction_skipsRemovedKeys() {
-        let cache = LRUDeduplicationCache<Int>(capacity: 3)
-        cache.record("a", value: 1)
-        cache.record("b", value: 2)
-        cache.record("c", value: 3)
-
-        // Remove "a" manually
-        cache.remove("a")
-
-        // Add new entry - should evict "b" (next oldest still in map)
-        cache.record("d", value: 4)
-
-        // Cache should have b, c, d (a was removed)
-        // Actually after eviction it should have c, d and maybe b depending on implementation
-        #expect(!cache.contains("a"))
-        #expect(cache.count <= 3)
-    }
-
-    // MARK: - Edge Cases
-
-    @Test func emptyKey_works() {
-        let cache = LRUDeduplicationCache<Int>(capacity: 10)
-        cache.record("", value: 42)
-
-        #expect(cache.contains(""))
-        #expect(cache.value(for: "") == 42)
-    }
-
-    @Test func largeCapacity_works() {
-        let cache = LRUDeduplicationCache<Int>(capacity: 10000)
-
-        for i in 0..<5000 {
-            cache.record("key\(i)", value: i)
-        }
-
-        #expect(cache.count == 5000)
-        #expect(cache.contains("key0"))
-        #expect(cache.contains("key4999"))
-    }
-}
-
-// MARK: - Content Normalizer Tests
-
-struct ContentNormalizerTests {
-
-    @Test func normalizedKey_basicContent() {
-        let key1 = ContentNormalizer.normalizedKey("Hello World")
-        let key2 = ContentNormalizer.normalizedKey("Hello World")
-        #expect(key1 == key2)
-    }
-
-    @Test func normalizedKey_caseInsensitive() {
-        let key1 = ContentNormalizer.normalizedKey("Hello World")
-        let key2 = ContentNormalizer.normalizedKey("hello world")
-        let key3 = ContentNormalizer.normalizedKey("HELLO WORLD")
-        #expect(key1 == key2)
-        #expect(key2 == key3)
-    }
-
-    @Test func normalizedKey_whitespaceCollapsed() {
-        let key1 = ContentNormalizer.normalizedKey("Hello World")
-        let key2 = ContentNormalizer.normalizedKey("Hello    World")
-        let key3 = ContentNormalizer.normalizedKey("Hello\t\nWorld")
-        #expect(key1 == key2)
-        #expect(key2 == key3)
-    }
-
-    @Test func normalizedKey_trimmed() {
-        let key1 = ContentNormalizer.normalizedKey("Hello")
-        let key2 = ContentNormalizer.normalizedKey("  Hello  ")
-        let key3 = ContentNormalizer.normalizedKey("\nHello\n")
-        #expect(key1 == key2)
-        #expect(key2 == key3)
-    }
-
-    @Test func normalizedKey_urlQueryStripped() {
-        let key1 = ContentNormalizer.normalizedKey("Check https://example.com/page")
-        let key2 = ContentNormalizer.normalizedKey("Check https://example.com/page?query=value")
-        let key3 = ContentNormalizer.normalizedKey("Check https://example.com/page#anchor")
-        #expect(key1 == key2)
-        #expect(key2 == key3)
-    }
-
-    @Test func normalizedKey_httpAndHttpsDistinct() {
-        // URL scheme is preserved
-        let key1 = ContentNormalizer.normalizedKey("http://example.com/page")
-        let key2 = ContentNormalizer.normalizedKey("https://example.com/page")
-        #expect(key1 != key2)
-    }
-
-    @Test func normalizedKey_differentContent() {
-        let key1 = ContentNormalizer.normalizedKey("Hello")
-        let key2 = ContentNormalizer.normalizedKey("Goodbye")
-        #expect(key1 != key2)
-    }
-
-    @Test func normalizedKey_returnsHashFormat() {
-        let key = ContentNormalizer.normalizedKey("Test content")
-        #expect(key.hasPrefix("h:"))
-        #expect(key.count == 18) // "h:" + 16 hex chars
-    }
-
-    @Test func normalizedKey_emptyContent() {
-        let key = ContentNormalizer.normalizedKey("")
-        #expect(key.hasPrefix("h:"))
-    }
-
-    @Test func normalizedKey_longContentTruncated() {
-        let longContent = String(repeating: "a", count: 10000)
-        let key1 = ContentNormalizer.normalizedKey(longContent)
-        let key2 = ContentNormalizer.normalizedKey(longContent + "extra")
-
-        // Both should be the same since content is truncated before hashing
-        #expect(key1 == key2)
-    }
-
-    @Test func normalizedKey_prefixLengthRespected() {
-        let content = "Short"
-        let key1 = ContentNormalizer.normalizedKey(content, prefixLength: 3)
-        let key2 = ContentNormalizer.normalizedKey(content, prefixLength: 100)
-
-        // Different prefix lengths may produce different keys
-        // "sho" vs "short"
-        #expect(key1 != key2)
-    }
-
-    @Test func normalizedKey_urlsInMiddleOfContent() {
-        let content1 = "Check out https://example.com/path?query=1 for more info"
-        let content2 = "Check out https://example.com/path for more info"
-        let key1 = ContentNormalizer.normalizedKey(content1)
-        let key2 = ContentNormalizer.normalizedKey(content2)
-        #expect(key1 == key2)
-    }
-
-    @Test func normalizedKey_multipleUrls() {
-        let content1 = "Links: https://a.com?x=1 and http://b.com#y"
-        let content2 = "Links: https://a.com and http://b.com"
-        let key1 = ContentNormalizer.normalizedKey(content1)
-        let key2 = ContentNormalizer.normalizedKey(content2)
-        #expect(key1 == key2)
-    }
-}
-
-// MARK: - Message Deduplication Service Tests
-
-struct MessageDeduplicationServiceTests {
-
-    // MARK: - Content Deduplication
-
-    @Test func recordContent_storesTimestamp() {
-        let service = MessageDeduplicationService(contentCapacity: 100, nostrEventCapacity: 100)
-        let now = Date()
-
-        service.recordContent("Hello World", timestamp: now)
-
-        let retrieved = service.contentTimestamp(for: "Hello World")
-        #expect(retrieved == now)
-    }
-
-    @Test func recordContent_updatesTimestamp() {
-        let service = MessageDeduplicationService(contentCapacity: 100, nostrEventCapacity: 100)
-        let early = Date(timeIntervalSince1970: 1000)
-        let late = Date(timeIntervalSince1970: 2000)
-
-        service.recordContent("Hello World", timestamp: early)
-        service.recordContent("Hello World", timestamp: late)
-
-        let retrieved = service.contentTimestamp(for: "Hello World")
-        #expect(retrieved == late)
-    }
-
-    @Test func contentTimestamp_nilForUnseen() {
-        let service = MessageDeduplicationService(contentCapacity: 100, nostrEventCapacity: 100)
-
-        let timestamp = service.contentTimestamp(for: "Never seen")
-        #expect(timestamp == nil)
-    }
-
-    @Test func recordContentKey_directKeyAccess() {
-        let service = MessageDeduplicationService(contentCapacity: 100, nostrEventCapacity: 100)
-        let now = Date()
-        let key = service.normalizedContentKey("Test")
-
-        service.recordContentKey(key, timestamp: now)
-
-        #expect(service.contentTimestamp(forKey: key) == now)
-    }
-
-    @Test func normalizedContentKey_consistentWithNormalizer() {
-        let service = MessageDeduplicationService(contentCapacity: 100, nostrEventCapacity: 100)
-        let content = "Hello World"
-
-        let serviceKey = service.normalizedContentKey(content)
-        let normalizerKey = ContentNormalizer.normalizedKey(content)
-
-        #expect(serviceKey == normalizerKey)
-    }
-
-    // MARK: - Nostr Event Deduplication
-
-    @Test func recordNostrEvent_marksAsProcessed() {
-        let service = MessageDeduplicationService(contentCapacity: 100, nostrEventCapacity: 100)
-
-        #expect(!service.hasProcessedNostrEvent("event123"))
-
-        service.recordNostrEvent("event123")
-
-        #expect(service.hasProcessedNostrEvent("event123"))
-    }
-
-    @Test func hasProcessedNostrEvent_falseForUnseen() {
-        let service = MessageDeduplicationService(contentCapacity: 100, nostrEventCapacity: 100)
-
-        #expect(!service.hasProcessedNostrEvent("never-seen"))
-    }
-
-    @Test func nostrEvent_multipleEvents() {
-        let service = MessageDeduplicationService(contentCapacity: 100, nostrEventCapacity: 100)
-
-        service.recordNostrEvent("event1")
-        service.recordNostrEvent("event2")
-        service.recordNostrEvent("event3")
-
-        #expect(service.hasProcessedNostrEvent("event1"))
-        #expect(service.hasProcessedNostrEvent("event2"))
-        #expect(service.hasProcessedNostrEvent("event3"))
-        #expect(!service.hasProcessedNostrEvent("event4"))
-    }
-
-    // MARK: - Nostr ACK Deduplication
-
-    @Test func recordNostrAck_marksAsProcessed() {
-        let service = MessageDeduplicationService(contentCapacity: 100, nostrEventCapacity: 100)
-        let ackKey = MessageDeduplicationService.ackKey(
-            messageId: "msg123",
-            ackType: "delivered",
-            senderPubkey: "pubkey456"
-        )
-
-        #expect(!service.hasProcessedNostrAck(ackKey))
-
-        service.recordNostrAck(ackKey)
-
-        #expect(service.hasProcessedNostrAck(ackKey))
-    }
-
-    @Test func ackKey_format() {
-        let key = MessageDeduplicationService.ackKey(
-            messageId: "msg",
-            ackType: "read",
-            senderPubkey: "pub"
-        )
-        #expect(key == "msg:read:pub")
-    }
-
-    @Test func ackKey_differentComponents() {
-        let key1 = MessageDeduplicationService.ackKey(messageId: "a", ackType: "delivered", senderPubkey: "x")
-        let key2 = MessageDeduplicationService.ackKey(messageId: "a", ackType: "read", senderPubkey: "x")
-        let key3 = MessageDeduplicationService.ackKey(messageId: "b", ackType: "delivered", senderPubkey: "x")
-
-        #expect(key1 != key2) // Different ackType
-        #expect(key1 != key3) // Different messageId
-    }
-
-    // MARK: - Clear Operations
-
-    @Test func clearAll_clearsEverything() {
-        let service = MessageDeduplicationService(contentCapacity: 100, nostrEventCapacity: 100)
-        let now = Date()
-
-        service.recordContent("Hello", timestamp: now)
-        service.recordNostrEvent("event1")
-        service.recordNostrAck("ack1")
-
-        service.clearAll()
-
-        #expect(service.contentTimestamp(for: "Hello") == nil)
-        #expect(!service.hasProcessedNostrEvent("event1"))
-        #expect(!service.hasProcessedNostrAck("ack1"))
-    }
-
-    @Test func clearNostrCaches_preservesContent() {
-        let service = MessageDeduplicationService(contentCapacity: 100, nostrEventCapacity: 100)
-        let now = Date()
-
-        service.recordContent("Hello", timestamp: now)
-        service.recordNostrEvent("event1")
-        service.recordNostrAck("ack1")
-
-        service.clearNostrCaches()
-
-        #expect(service.contentTimestamp(for: "Hello") == now) // Preserved
-        #expect(!service.hasProcessedNostrEvent("event1")) // Cleared
-        #expect(!service.hasProcessedNostrAck("ack1")) // Cleared
-    }
-
-    // MARK: - Capacity Tests
-
-    @Test func contentCache_respectsCapacity() {
-        let service = MessageDeduplicationService(contentCapacity: 3, nostrEventCapacity: 100)
-
-        service.recordContent("a", timestamp: Date())
-        service.recordContent("b", timestamp: Date())
-        service.recordContent("c", timestamp: Date())
-        service.recordContent("d", timestamp: Date())
-
-        // "a" should have been evicted
-        #expect(service.contentTimestamp(for: "a") == nil)
-        #expect(service.contentTimestamp(for: "d") != nil)
-    }
-
-    @Test func nostrEventCache_respectsCapacity() {
-        let service = MessageDeduplicationService(contentCapacity: 100, nostrEventCapacity: 3)
-
-        service.recordNostrEvent("e1")
-        service.recordNostrEvent("e2")
-        service.recordNostrEvent("e3")
-        service.recordNostrEvent("e4")
-
-        // "e1" should have been evicted
-        #expect(!service.hasProcessedNostrEvent("e1"))
-        #expect(service.hasProcessedNostrEvent("e4"))
-    }
-
-    // MARK: - Integration Tests
-
-    @Test func realWorldDeduplication_similarMessages() {
-        let service = MessageDeduplicationService(contentCapacity: 100, nostrEventCapacity: 100)
-        let now = Date()
-
-        // Record original message
-        service.recordContent("Check out https://example.com/page?ref=abc", timestamp: now)
-
-        // Same URL with different query params should match
-        let timestamp = service.contentTimestamp(for: "Check out https://example.com/page?ref=xyz")
-        #expect(timestamp == now)
-    }
-
-    @Test func realWorldDeduplication_caseVariations() {
-        let service = MessageDeduplicationService(contentCapacity: 100, nostrEventCapacity: 100)
-        let now = Date()
-
-        service.recordContent("HELLO WORLD", timestamp: now)
-
-        #expect(service.contentTimestamp(for: "hello world") == now)
-        #expect(service.contentTimestamp(for: "Hello World") == now)
-    }
-}

bitchatTests/MessageFormattingEngineTests.swift

@@ -1,223 +0,0 @@
-//
-// MessageFormattingEngineTests.swift
-// bitchatTests
-//
-// Tests for MessageFormattingEngine regex patterns and utility functions.
-// This is free and unencumbered software released into the public domain.
-//
-
-import Testing
-import Foundation
-import SwiftUI
-@testable import bitchat
-
-struct MessageFormattingEngineTests {
-
-    // MARK: - Mention Extraction Tests
-
-    @Test func extractMentions_singleMention() {
-        let content = "Hello @alice how are you?"
-        let mentions = MessageFormattingEngine.extractMentions(from: content)
-        #expect(mentions == ["alice"])
-    }
-
-    @Test func extractMentions_multipleMentions() {
-        let content = "@alice and @bob are chatting with @charlie"
-        let mentions = MessageFormattingEngine.extractMentions(from: content)
-        #expect(mentions.count == 3)
-        #expect(mentions.contains("alice"))
-        #expect(mentions.contains("bob"))
-        #expect(mentions.contains("charlie"))
-    }
-
-    @Test func extractMentions_mentionWithSuffix() {
-        let content = "Hey @alice#a1b2 check this out"
-        let mentions = MessageFormattingEngine.extractMentions(from: content)
-        #expect(mentions == ["alice#a1b2"])
-    }
-
-    @Test func extractMentions_noMentions() {
-        let content = "Just a regular message with no mentions"
-        let mentions = MessageFormattingEngine.extractMentions(from: content)
-        #expect(mentions.isEmpty)
-    }
-
-    @Test func extractMentions_unicodeNickname() {
-        let content = "Hello @日本語 and @émile"
-        let mentions = MessageFormattingEngine.extractMentions(from: content)
-        #expect(mentions.count == 2)
-        #expect(mentions.contains("日本語"))
-        #expect(mentions.contains("émile"))
-    }
-
-    @Test func extractMentions_mentionWithUnderscore() {
-        let content = "Thanks @user_name_123"
-        let mentions = MessageFormattingEngine.extractMentions(from: content)
-        #expect(mentions == ["user_name_123"])
-    }
-
-    @Test func extractMentions_emailNotCaptured() {
-        // Email addresses should not be captured as mentions
-        let content = "Contact me at test@example.com"
-        let mentions = MessageFormattingEngine.extractMentions(from: content)
-        // The regex will capture "example" after @ in email - this is expected behavior
-        // as the regex doesn't distinguish email addresses
-        #expect(mentions.count == 1)
-    }
-
-    // MARK: - Cashu Token Detection Tests
-
-    @Test func containsCashuToken_validTokenA() {
-        let content = "Here's a token: cashuAeyJwcm9vZnMiOiJIZWxsbyBXb3JsZCEgVGhpcyBpcyBhIHRlc3QgdG9rZW4i"
-        #expect(MessageFormattingEngine.containsCashuToken(content))
-    }
-
-    @Test func containsCashuToken_validTokenB() {
-        let content = "Payment: cashuBeyJwcm9vZnMiOiJIZWxsbyBXb3JsZCEgVGhpcyBpcyBhIHRlc3QgdG9rZW4i"
-        #expect(MessageFormattingEngine.containsCashuToken(content))
-    }
-
-    @Test func containsCashuToken_noToken() {
-        let content = "Just a regular message about cashews"
-        #expect(!MessageFormattingEngine.containsCashuToken(content))
-    }
-
-    @Test func containsCashuToken_tooShort() {
-        let content = "Invalid: cashuAshort"
-        #expect(!MessageFormattingEngine.containsCashuToken(content))
-    }
-
-    // MARK: - Regex Pattern Tests
-
-    @Test func hashtagPattern_standaloneHashtag() {
-        let content = "#bitcoin is great"
-        let nsContent = content as NSString
-        let range = NSRange(location: 0, length: nsContent.length)
-        let matches = MessageFormattingEngine.Patterns.hashtag.matches(in: content, options: [], range: range)
-        #expect(matches.count == 1)
-    }
-
-    @Test func hashtagPattern_multipleHashtags() {
-        let content = "#bitcoin #lightning #nostr"
-        let nsContent = content as NSString
-        let range = NSRange(location: 0, length: nsContent.length)
-        let matches = MessageFormattingEngine.Patterns.hashtag.matches(in: content, options: [], range: range)
-        #expect(matches.count == 3)
-    }
-
-    @Test func hashtagPattern_hashInMiddleOfWord() {
-        let content = "test#notahashtag"
-        let nsContent = content as NSString
-        let range = NSRange(location: 0, length: nsContent.length)
-        let matches = MessageFormattingEngine.Patterns.hashtag.matches(in: content, options: [], range: range)
-        // This will match because the regex doesn't check for word boundaries
-        #expect(matches.count == 1)
-    }
-
-    @Test func bolt11Pattern_mainnet() {
-        let content = "Pay this: lnbc10u1pjexampleinvoice0000000000000000000000000000000000000000000"
-        let nsContent = content as NSString
-        let range = NSRange(location: 0, length: nsContent.length)
-        let matches = MessageFormattingEngine.Patterns.bolt11.matches(in: content, options: [], range: range)
-        #expect(matches.count == 1)
-    }
-
-    @Test func bolt11Pattern_testnet() {
-        let content = "Test: lntb10u1pjexampleinvoice0000000000000000000000000000000000000000000"
-        let nsContent = content as NSString
-        let range = NSRange(location: 0, length: nsContent.length)
-        let matches = MessageFormattingEngine.Patterns.bolt11.matches(in: content, options: [], range: range)
-        #expect(matches.count == 1)
-    }
-
-    @Test func lnurlPattern_valid() {
-        let content = "LNURL: lnurl1dp68gurn8ghj7um9wfmxjcm99e3k7mf0v9cxj0m385ekvcenxc6r2c35xvukxefcv5mkvv34x5ekzd3ev56nyd3hxqurzepexejxxepnxscrvwfnv9nxzcn9xq6xyefhvgcxxcmyxymnserx"
-        let nsContent = content as NSString
-        let range = NSRange(location: 0, length: nsContent.length)
-        let matches = MessageFormattingEngine.Patterns.lnurl.matches(in: content, options: [], range: range)
-        #expect(matches.count == 1)
-    }
-
-    @Test func lightningSchemePattern_valid() {
-        let content = "Click: lightning:lnbc10u1example"
-        let nsContent = content as NSString
-        let range = NSRange(location: 0, length: nsContent.length)
-        let matches = MessageFormattingEngine.Patterns.lightningScheme.matches(in: content, options: [], range: range)
-        #expect(matches.count == 1)
-    }
-
-    @Test func cashuPattern_valid() {
-        let content = "Token: cashuAeyJwcm9vZnMiOlt7ImlkIjoiMDAwMDAwMDAwMDAwMDAwMCJ9XX0="
-        let nsContent = content as NSString
-        let range = NSRange(location: 0, length: nsContent.length)
-        let matches = MessageFormattingEngine.Patterns.cashu.matches(in: content, options: [], range: range)
-        #expect(matches.count == 1)
-    }
-
-    // MARK: - URL Detection Tests
-
-    @Test func linkDetector_httpURL() {
-        let content = "Check out http://example.com"
-        let nsContent = content as NSString
-        let range = NSRange(location: 0, length: nsContent.length)
-        let matches = MessageFormattingEngine.Patterns.linkDetector?.matches(in: content, options: [], range: range) ?? []
-        #expect(matches.count == 1)
-    }
-
-    @Test func linkDetector_httpsURL() {
-        let content = "Visit https://example.com/path?query=value"
-        let nsContent = content as NSString
-        let range = NSRange(location: 0, length: nsContent.length)
-        let matches = MessageFormattingEngine.Patterns.linkDetector?.matches(in: content, options: [], range: range) ?? []
-        #expect(matches.count == 1)
-    }
-
-    @Test func linkDetector_multipleURLs() {
-        let content = "See https://a.com and http://b.com"
-        let nsContent = content as NSString
-        let range = NSRange(location: 0, length: nsContent.length)
-        let matches = MessageFormattingEngine.Patterns.linkDetector?.matches(in: content, options: [], range: range) ?? []
-        #expect(matches.count == 2)
-    }
-
-    // MARK: - String Extension Tests
-
-    @Test func splitSuffix_withSuffix() {
-        let name = "alice#a1b2"
-        let (base, suffix) = name.splitSuffix()
-        #expect(base == "alice")
-        #expect(suffix == "#a1b2")
-    }
-
-    @Test func splitSuffix_withoutSuffix() {
-        let name = "alice"
-        let (base, suffix) = name.splitSuffix()
-        #expect(base == "alice")
-        #expect(suffix == "")
-    }
-
-    @Test func splitSuffix_withAtPrefix() {
-        let name = "@alice#a1b2"
-        let (base, suffix) = name.splitSuffix()
-        #expect(base == "alice")
-        #expect(suffix == "#a1b2")
-    }
-
-    @Test func hasVeryLongToken_noLongToken() {
-        let content = "Short words only here"
-        #expect(!content.hasVeryLongToken(threshold: 50))
-    }
-
-    @Test func hasVeryLongToken_withLongToken() {
-        let longToken = String(repeating: "a", count: 100)
-        let content = "Here is a \(longToken) token"
-        #expect(content.hasVeryLongToken(threshold: 50))
-    }
-
-    @Test func hasVeryLongToken_exactThreshold() {
-        let exactToken = String(repeating: "a", count: 50)
-        let content = "Token: \(exactToken)"
-        // Exactly at threshold DOES trigger (uses >= comparison)
-        #expect(content.hasVeryLongToken(threshold: 50))
-    }
-}

bitchatTests/MimeTypeTests.swift

@@ -1,90 +0,0 @@
-//
-// MimeTypeTests.swift
-// bitchatTests
-//
-// This is free and unencumbered software released into the public domain.
-// For more information, see <https://unlicense.org>
-//
-
-import Testing
-import Foundation
-@testable import bitchat
-
-// MARK: - MimeType Mapping and Signature Tests
-
-struct MimeTypeTests {
-
-    // MARK: MIME → Enum Parsing + Default Extension
-    @Test(arguments: [
-        ("image/jpeg", MimeType.jpeg, "jpg"),
-        ("image/jpg", MimeType.jpeg, "jpg"),
-        ("image/png", MimeType.png, "png"),
-        ("image/gif", MimeType.gif, "gif"),
-        ("image/webp", MimeType.webp, "webp"),
-        ("audio/mp4", MimeType.mp4Audio, "m4a"),
-        ("audio/m4a", MimeType.m4a, "m4a"),
-        ("audio/aac", MimeType.aac, "m4a"),
-        ("audio/mpeg", MimeType.mpeg, "mp3"),
-        ("audio/mp3", MimeType.mp3, "mp3"),
-        ("audio/wav", MimeType.wav, "wav"),
-        ("audio/x-wav", MimeType.xWav, "wav"),
-        ("audio/ogg", MimeType.ogg, "ogg"),
-        ("application/pdf", MimeType.pdf, "pdf"),
-        ("application/octet-stream", MimeType.octetStream, "bin")
-    ])
-    func mimeTypeParsingAndExtensions(
-        mimeString: String,
-        expectedType: MimeType,
-        expectedExt: String
-    ) throws {
-        guard let mime = MimeType(mimeString) else {
-            Issue.record("Failed to parse \(mimeString)")
-            return
-        }
-
-        #expect(mime == expectedType, "Expected \(expectedType) for \(mimeString)")
-        #expect(mime.mimeString == expectedType.mimeString)
-        #expect(mime.defaultExtension == expectedExt)
-        #expect(mime.isAllowed)
-    }
-
-    // MARK: - File Signature Validation
-    @Test(arguments: [
-        // === Image types ===
-        (MimeType.jpeg, [0xFF, 0xD8, 0xFF]),
-        (MimeType.png,  [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A]),
-        (MimeType.gif,  [0x47, 0x49, 0x46, 0x38, 0x39, 0x61]), // "GIF89a"
-        (MimeType.webp, [0x52, 0x49, 0x46, 0x46, 0x00, 0x00, 0x00, 0x00,
-                         0x57, 0x45, 0x42, 0x50]),             // "RIFF....WEBP"
-
-        // === Audio types ===
-        (MimeType.mp3,  [0x49, 0x44, 0x33]),                   // "ID3"
-        (MimeType.wav,  [0x52, 0x49, 0x46, 0x46, 0x00, 0x00, 0x00, 0x00,
-                         0x57, 0x41, 0x56, 0x45]),             // "RIFF....WAVE"
-        (MimeType.ogg,  [0x4F, 0x67, 0x67, 0x53]),             // "OggS"
-
-        // === Application types ===
-        (MimeType.pdf,  [0x25, 0x50, 0x44, 0x46])              // "%PDF"
-    ])
-    func validSignatures(mime: MimeType, bytes: [UInt8]) throws {
-        let data = Data(bytes)
-        #expect(mime.matches(data: data),
-                "Expected \(mime.mimeString) to match its signature")
-    }
-
-    // MARK: - Negative Tests
-    @Test func invalidDataDoesNotMatch() throws {
-        let badData = Data(repeating: 0x00, count: 16)
-        for mime in MimeType.allCases where mime != .octetStream {
-            #expect(!mime.matches(data: badData),
-                    "Unexpectedly matched \(mime.mimeString) with zeroed data")
-        }
-    }
-
-    // MARK: - Octet-stream (generic binary)
-    @Test func octetStreamAlwaysMatches() throws {
-        let randomData = Data([0x00, 0x11, 0x22, 0x33])
-        #expect(MimeType.octetStream.matches(data: randomData),
-                "application/octet-stream should always be considered valid")
-    }
-}

bitchatTests/Mocks/MockBLEService.swift

@@ -203,7 +203,10 @@ final class MockBLEService: NSObject {
                let target = bus.service(for: recipientPeerID) {
                 target.simulateIncomingPacket(packet)
             } else {
-                // Not directly connected: deliver to neighbors for relay
+                // Not directly connected: deliver to neighbors for relay; also deliver directly if target is known
+                if let target = bus.service(for: recipientPeerID) {
+                    target.simulateIncomingPacket(packet)
+                }
                 for neighbor in neighbors() where neighbor.peerID != recipientPeerID {
                     neighbor.simulateIncomingPacket(packet)
                 }

bitchatTests/Mocks/MockIdentityManager.swift

@@ -11,8 +11,6 @@ import Foundation
 
 final class MockIdentityManager: SecureIdentityStateManagerProtocol {
     private let keychain: KeychainManagerProtocol
-    private var blockedFingerprints: Set<String> = []
-    private var blockedNostrPubkeys: Set<String> = []
     
     init(_ keychain: KeychainManagerProtocol) {
         self.keychain = keychain
@@ -47,31 +45,19 @@ final class MockIdentityManager: SecureIdentityStateManagerProtocol {
     }
     
     func isBlocked(fingerprint: String) -> Bool {
-        blockedFingerprints.contains(fingerprint)
+        false
     }
     
-    func setBlocked(_ fingerprint: String, isBlocked: Bool) {
-        if isBlocked {
-            blockedFingerprints.insert(fingerprint)
-        } else {
-            blockedFingerprints.remove(fingerprint)
-        }
-    }
+    func setBlocked(_ fingerprint: String, isBlocked: Bool) {}
     
     func isNostrBlocked(pubkeyHexLowercased: String) -> Bool {
-        blockedNostrPubkeys.contains(pubkeyHexLowercased)
+        true
     }
     
-    func setNostrBlocked(_ pubkeyHexLowercased: String, isBlocked: Bool) {
-        if isBlocked {
-            blockedNostrPubkeys.insert(pubkeyHexLowercased)
-        } else {
-            blockedNostrPubkeys.remove(pubkeyHexLowercased)
-        }
-    }
+    func setNostrBlocked(_ pubkeyHexLowercased: String, isBlocked: Bool) {}
     
     func getBlockedNostrPubkeys() -> Set<String> {
-        blockedNostrPubkeys
+        Set()
     }
     
     func registerEphemeralSession(peerID: PeerID, handshakeState: HandshakeState) {}

bitchatTests/Mocks/MockTransport.swift

@@ -1,228 +0,0 @@
-//
-// MockTransport.swift
-// bitchatTests
-//
-// Mock Transport implementation for unit testing ChatViewModel.
-// This is free and unencumbered software released into the public domain.
-//
-
-import Foundation
-import Combine
-import CoreBluetooth
-@testable import bitchat
-
-/// Mock Transport implementation for testing ChatViewModel in isolation.
-/// Records all method calls and allows test code to verify interactions.
-final class MockTransport: Transport {
-
-    // MARK: - Protocol Properties
-
-    weak var delegate: BitchatDelegate?
-    weak var peerEventsDelegate: TransportPeerEventsDelegate?
-
-    var myPeerID: PeerID = PeerID(str: "TESTPEER")
-    var myNickname: String = "TestUser"
-
-    private let peerSnapshotSubject = CurrentValueSubject<[TransportPeerSnapshot], Never>([])
-    var peerSnapshotPublisher: AnyPublisher<[TransportPeerSnapshot], Never> {
-        peerSnapshotSubject.eraseToAnyPublisher()
-    }
-
-    // MARK: - Recording Properties (for test assertions)
-
-    private(set) var sentMessages: [(content: String, mentions: [String], messageID: String?, timestamp: Date?)] = []
-    private(set) var sentPrivateMessages: [(content: String, peerID: PeerID, recipientNickname: String, messageID: String)] = []
-    private(set) var sentReadReceipts: [(receipt: ReadReceipt, peerID: PeerID)] = []
-    private(set) var sentDeliveryAcks: [(messageID: String, peerID: PeerID)] = []
-    private(set) var sentFavoriteNotifications: [(peerID: PeerID, isFavorite: Bool)] = []
-    private(set) var sentVerifyChallenges: [(peerID: PeerID, noiseKeyHex: String, nonceA: Data)] = []
-    private(set) var sentVerifyResponses: [(peerID: PeerID, noiseKeyHex: String, nonceA: Data)] = []
-    private(set) var startServicesCallCount = 0
-    private(set) var stopServicesCallCount = 0
-    private(set) var emergencyDisconnectCallCount = 0
-    private(set) var broadcastAnnounceCallCount = 0
-    private(set) var triggeredHandshakes: [PeerID] = []
-
-    // MARK: - Configurable Mock State
-
-    var connectedPeers: Set<PeerID> = []
-    var reachablePeers: Set<PeerID> = []
-    var peerNicknames: [PeerID: String] = [:]
-    var peerFingerprints: [PeerID: String] = [:]
-    var peerNoiseStates: [PeerID: LazyHandshakeState] = [:]
-    private let mockKeychain = MockKeychain()
-
-    // MARK: - Transport Protocol Implementation
-
-    func currentPeerSnapshots() -> [TransportPeerSnapshot] {
-        peerSnapshotSubject.value
-    }
-
-    func setNickname(_ nickname: String) {
-        myNickname = nickname
-    }
-
-    func startServices() {
-        startServicesCallCount += 1
-    }
-
-    func stopServices() {
-        stopServicesCallCount += 1
-    }
-
-    func emergencyDisconnectAll() {
-        emergencyDisconnectCallCount += 1
-        connectedPeers.removeAll()
-        reachablePeers.removeAll()
-    }
-
-    func isPeerConnected(_ peerID: PeerID) -> Bool {
-        connectedPeers.contains(peerID)
-    }
-
-    func isPeerReachable(_ peerID: PeerID) -> Bool {
-        reachablePeers.contains(peerID) || connectedPeers.contains(peerID)
-    }
-
-    func peerNickname(peerID: PeerID) -> String? {
-        peerNicknames[peerID]
-    }
-
-    func getPeerNicknames() -> [PeerID: String] {
-        peerNicknames
-    }
-
-    func getFingerprint(for peerID: PeerID) -> String? {
-        peerFingerprints[peerID]
-    }
-
-    func getNoiseSessionState(for peerID: PeerID) -> LazyHandshakeState {
-        peerNoiseStates[peerID] ?? .none
-    }
-
-    func triggerHandshake(with peerID: PeerID) {
-        triggeredHandshakes.append(peerID)
-    }
-
-    func getNoiseService() -> NoiseEncryptionService {
-        NoiseEncryptionService(keychain: mockKeychain)
-    }
-
-    // MARK: - Messaging
-
-    func sendMessage(_ content: String, mentions: [String]) {
-        sentMessages.append((content, mentions, nil, nil))
-    }
-
-    func sendMessage(_ content: String, mentions: [String], messageID: String, timestamp: Date) {
-        sentMessages.append((content, mentions, messageID, timestamp))
-    }
-
-    func sendPrivateMessage(_ content: String, to peerID: PeerID, recipientNickname: String, messageID: String) {
-        sentPrivateMessages.append((content, peerID, recipientNickname, messageID))
-    }
-
-    func sendReadReceipt(_ receipt: ReadReceipt, to peerID: PeerID) {
-        sentReadReceipts.append((receipt, peerID))
-    }
-
-    func sendFavoriteNotification(to peerID: PeerID, isFavorite: Bool) {
-        sentFavoriteNotifications.append((peerID, isFavorite))
-    }
-
-    func sendBroadcastAnnounce() {
-        broadcastAnnounceCallCount += 1
-    }
-
-    func sendDeliveryAck(for messageID: String, to peerID: PeerID) {
-        sentDeliveryAcks.append((messageID, peerID))
-    }
-
-    func sendFileBroadcast(_ packet: BitchatFilePacket, transferId: String) {
-        // Not tracked for current tests
-    }
-
-    func sendFilePrivate(_ packet: BitchatFilePacket, to peerID: PeerID, transferId: String) {
-        // Not tracked for current tests
-    }
-
-    func cancelTransfer(_ transferId: String) {
-        // Not tracked for current tests
-    }
-
-    func sendVerifyChallenge(to peerID: PeerID, noiseKeyHex: String, nonceA: Data) {
-        sentVerifyChallenges.append((peerID, noiseKeyHex, nonceA))
-    }
-
-    func sendVerifyResponse(to peerID: PeerID, noiseKeyHex: String, nonceA: Data) {
-        sentVerifyResponses.append((peerID, noiseKeyHex, nonceA))
-    }
-
-    // MARK: - Test Helpers
-
-    /// Clears all recorded method calls for fresh assertions
-    func resetRecordings() {
-        sentMessages.removeAll()
-        sentPrivateMessages.removeAll()
-        sentReadReceipts.removeAll()
-        sentDeliveryAcks.removeAll()
-        sentFavoriteNotifications.removeAll()
-        sentVerifyChallenges.removeAll()
-        sentVerifyResponses.removeAll()
-        startServicesCallCount = 0
-        stopServicesCallCount = 0
-        emergencyDisconnectCallCount = 0
-        broadcastAnnounceCallCount = 0
-        triggeredHandshakes.removeAll()
-    }
-
-    /// Simulates a peer connecting
-    func simulateConnect(_ peerID: PeerID, nickname: String? = nil) {
-        connectedPeers.insert(peerID)
-        if let nickname = nickname {
-            peerNicknames[peerID] = nickname
-        }
-        delegate?.didConnectToPeer(peerID)
-        delegate?.didUpdatePeerList(Array(connectedPeers))
-    }
-
-    /// Simulates a peer disconnecting
-    func simulateDisconnect(_ peerID: PeerID) {
-        connectedPeers.remove(peerID)
-        peerNicknames.removeValue(forKey: peerID)
-        delegate?.didDisconnectFromPeer(peerID)
-        delegate?.didUpdatePeerList(Array(connectedPeers))
-    }
-
-    /// Simulates receiving a message
-    func simulateIncomingMessage(_ message: BitchatMessage) {
-        delegate?.didReceiveMessage(message)
-    }
-
-    /// Simulates receiving a public message
-    func simulateIncomingPublicMessage(
-        from peerID: PeerID,
-        nickname: String,
-        content: String,
-        timestamp: Date = Date(),
-        messageID: String? = nil
-    ) {
-        delegate?.didReceivePublicMessage(
-            from: peerID,
-            nickname: nickname,
-            content: content,
-            timestamp: timestamp,
-            messageID: messageID
-        )
-    }
-
-    /// Simulates Bluetooth state change
-    func simulateBluetoothStateChange(_ state: CBManagerState) {
-        delegate?.didUpdateBluetoothState(state)
-    }
-
-    /// Updates the peer snapshot publisher
-    func updatePeerSnapshots(_ snapshots: [TransportPeerSnapshot]) {
-        peerSnapshotSubject.send(snapshots)
-    }
-}

bitchatTests/Noise/NoiseProtocolTests.swift

@@ -6,53 +6,11 @@
 // For more information, see <https://unlicense.org>
 //
 
+import Testing
 import CryptoKit
 import Foundation
-import Testing
-
 @testable import bitchat
 
-// MARK: - Test Vector Support
-
-struct NoiseTestVector: Codable {
-    let protocol_name: String
-    let init_prologue: String
-    let init_static: String
-    let init_ephemeral: String
-    let init_psks: [String]?
-    let resp_prologue: String
-    let resp_static: String
-    let resp_ephemeral: String
-    let resp_psks: [String]?
-    let handshake_hash: String?
-    let messages: [TestMessage]
-    
-    struct TestMessage: Codable {
-        let payload: String
-        let ciphertext: String
-    }
-}
-
-extension Data {
-    init?(hex: String) {
-        let cleaned = hex.replacingOccurrences(of: " ", with: "")
-        guard cleaned.count % 2 == 0 else { return nil }
-        var data = Data(capacity: cleaned.count / 2)
-        var index = cleaned.startIndex
-        while index < cleaned.endIndex {
-            let nextIndex = cleaned.index(index, offsetBy: 2)
-            guard let byte = UInt8(cleaned[index..<nextIndex], radix: 16) else { return nil }
-            data.append(byte)
-            index = nextIndex
-        }
-        self = data
-    }
-    
-    func hexString() -> String {
-        map { String(format: "%02x", $0) }.joined()
-    }
-}
-
 struct NoiseProtocolTests {
     
     private let aliceKey = Curve25519.KeyAgreement.PrivateKey()
@@ -103,7 +61,7 @@ struct NoiseProtocolTests {
         
         // Bob processes message 3 and completes handshake
         let finalMessage = try bobSession.processHandshakeMessage(message3!)
-        #expect(finalMessage == nil)  // No more messages needed
+        #expect(finalMessage == nil) // No more messages needed
         #expect(bobSession.getState() == .established)
         
         // Verify both sessions are established
@@ -111,12 +69,8 @@ struct NoiseProtocolTests {
         #expect(bobSession.isEstablished())
         
         // Verify they have each other's static keys
-        #expect(
-            aliceSession.getRemoteStaticPublicKey()?.rawRepresentation
-            == bobKey.publicKey.rawRepresentation)
-        #expect(
-            bobSession.getRemoteStaticPublicKey()?.rawRepresentation
-            == aliceKey.publicKey.rawRepresentation)
+        #expect(aliceSession.getRemoteStaticPublicKey()?.rawRepresentation == bobKey.publicKey.rawRepresentation)
+        #expect(bobSession.getRemoteStaticPublicKey()?.rawRepresentation == aliceKey.publicKey.rawRepresentation)
     }
     
     @Test func handshakeStateValidation() throws {
@@ -144,7 +98,7 @@ struct NoiseProtocolTests {
         // Alice encrypts
         let ciphertext = try aliceSession.encrypt(plaintext)
         #expect(ciphertext != plaintext)
-        #expect(ciphertext.count > plaintext.count)  // Should have overhead
+        #expect(ciphertext.count > plaintext.count) // Should have overhead
         
         // Bob decrypts
         let decrypted = try bobSession.decrypt(ciphertext)
@@ -196,16 +150,16 @@ struct NoiseProtocolTests {
     
     @Test func sessionManagerBasicOperations() throws {
         let manager = NoiseSessionManager(localStaticKey: aliceKey, keychain: mockKeychain)
-        
+
         #expect(manager.getSession(for: alicePeerID) == nil)
-        
+
         _ = try manager.initiateHandshake(with: alicePeerID)
         #expect(manager.getSession(for: alicePeerID) != nil)
-        
+
         // Get session
         let retrieved = manager.getSession(for: alicePeerID)
         #expect(retrieved != nil)
-        
+
         // Remove session
         manager.removeSession(for: alicePeerID)
         #expect(manager.getSession(for: alicePeerID) == nil)
@@ -236,13 +190,11 @@ struct NoiseProtocolTests {
         #expect(message2 != nil)
         
         // Continue handshake
-        let message3 = try aliceManager.handleIncomingHandshake(
-            from: alicePeerID, message: message2!)
+        let message3 = try aliceManager.handleIncomingHandshake(from: alicePeerID, message: message2!)
         #expect(message3 != nil)
         
         // Complete handshake
-        let finalMessage = try bobManager.handleIncomingHandshake(
-            from: bobPeerID, message: message3!)
+        let finalMessage = try bobManager.handleIncomingHandshake(from: bobPeerID, message: message3!)
         #expect(finalMessage == nil)
         
         // Both should have established sessions
@@ -306,19 +258,11 @@ struct NoiseProtocolTests {
     
     @Test func sessionIsolation() throws {
         // Create two separate session pairs
-        let aliceSession1 = NoiseSession(
-            peerID: PeerID(str: "peer1"), role: .initiator, keychain: mockKeychain,
-            localStaticKey: aliceKey)
-        let bobSession1 = NoiseSession(
-            peerID: PeerID(str: "alice1"), role: .responder, keychain: mockKeychain,
-            localStaticKey: bobKey)
+        let aliceSession1 = NoiseSession(peerID: PeerID(str: "peer1"), role: .initiator, keychain: mockKeychain, localStaticKey: aliceKey)
+        let bobSession1 = NoiseSession(peerID: PeerID(str: "alice1"), role: .responder, keychain: mockKeychain, localStaticKey: bobKey)
         
-        let aliceSession2 = NoiseSession(
-            peerID: PeerID(str: "peer2"), role: .initiator, keychain: mockKeychain,
-            localStaticKey: aliceKey)
-        let bobSession2 = NoiseSession(
-            peerID: PeerID(str: "alice2"), role: .responder, keychain: mockKeychain,
-            localStaticKey: bobKey)
+        let aliceSession2 = NoiseSession(peerID: PeerID(str: "peer2"), role: .initiator, keychain: mockKeychain, localStaticKey: aliceKey)
+        let bobSession2 = NoiseSession(peerID: PeerID(str: "alice2"), role: .responder, keychain: mockKeychain, localStaticKey: bobKey)
         
         // Establish both pairs
         try performHandshake(initiator: aliceSession1, responder: bobSession1)
@@ -361,20 +305,17 @@ struct NoiseProtocolTests {
         _ = try aliceManager.decrypt(message2, from: alicePeerID)
         
         // Simulate Bob restart by creating new manager with same key
-        let bobManagerRestarted = NoiseSessionManager(
-            localStaticKey: bobKey, keychain: mockKeychain)
+        let bobManagerRestarted = NoiseSessionManager(localStaticKey: bobKey, keychain: mockKeychain)
         
         // Bob initiates new handshake after restart
         let newHandshake1 = try bobManagerRestarted.initiateHandshake(with: bobPeerID)
         
         // Alice should accept the new handshake (clearing old session)
-        let newHandshake2 = try aliceManager.handleIncomingHandshake(
-            from: alicePeerID, message: newHandshake1)
+        let newHandshake2 = try aliceManager.handleIncomingHandshake(from: alicePeerID, message: newHandshake1)
         #expect(newHandshake2 != nil)
         
         // Complete the new handshake
-        let newHandshake3 = try bobManagerRestarted.handleIncomingHandshake(
-            from: bobPeerID, message: newHandshake2!)
+        let newHandshake3 = try bobManagerRestarted.handleIncomingHandshake(from: bobPeerID, message: newHandshake2!)
         #expect(newHandshake3 != nil)
         _ = try aliceManager.handleIncomingHandshake(from: alicePeerID, message: newHandshake3!)
         
@@ -387,10 +328,8 @@ struct NoiseProtocolTests {
     
     @Test func nonceDesynchronizationRecovery() throws {
         // Create two sessions
-        let aliceSession = NoiseSession(
-            peerID: alicePeerID, role: .initiator, keychain: mockKeychain, localStaticKey: aliceKey)
-        let bobSession = NoiseSession(
-            peerID: bobPeerID, role: .responder, keychain: mockKeychain, localStaticKey: bobKey)
+        let aliceSession = NoiseSession(peerID: alicePeerID, role: .initiator, keychain: mockKeychain, localStaticKey: aliceKey)
+        let bobSession = NoiseSession(peerID: bobPeerID, role: .responder, keychain: mockKeychain, localStaticKey: bobKey)
         
         // Establish sessions
         try performHandshake(initiator: aliceSession, responder: bobSession)
@@ -422,8 +361,7 @@ struct NoiseProtocolTests {
         
         let messageCount = 100
         
-        try await confirmation("All messages encrypted and decrypted", expectedCount: messageCount)
-        { completion in
+        try await confirmation("All messages encrypted and decrypted", expectedCount: messageCount) { completion in
             var encryptedMessages: [Int: Data] = [:]
             // Encrypt messages sequentially to avoid nonce races in manager
             for i in 0..<messageCount {
@@ -474,7 +412,7 @@ struct NoiseProtocolTests {
         
         // Create a corrupted message
         var encrypted = try aliceManager.encrypt("Test".data(using: .utf8)!, for: alicePeerID)
-        encrypted[10] ^= 0xFF  // Corrupt the data
+        encrypted[10] ^= 0xFF // Corrupt the data
         
         // Decryption should fail
         if #available(macOS 14.4, iOS 17.4, *) {
@@ -516,13 +454,11 @@ struct NoiseProtocolTests {
         let newHandshake1 = try aliceManager.initiateHandshake(with: alicePeerID)
         
         // Bob should accept the new handshake even though he has a valid session
-        let newHandshake2 = try bobManager.handleIncomingHandshake(
-            from: bobPeerID, message: newHandshake1)
+        let newHandshake2 = try bobManager.handleIncomingHandshake(from: bobPeerID, message: newHandshake1)
         #expect(newHandshake2 != nil, "Bob should accept handshake despite having valid session")
         
         // Complete the handshake
-        let newHandshake3 = try aliceManager.handleIncomingHandshake(
-            from: alicePeerID, message: newHandshake2!)
+        let newHandshake3 = try aliceManager.handleIncomingHandshake(from: alicePeerID, message: newHandshake2!)
         #expect(newHandshake3 != nil)
         _ = try bobManager.handleIncomingHandshake(from: bobPeerID, message: newHandshake3!)
         
@@ -553,8 +489,7 @@ struct NoiseProtocolTests {
         }
         
         // With nonce carried in packet, decryption should not throw here
-        let desyncMessage = try aliceManager.encrypt(
-            "This now succeeds".data(using: .utf8)!, for: alicePeerID)
+        let desyncMessage = try aliceManager.encrypt("This now succeeds".data(using: .utf8)!, for: alicePeerID)
         #expect(throws: Never.self) {
             try bobManager.decrypt(desyncMessage, from: bobPeerID)
         }
@@ -564,13 +499,11 @@ struct NoiseProtocolTests {
         let rehandshake1 = try bobManager.initiateHandshake(with: bobPeerID)
         
         // Alice should accept despite having a "valid" (but desynced) session
-        let rehandshake2 = try aliceManager.handleIncomingHandshake(
-            from: alicePeerID, message: rehandshake1)
+        let rehandshake2 = try aliceManager.handleIncomingHandshake(from: alicePeerID, message: rehandshake1)
         #expect(rehandshake2 != nil, "Alice should accept handshake to fix desync")
         
         // Complete handshake
-        let rehandshake3 = try bobManager.handleIncomingHandshake(
-            from: bobPeerID, message: rehandshake2!)
+        let rehandshake3 = try bobManager.handleIncomingHandshake(from: bobPeerID, message: rehandshake2!)
         #expect(rehandshake3 != nil)
         _ = try aliceManager.handleIncomingHandshake(from: alicePeerID, message: rehandshake3!)
         
@@ -581,18 +514,6 @@ struct NoiseProtocolTests {
         #expect(decryptedResync == testResynced)
     }
     
-    // MARK: - Test Vector Tests
-    
-    @Test func noiseTestVectors() throws {
-        // Load test vectors from bundle
-        let testVectors = try loadTestVectors()
-        
-        for (index, testVector) in testVectors.enumerated() {
-            print("Running test vector \(index + 1): \(testVector.protocol_name)")
-            try runTestVector(testVector)
-        }
-    }
-    
     // MARK: - Helper Methods
     
     private func performHandshake(initiator: NoiseSession, responder: NoiseSession) throws {
@@ -602,191 +523,10 @@ struct NoiseProtocolTests {
         _ = try responder.processHandshakeMessage(msg3)
     }
     
-    private func establishManagerSessions(
-        aliceManager: NoiseSessionManager, bobManager: NoiseSessionManager
-    ) throws {
+    private func establishManagerSessions(aliceManager: NoiseSessionManager, bobManager: NoiseSessionManager) throws {
         let msg1 = try aliceManager.initiateHandshake(with: alicePeerID)
         let msg2 = try bobManager.handleIncomingHandshake(from: bobPeerID, message: msg1)!
         let msg3 = try aliceManager.handleIncomingHandshake(from: alicePeerID, message: msg2)!
         _ = try bobManager.handleIncomingHandshake(from: bobPeerID, message: msg3)
     }
-    
-    private func loadTestVectors() throws -> [NoiseTestVector] {
-        // Try to load from test bundle
-        let testBundle = Bundle(for: MockKeychain.self)
-        guard let url = testBundle.url(forResource: "NoiseTestVectors", withExtension: "json")
-        else {
-            throw NSError(
-                domain: "NoiseTests", code: 1,
-                userInfo: [
-                    NSLocalizedDescriptionKey: "Could not find NoiseTestVectors.json in test bundle"
-                ])
-        }
-        
-        let data = try Data(contentsOf: url)
-        return try JSONDecoder().decode([NoiseTestVector].self, from: data)
-    }
-    
-    private func runTestVector(_ testVector: NoiseTestVector) throws {
-        // Parse test inputs
-        guard let initStatic = Data(hex: testVector.init_static),
-              let initEphemeral = Data(hex: testVector.init_ephemeral),
-              let respStatic = Data(hex: testVector.resp_static),
-              let respEphemeral = Data(hex: testVector.resp_ephemeral),
-              let prologue = Data(hex: testVector.init_prologue)
-        else {
-            throw NSError(
-                domain: "NoiseTests", code: 2,
-                userInfo: [NSLocalizedDescriptionKey: "Failed to parse test vector hex strings"])
-        }
-        
-        let expectedHash = testVector.handshake_hash.flatMap { Data(hex: $0) }
-        
-        // Create keys
-        guard
-            let initStaticKey = try? Curve25519.KeyAgreement.PrivateKey(
-                rawRepresentation: initStatic),
-            let initEphemeralKey = try? Curve25519.KeyAgreement.PrivateKey(
-                rawRepresentation: initEphemeral),
-            let respStaticKey = try? Curve25519.KeyAgreement.PrivateKey(
-                rawRepresentation: respStatic),
-            let respEphemeralKey = try? Curve25519.KeyAgreement.PrivateKey(
-                rawRepresentation: respEphemeral)
-        else {
-            throw NSError(
-                domain: "NoiseTests", code: 3,
-                userInfo: [NSLocalizedDescriptionKey: "Failed to create keys from test vectors"])
-        }
-        
-        let keychain = MockKeychain()
-        
-        // Create handshake states
-        let initiatorHandshake = NoiseHandshakeState(
-            role: .initiator,
-            pattern: .XX,
-            keychain: keychain,
-            localStaticKey: initStaticKey,
-            prologue: prologue,
-            predeterminedEphemeralKey: initEphemeralKey
-        )
-        
-        let responderHandshake = NoiseHandshakeState(
-            role: .responder,
-            pattern: .XX,
-            keychain: keychain,
-            localStaticKey: respStaticKey,
-            prologue: prologue,
-            predeterminedEphemeralKey: respEphemeralKey
-        )
-        
-        // For XX pattern, we have 3 handshake messages, then transport messages
-        // The test vector messages are ordered as: [msg1, msg2, msg3, transport1, transport2, ...]
-        
-        guard testVector.messages.count >= 3 else {
-            throw NSError(
-                domain: "NoiseTests", code: 5,
-                userInfo: [NSLocalizedDescriptionKey: "Test vector must have at least 3 messages for XX pattern"])
-        }
-        
-        // Message 1: Initiator -> Responder (e)
-        guard let payload1 = Data(hex: testVector.messages[0].payload),
-              let expectedCiphertext1 = Data(hex: testVector.messages[0].ciphertext) else {
-            throw NSError(
-                domain: "NoiseTests", code: 4,
-                userInfo: [NSLocalizedDescriptionKey: "Message 1: Failed to parse hex"])
-        }
-        
-        let msg1 = try initiatorHandshake.writeMessage(payload: payload1)
-        #expect(!msg1.isEmpty, "Message 1 should not be empty")
-        #expect(msg1 == expectedCiphertext1, "Message 1 ciphertext should match expected value. Got: \(msg1.hexString()), Expected: \(expectedCiphertext1.hexString())")
-        
-        let decrypted1 = try responderHandshake.readMessage(msg1)
-        #expect(decrypted1 == payload1, "Message 1: Decrypted payload should match original")
-        
-        // Message 2: Responder -> Initiator (e, ee, s, es)
-        guard let payload2 = Data(hex: testVector.messages[1].payload),
-              let expectedCiphertext2 = Data(hex: testVector.messages[1].ciphertext) else {
-            throw NSError(
-                domain: "NoiseTests", code: 4,
-                userInfo: [NSLocalizedDescriptionKey: "Message 2: Failed to parse hex"])
-        }
-        
-        let msg2 = try responderHandshake.writeMessage(payload: payload2)
-        #expect(!msg2.isEmpty, "Message 2 should not be empty")
-        #expect(msg2 == expectedCiphertext2, "Message 2 ciphertext should match expected value. Got: \(msg2.hexString()), Expected: \(expectedCiphertext2.hexString())")
-        
-        let decrypted2 = try initiatorHandshake.readMessage(msg2)
-        #expect(decrypted2 == payload2, "Message 2: Decrypted payload should match original")
-        
-        // Message 3: Initiator -> Responder (s, se)
-        guard let payload3 = Data(hex: testVector.messages[2].payload),
-              let expectedCiphertext3 = Data(hex: testVector.messages[2].ciphertext) else {
-            throw NSError(
-                domain: "NoiseTests", code: 4,
-                userInfo: [NSLocalizedDescriptionKey: "Message 3: Failed to parse hex"])
-        }
-        
-        let msg3 = try initiatorHandshake.writeMessage(payload: payload3)
-        #expect(!msg3.isEmpty, "Message 3 should not be empty")
-        #expect(msg3 == expectedCiphertext3, "Message 3 ciphertext should match expected value. Got: \(msg3.hexString()), Expected: \(expectedCiphertext3.hexString())")
-        
-        let decrypted3 = try responderHandshake.readMessage(msg3)
-        #expect(decrypted3 == payload3, "Message 3: Decrypted payload should match original")
-        
-        // Verify handshake hash
-        let initiatorHash = initiatorHandshake.getHandshakeHash()
-        let responderHash = responderHandshake.getHandshakeHash()
-        
-        #expect(initiatorHash == responderHash, "Initiator and responder hashes should match")
-        
-        if let expectedHash = expectedHash {
-            #expect(
-                initiatorHash == expectedHash,
-                "Handshake hash should match expected value from test vector. Got: \(initiatorHash.hexString()), Expected: \(expectedHash.hexString())")
-        }
-        
-        // Get transport ciphers
-        let (initSend, initRecv) = try initiatorHandshake.getTransportCiphers(useExtractedNonce: false)
-        let (respSend, respRecv) = try responderHandshake.getTransportCiphers(useExtractedNonce: false)
-
-        // Test transport messages (messages after the 3 handshake messages)
-        for index in 3..<testVector.messages.count {
-            let testMsg = testVector.messages[index]
-            guard let payload = Data(hex: testMsg.payload),
-                  let expectedCiphertext = Data(hex: testMsg.ciphertext) else {
-                throw NSError(
-                    domain: "NoiseTests", code: 4,
-                    userInfo: [
-                        NSLocalizedDescriptionKey:
-                            "Message \(index + 1): Failed to parse payload hex"
-                    ])
-            }
-            
-            // Alternate between responder and initiator sending
-            // Responder sends first transport message (since initiator sent last handshake message)
-            let (sender, receiver): (NoiseCipherState, NoiseCipherState)
-            let transportIndex = index - 3
-            if transportIndex % 2 == 0 {
-                // Even transport messages: responder sends
-                sender = respSend
-                receiver = initRecv
-            } else {
-                // Odd transport messages: initiator sends
-                sender = initSend
-                receiver = respRecv
-            }
-            
-            // Encrypt and validate ciphertext matches expected value
-            let ciphertext = try sender.encrypt(plaintext: payload)
-            #expect(
-                ciphertext == expectedCiphertext,
-                "Message \(index + 1) ciphertext should match expected value. Got: \(ciphertext.hexString()), Expected: \(expectedCiphertext.hexString())")
-
-            // Decrypt and validate payload
-            let decrypted = try receiver.decrypt(ciphertext: ciphertext)
-            #expect(
-                decrypted == payload,
-                "Message \(index + 1): Decrypted payload should match original")
-        }
-    }
 }

bitchatTests/Noise/NoiseTestVectors.json

@@ -1,71 +0,0 @@
-[
-    {
-        "protocol_name": "Noise_XX_25519_ChaChaPoly_SHA256",
-        "init_prologue": "4a6f686e2047616c74",
-        "init_static": "e61ef9919cde45dd5f82166404bd08e38bceb5dfdfded0a34c8df7ed542214d1",
-        "init_ephemeral": "893e28b9dc6ca8d611ab664754b8ceb7bac5117349a4439a6b0569da977c464a",
-        "resp_prologue": "4a6f686e2047616c74",
-        "resp_static": "4a3acbfdb163dec651dfa3194dece676d437029c62a408b4c5ea9114246e4893",
-        "resp_ephemeral": "bbdb4cdbd309f1a1f2e1456967fe288cadd6f712d65dc7b7793d5e63da6b375b",
-        "handshake_hash": "c8e5f64e846193be2a834104c2a009868d6c9f3bd3c186299888b488b2f1f58e",
-        "messages": [
-            {
-                "payload": "4c756477696720766f6e204d69736573",
-                "ciphertext": "ca35def5ae56cec33dc2036731ab14896bc4c75dbb07a61f879f8e3afa4c79444c756477696720766f6e204d69736573"
-            },
-            {
-                "payload": "4d757272617920526f746862617264",
-                "ciphertext": "95ebc60d2b1fa672c1f46a8aa265ef51bfe38e7ccb39ec5be34069f14480884381cbad1f276e038c48378ffce2b65285e08d6b68aaa3629a5a8639392490e5b9bd5269c2f1e4f488ed8831161f19b7815528f8982ffe09be9b5c412f8a0db50f8814c7194e83f23dbd8d162c9326ad"
-            },
-            {
-                "payload": "462e20412e20486179656b",
-                "ciphertext": "c7195ffacac1307ff99046f219750fc47693e23c3cb08b89c2af808b444850a80ae475b9df0f169ae80a89be0865b57f58c9fea0d4ec82a286427402f113e4b6ae769a1d95941d49b25030"
-            },
-            {
-                "payload": "4361726c204d656e676572",
-                "ciphertext": "96763ed773f8e47bb3712f0e29b3060ffc956ffc146cee53d5e1df"
-            },
-            {
-                "payload": "4a65616e2d426170746973746520536179",
-                "ciphertext": "3e40f15f6f3a46ae446b253bf8b1d9ffb6ed9b174d272328ff91a7e2e5c79c07f5"
-            },
-            {
-                "payload": "457567656e2042f6686d20766f6e2042617765726b",
-                "ciphertext": "eb3f3515110702e047a6c9da4478b6ead94873c11c0f2d710ddb3f09fce024b3a58502ae3f"
-            }
-        ]
-    },
-    {
-        "protocol_name": "Noise_XX_25519_ChaChaPoly_SHA256",
-        "init_prologue": "5468657265206973206e6f20726967687420616e642077726f6e672e2054686572652773206f6e6c792066756e20616e6420626f72696e672e",
-        "init_psks": [],
-        "init_static": "7dec208517a3b81a2861d7a71266d5d6dc944c5a8816634a86fe63198a0148ee",
-        "init_ephemeral": "a32daf21e93c0131495ce1d903181fde81cc46937daaeb990bae7c992709421e",
-        "resp_prologue": "5468657265206973206e6f20726967687420616e642077726f6e672e2054686572652773206f6e6c792066756e20616e6420626f72696e672e",
-        "resp_psks": [],
-        "resp_static": "4d0aed5098e3b4ef20357e9f686ce66204c792b358da2e475017d6c485304881",
-        "resp_ephemeral": "4eece0f195d026db035ff987597c429d3ad3bcc2944df37d649528951b2a27c5",
-        "messages": [
-            {
-                "payload": "d03c489139e645d0711a3c9e810d776b46a84912463fafa87b884eebf242dc34",
-                "ciphertext": "f9fa868ba97ab8a2686deccfaad5a484ee10a5bb85e3d1dce015a84797f92818d03c489139e645d0711a3c9e810d776b46a84912463fafa87b884eebf242dc34"
-            },
-            {
-                "payload": "d8190a92f7dc0c93dbea9118ba8055751fb7c6590c416ffbd419964132b99a85",
-                "ciphertext": "8c4e6fdb7d09d501a86f7eca5c234522751706ed409182c05cdf5f827d4dae47b81c6c5f43b025692c24391eefee725c17d8cb0fbe3e4abb8aedf42c4fd2592d4ea48ac08989d6ae8b4adae08b2c34087c808c7aa55a63c02b0fab9e930612336bd43eaea04d3c670a0a146691aa9cc9d357872320dc735dbc48580cffb553db"
-            },
-            {
-                "payload": "77891b19dcb92ef7c055b672c4a5aa7fdf1c84146b8b303459022729473ce254",
-                "ciphertext": "933ca6b5ed60df3df66121f0ab49a09e49efa45c613a86a3cecbf4c535cef2f83f72b42837b18e3572f2fdc2b74c331e2368a545cef54bdca081678ab0e9dd5348122459e0c034c851984d88ce610963d43cde6cfe73a67fbd5a63e8bfca96d0"
-            },
-            {
-                "payload": "d7efdf988072881941db045a42882433817555128fbf5663e56081712ec7d212",
-                "ciphertext": "54ef0ff0629e1aaa7685a2806ab111cba76b52331f2642276736f415868eacb69ab2577f3bda0cbf72f879685f6ed25f"
-            },
-            {
-                "payload": "dd7bf01a588bafb52c6cfba952e5d8fe35cc2b3f92b4730ae2474615157345ce",
-                "ciphertext": "356be70f110306d5c699bb834bb9d58d909e325924dfbec972e406e6f294dc63e1daebefe8a62a334facc8048ab4ad66"
-            }
-        ]
-    }
-]

bitchatTests/Protocol/BinaryProtocolTests.swift

@@ -54,86 +54,6 @@ struct BinaryProtocolTests {
         #expect(decodedPacket.signature != nil)
         #expect(decodedPacket.signature == TestConstants.testSignature)
     }
-
-    @Test func packetWithRouteRoundTrip() throws {
-        let route: [Data] = [
-            try #require(Data(hexString: "0102030405060708")),
-            try #require(Data(hexString: "1112131415161718")),
-            try #require(Data(hexString: "2122232425262728"))
-        ]
-
-        var packet = BitchatPacket(
-            type: 0x01,
-            senderID: route[0],
-            recipientID: route.last,
-            timestamp: 1_720_000_000_000,
-            payload: Data("route-test".utf8),
-            signature: nil,
-            ttl: 6
-        )
-        packet.route = route
-
-        let encoded = try #require(BinaryProtocol.encode(packet), "Failed to encode packet with route")
-        let flagsByte = encoded[BinaryProtocol.Offsets.flags]
-        #expect((flagsByte & BinaryProtocol.Flags.hasRoute) != 0)
-
-        let decoded = try #require(BinaryProtocol.decode(encoded), "Failed to decode packet with route")
-        let decodedRoute = try #require(decoded.route)
-        #expect(decodedRoute.count == route.count)
-        for (expected, actual) in zip(route, decodedRoute) {
-            #expect(actual == expected)
-        }
-    }
-
-    @Test func packetWithRoutePadsShortHop() throws {
-        let sender = try #require(Data(hexString: "0011223344556677"))
-        let destination = try #require(Data(hexString: "8899aabbccddeeff"))
-        let shortHop = Data([0xAA, 0xBB, 0xCC])
-
-        var packet = BitchatPacket(
-            type: 0x02,
-            senderID: sender,
-            recipientID: destination,
-            timestamp: 1_730_000_000_000,
-            payload: Data("pad-test".utf8),
-            signature: nil,
-            ttl: 5
-        )
-        packet.route = [shortHop, destination]
-
-        let encoded = try #require(BinaryProtocol.encode(packet), "Failed to encode packet with short hop route")
-        let decoded = try #require(BinaryProtocol.decode(encoded), "Failed to decode packet with short hop route")
-        let decodedRoute = try #require(decoded.route)
-        let firstHop = try #require(decodedRoute.first)
-        #expect(firstHop.count == BinaryProtocol.senderIDSize)
-        #expect(firstHop.prefix(shortHop.count) == shortHop)
-        let paddingBytes = firstHop.suffix(firstHop.count - shortHop.count)
-        #expect(paddingBytes.allSatisfy { $0 == 0 })
-    }
-
-    @Test func packetWithRouteAndCompressedPayload() throws {
-        let route: [Data] = [
-            try #require(Data(hexString: "0101010101010101")),
-            try #require(Data(hexString: "0202020202020202"))
-        ]
-        let repeatedString = String(repeating: "compress-me", count: 150)
-        var packet = BitchatPacket(
-            type: 0x03,
-            senderID: route[0],
-            recipientID: route.last,
-            timestamp: 1_740_000_000_000,
-            payload: Data(repeatedString.utf8),
-            signature: nil,
-            ttl: 7
-        )
-        packet.route = route
-
-        let encoded = try #require(BinaryProtocol.encode(packet), "Failed to encode packet with route and compression")
-        let decoded = try #require(BinaryProtocol.decode(encoded), "Failed to decode packet with route and compression")
-        #expect(decoded.payload == Data(repeatedString.utf8))
-        let decodedRoute = try #require(decoded.route)
-        #expect(decodedRoute == route)
-    }
     
     // MARK: - Compression Tests
     

bitchatTests/Services/MeshTopologyTrackerTests.swift

@@ -1,86 +0,0 @@
-//
-// MeshTopologyTrackerTests.swift
-// bitchatTests
-//
-// This is free and unencumbered software released into the public domain.
-// For more information, see <https://unlicense.org>
-//
-
-import Testing
-import Foundation
-@testable import bitchat
-
-struct MeshTopologyTrackerTests {
-    private func hex(_ value: String) throws -> Data {
-        try #require(Data(hexString: value))
-    }
-
-    @Test func directLinkProducesRoute() throws {
-        let tracker = MeshTopologyTracker()
-        let a = try hex("0102030405060708")
-        let b = try hex("1112131415161718")
-
-        tracker.recordDirectLink(between: a, and: b)
-        let route = try #require(tracker.computeRoute(from: a, to: b))
-        #expect(route == [a, b])
-    }
-
-    @Test func multiHopRouteComputation() throws {
-        let tracker = MeshTopologyTracker()
-        let a = try hex("0001020304050607")
-        let b = try hex("1011121314151617")
-        let c = try hex("2021222324252627")
-        let d = try hex("3031323334353637")
-
-        tracker.recordDirectLink(between: a, and: b)
-        tracker.recordDirectLink(between: b, and: c)
-        tracker.recordDirectLink(between: c, and: d)
-
-        let route = try #require(tracker.computeRoute(from: a, to: d))
-        #expect(route == [a, b, c, d])
-    }
-
-    @Test func recordRouteAddsEdges() throws {
-        let tracker = MeshTopologyTracker()
-        var a = Data([0xAA, 0xBB, 0xCC])
-        let b = try hex("4445464748494A4B")
-        let c = try hex("5455565758595A5B")
-
-        tracker.recordRoute([a, b, c])
-
-        a.append(Data(repeating: 0, count: BinaryProtocol.senderIDSize - a.count))
-        let route = try #require(tracker.computeRoute(from: a, to: c))
-        #expect(route.first == a)
-        #expect(route.last == c)
-    }
-
-    @Test func removingDirectLinkBreaksRoute() throws {
-        let tracker = MeshTopologyTracker()
-        let a = try hex("0101010101010101")
-        let b = try hex("0202020202020202")
-        let c = try hex("0303030303030303")
-
-        tracker.recordDirectLink(between: a, and: b)
-        tracker.recordDirectLink(between: b, and: c)
-        let initialRoute = try #require(tracker.computeRoute(from: a, to: c))
-        #expect(initialRoute == [a, b, c])
-
-        tracker.removeDirectLink(between: b, and: c)
-        #expect(tracker.computeRoute(from: a, to: c) == nil)
-    }
-
-    @Test func removingPeerClearsEdges() throws {
-        let tracker = MeshTopologyTracker()
-        let a = try hex("0F0E0D0C0B0A0908")
-        let b = try hex("0A0B0C0D0E0F0001")
-        let c = try hex("0011223344556677")
-
-        tracker.recordRoute([a, b, c])
-        let initialRoute = try #require(tracker.computeRoute(from: a, to: c))
-        #expect(initialRoute == [a, b, c])
-
-        tracker.removePeer(b)
-        #expect(tracker.computeRoute(from: a, to: c) == nil)
-    }
-
-}

bitchatTests/Utils/PeerIDTests.swift

@@ -217,27 +217,7 @@ struct PeerIDTests {
         let short = peerID.toShort()
         #expect(short == peerID)
     }
-
-    @Test func routingData_fromShortID() throws {
-        let peerID = PeerID(str: hex16)
-        let routing = try #require(peerID.routingData)
-        #expect(routing.count == 8)
-        #expect(routing == Data(hexString: hex16))
-    }
-
-    @Test func routingData_fromNoiseKey() throws {
-        let peerID = PeerID(str: hex64)
-        let routing = try #require(peerID.routingData)
-        let expectedShort = peerID.toShort()
-        #expect(routing == Data(hexString: expectedShort.id))
-    }
-
-    @Test func routingPeerRoundTrip() throws {
-        let raw = try #require(Data(hexString: hex16))
-        let peerID = try #require(PeerID(routingData: raw))
-        #expect(peerID.routingData == raw)
-    }
-
+    
     // MARK: - Codable
 
     @Test func codable_emptyPrefix() throws {
@@ -293,7 +273,7 @@ struct PeerIDTests {
     @Test func comparable_sorting_and_equality() {
         let p1 = PeerID(str: "aaa")
         let p2 = PeerID(str: "bbb")
-        let p3 = PeerID(str: "BBB")
+        let p3 = PeerID(str: "bbb")
         
         #expect(p1 < p2)
         #expect(p2 >= p1)
@@ -304,18 +284,44 @@ struct PeerIDTests {
     }
     
     @Test func equality() {
-        let peerID = PeerID(str: "aaa")
+        let string = "aaa"
+        let peerID = PeerID(str: string)
+        let badString = "bbb"
+        
+        // PeerID == String
+        #expect(peerID == string)
+        #expect(peerID == Optional(string))
+        #expect(Optional(peerID) == string)
+        #expect(Optional(peerID) == Optional(string))
+
+        // PeerID != String
+        #expect(peerID != badString)
+        #expect(peerID != Optional(badString))
+        #expect(Optional(peerID) != badString)
+        #expect(Optional(peerID) != Optional(badString))
+        
+        // String == PeerID
+        #expect(string == peerID)
+        #expect(Optional(string) == peerID)
+        #expect(string == Optional(peerID))
+        #expect(Optional(string) == Optional(peerID))
+
+        // String != PeerID
+        #expect(badString != peerID)
+        #expect(Optional(badString) != peerID)
+        #expect(badString != Optional(peerID))
+        #expect(Optional(badString) != Optional(peerID))
         
         // Regular PeerID <> PeerID
-        #expect(peerID == PeerID(str: "AAA"))
-        #expect(peerID == Optional(PeerID(str: "AAA")))
-        #expect(PeerID(str: "AAA") == peerID)
-        #expect(Optional(PeerID(str: "AAA")) == Optional(peerID))
+        #expect(peerID == PeerID(str: "aaa"))
+        #expect(peerID == Optional(PeerID(str: "aaa")))
+        #expect(PeerID(str: "aaa") == peerID)
+        #expect(Optional(PeerID(str: "aaa")) == Optional(peerID))
         
-        #expect(peerID != PeerID(str: "BBB"))
-        #expect(peerID != Optional(PeerID(str: "BBB")))
-        #expect(PeerID(str: "BBB") != peerID)
-        #expect(Optional(PeerID(str: "BBB")) != Optional(peerID))
+        #expect(peerID != PeerID(str: "bbb"))
+        #expect(peerID != Optional(PeerID(str: "bbb")))
+        #expect(PeerID(str: "bbb") != peerID)
+        #expect(Optional(PeerID(str: "bbb")) != Optional(peerID))
     }
     
     // MARK: - Computed properties

bitchatTests/XChaCha20Poly1305CompatTests.swift

@@ -1,222 +0,0 @@
-//
-// XChaCha20Poly1305CompatTests.swift
-// bitchatTests
-//
-// Tests for XChaCha20-Poly1305 encryption with proper error handling.
-// This is free and unencumbered software released into the public domain.
-//
-
-import Testing
-import struct Foundation.Data
-@testable import bitchat
-
-struct XChaCha20Poly1305CompatTests {
-
-    @Test func sealAndOpenRoundtrip() throws {
-        let plaintext = "Hello, XChaCha20-Poly1305!".data(using: .utf8)!
-        let key = Data(repeating: 0x42, count: 32)
-        let nonce = Data(repeating: 0x24, count: 24)
-
-        let sealed = try XChaCha20Poly1305Compat.seal(plaintext: plaintext, key: key, nonce24: nonce)
-        let decrypted = try XChaCha20Poly1305Compat.open(
-            ciphertext: sealed.ciphertext,
-            tag: sealed.tag,
-            key: key,
-            nonce24: nonce
-        )
-
-        #expect(decrypted == plaintext)
-    }
-
-    @Test func sealAndOpenWithAAD() throws {
-        let plaintext = "Secret message".data(using: .utf8)!
-        let key = Data(repeating: 0xAB, count: 32)
-        let nonce = Data(repeating: 0xCD, count: 24)
-        let aad = "additional authenticated data".data(using: .utf8)!
-
-        let sealed = try XChaCha20Poly1305Compat.seal(plaintext: plaintext, key: key, nonce24: nonce, aad: aad)
-        let decrypted = try XChaCha20Poly1305Compat.open(
-            ciphertext: sealed.ciphertext,
-            tag: sealed.tag,
-            key: key,
-            nonce24: nonce,
-            aad: aad
-        )
-
-        #expect(decrypted == plaintext)
-    }
-
-    @Test func sealProducesDifferentCiphertextWithDifferentNonces() throws {
-        let plaintext = "Same plaintext".data(using: .utf8)!
-        let key = Data(repeating: 0x42, count: 32)
-        let nonce1 = Data(repeating: 0x01, count: 24)
-        let nonce2 = Data(repeating: 0x02, count: 24)
-
-        let sealed1 = try XChaCha20Poly1305Compat.seal(plaintext: plaintext, key: key, nonce24: nonce1)
-        let sealed2 = try XChaCha20Poly1305Compat.seal(plaintext: plaintext, key: key, nonce24: nonce2)
-
-        #expect(sealed1.ciphertext != sealed2.ciphertext)
-    }
-
-    @Test func sealThrowsOnShortKey() {
-        let plaintext = "Test".data(using: .utf8)!
-        let shortKey = Data(repeating: 0x42, count: 16)
-        let nonce = Data(repeating: 0x24, count: 24)
-
-        var didThrow = false
-        do {
-            _ = try XChaCha20Poly1305Compat.seal(plaintext: plaintext, key: shortKey, nonce24: nonce)
-        } catch {
-            didThrow = true
-        }
-        #expect(didThrow)
-    }
-
-    @Test func sealThrowsOnLongKey() {
-        let plaintext = "Test".data(using: .utf8)!
-        let longKey = Data(repeating: 0x42, count: 64)
-        let nonce = Data(repeating: 0x24, count: 24)
-
-        var didThrow = false
-        do {
-            _ = try XChaCha20Poly1305Compat.seal(plaintext: plaintext, key: longKey, nonce24: nonce)
-        } catch {
-            didThrow = true
-        }
-        #expect(didThrow)
-    }
-
-    @Test func sealThrowsOnEmptyKey() {
-        let plaintext = "Test".data(using: .utf8)!
-        let emptyKey = Data()
-        let nonce = Data(repeating: 0x24, count: 24)
-
-        var didThrow = false
-        do {
-            _ = try XChaCha20Poly1305Compat.seal(plaintext: plaintext, key: emptyKey, nonce24: nonce)
-        } catch {
-            didThrow = true
-        }
-        #expect(didThrow)
-    }
-
-    @Test func openThrowsOnInvalidKeyLength() {
-        let ciphertext = Data(repeating: 0x00, count: 16)
-        let tag = Data(repeating: 0x00, count: 16)
-        let shortKey = Data(repeating: 0x42, count: 31)
-        let nonce = Data(repeating: 0x24, count: 24)
-
-        var didThrow = false
-        do {
-            _ = try XChaCha20Poly1305Compat.open(ciphertext: ciphertext, tag: tag, key: shortKey, nonce24: nonce)
-        } catch {
-            didThrow = true
-        }
-        #expect(didThrow)
-    }
-
-    @Test func sealThrowsOnShortNonce() {
-        let plaintext = "Test".data(using: .utf8)!
-        let key = Data(repeating: 0x42, count: 32)
-        let shortNonce = Data(repeating: 0x24, count: 12)
-
-        var didThrow = false
-        do {
-            _ = try XChaCha20Poly1305Compat.seal(plaintext: plaintext, key: key, nonce24: shortNonce)
-        } catch {
-            didThrow = true
-        }
-        #expect(didThrow)
-    }
-
-    @Test func sealThrowsOnLongNonce() {
-        let plaintext = "Test".data(using: .utf8)!
-        let key = Data(repeating: 0x42, count: 32)
-        let longNonce = Data(repeating: 0x24, count: 32)
-
-        var didThrow = false
-        do {
-            _ = try XChaCha20Poly1305Compat.seal(plaintext: plaintext, key: key, nonce24: longNonce)
-        } catch {
-            didThrow = true
-        }
-        #expect(didThrow)
-    }
-
-    @Test func sealThrowsOnEmptyNonce() {
-        let plaintext = "Test".data(using: .utf8)!
-        let key = Data(repeating: 0x42, count: 32)
-        let emptyNonce = Data()
-
-        var didThrow = false
-        do {
-            _ = try XChaCha20Poly1305Compat.seal(plaintext: plaintext, key: key, nonce24: emptyNonce)
-        } catch {
-            didThrow = true
-        }
-        #expect(didThrow)
-    }
-
-    @Test func openThrowsOnInvalidNonceLength() {
-        let ciphertext = Data(repeating: 0x00, count: 16)
-        let tag = Data(repeating: 0x00, count: 16)
-        let key = Data(repeating: 0x42, count: 32)
-        let shortNonce = Data(repeating: 0x24, count: 23)
-
-        var didThrow = false
-        do {
-            _ = try XChaCha20Poly1305Compat.open(ciphertext: ciphertext, tag: tag, key: key, nonce24: shortNonce)
-        } catch {
-            didThrow = true
-        }
-        #expect(didThrow)
-    }
-
-    @Test func openFailsWithWrongKey() throws {
-        let plaintext = "Secret".data(using: .utf8)!
-        let correctKey = Data(repeating: 0x42, count: 32)
-        let wrongKey = Data(repeating: 0x43, count: 32)
-        let nonce = Data(repeating: 0x24, count: 24)
-
-        let sealed = try XChaCha20Poly1305Compat.seal(plaintext: plaintext, key: correctKey, nonce24: nonce)
-
-        var didThrow = false
-        do {
-            _ = try XChaCha20Poly1305Compat.open(
-                ciphertext: sealed.ciphertext,
-                tag: sealed.tag,
-                key: wrongKey,
-                nonce24: nonce
-            )
-        } catch {
-            didThrow = true
-        }
-        #expect(didThrow)
-    }
-
-    @Test func openFailsWithTamperedCiphertext() throws {
-        let plaintext = "Secret".data(using: .utf8)!
-        let key = Data(repeating: 0x42, count: 32)
-        let nonce = Data(repeating: 0x24, count: 24)
-
-        let sealed = try XChaCha20Poly1305Compat.seal(plaintext: plaintext, key: key, nonce24: nonce)
-
-        // Create tampered ciphertext by changing first byte
-        var tamperedBytes = [UInt8](sealed.ciphertext)
-        tamperedBytes[0] = tamperedBytes[0] ^ 0xFF
-        let tampered = Data(tamperedBytes)
-
-        var didThrow = false
-        do {
-            _ = try XChaCha20Poly1305Compat.open(
-                ciphertext: tampered,
-                tag: sealed.tag,
-                key: key,
-                nonce24: nonce
-            )
-        } catch {
-            didThrow = true
-        }
-        #expect(didThrow)
-    }
-}