Merge branch 'main' into fix/deduplication-service-thread-safety

fix: add @MainActor to MessageDeduplicationService for thread safety
2026-07-25 06:25:20 +00:00 · 2026-01-04 13:56:35 -10:00 · 2026-01-04 13:42:17 -10:00 · 2026-01-04 13:29:39 -10:00
2470 changed files with 359682 additions and 24141 deletions
@@ -25,18 +25,47 @@ jobs:
          wget -q https://raw.githubusercontent.com/permissionlesstech/georelays/refs/heads/main/nostr_relays.csv
          mv nostr_relays.csv ./relays/online_relays_gps.csv

-      - name: Check for changes
-        id: git-check
+      - name: Configure git
        run: |
-          git diff --exit-code || echo "changes=true" >> $GITHUB_OUTPUT
-    
-      - name: Commit and push changes
-        if: steps.git-check.outputs.changes == 'true'
+          git config user.email "action@github.com"
+          git config user.name "GitHub Action"
+
+      - name: Create update branch if changes
+        id: create_branch
        run: |
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
+          # exit early if no changes
+          if git diff --quiet --relays/online_relays_gps.csv; then
+            echo "changed=false" >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          # branch name with timestamp
+          BRANCH="update-georelays-$(date -u +%Y%m%dT%H%M%SZ)"
+          git checkout -b "$BRANCH"
+
          git add relays/online_relays_gps.csv
-          git commit -m "Automated update of relay data - $(date -u)"
-          git push
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          git commit -m "Automated update of relay data - $(date -u --rfc-3339=seconds)"
+          echo "changed=true" >> $GITHUB_OUTPUT
+          echo "branch=$BRANCH" >> $GITHUB_OUTPUT
+
+      - name: Push branch
+        if: steps.create_branch.outputs.changed == 'true'
+        run: |
+          git push --set-upstream origin "${{ steps.create_branch.outputs.branch }}"
+
+      - name: Create pull request
+        if: steps.create_branch.outputs.changed == 'true'
+        uses: peter-evans/create-pull-request@v5
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: Automated update of relay data
+          branch: ${{ steps.create_branch.outputs.branch }}
+          base: main
+          title: Automated update of relay data
+          body: |
+            This PR was created automatically by the scheduled workflow. It updates relays/online_relays_gps.csv from the GeoRelays source.
+          labels: automated, georelays
+
+      - name: No changes
+        if: steps.create_branch.outputs.changed != 'true'
+        run: echo "No changes to relays/online_relays_gps.csv"
@@ -5,27 +5,14 @@ on:
    branches:
      - main
  pull_request:
+    branches:
+      - main

 jobs:
  test:
-    name: Run Swift Tests (${{ matrix.name }})
+    name: Run Swift Tests
    runs-on: macos-latest

-    strategy:
-      fail-fast: false # Don't cancel other matrix jobs when one fails
-      matrix:
-        include:
-          - name: app
-            path: .
-          - name: BitLogger
-            path: localPackages/BitLogger
-          - name: BitFoundation
-            path: localPackages/BitFoundation
-          - name: Noise
-            path: localPackages/Noise
-          - name: Nostr
-            path: localPackages/Nostr
-
    steps:
      - name: Checkout code
        uses: actions/checkout@v5
@@ -33,14 +20,8 @@ jobs:
      - name: Set up Swift
        uses: swift-actions/setup-swift@v2

-      - name: Cache build artifacts
-        uses: actions/cache@v4
-        with:
-          path: ${{ matrix.path }}/.build
-          key: ${{ runner.os }}-${{ matrix.name }}-${{ hashFiles(format('{0}/**/*.swift', matrix.path), format('{0}/**/Package.resolved', matrix.path)) }}
-          restore-keys: |
-            ${{ runner.os }}-${{ matrix.name }}-${{ hashFiles(format('{0}/**/Package.resolved', matrix.path)) }}
-            ${{ runner.os }}-${{ matrix.name }}-
+      - name: Build the package
+        run: swift build

      - name: Run Tests
-        run: swift test --parallel --quiet --package-path ${{ matrix.path }}
+        run: swift test --parallel
@@ -8,7 +8,6 @@ plans/
 ## AI
 CLAUDE.md
 AGENTS.md
-.claude/

 ## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
 *.xcscmblueprint
@@ -1,4 +1,4 @@
-MARKETING_VERSION = 1.5.1
+MARKETING_VERSION = 1.5.0
 CURRENT_PROJECT_VERSION = 1

 IPHONEOS_DEPLOYMENT_TARGET = 16.0
@@ -9,4 +9,3 @@ DEVELOPMENT_TEAM = L3N5LHJD5Y
 CODE_SIGN_STYLE = Automatic

 PRODUCT_BUNDLE_IDENTIFIER = chat.bitchat
-APP_GROUP_ID = group.chat.bitchat
@@ -16,11 +16,8 @@ let package = Package(
        ),
    ],
    dependencies:[
-        .package(path: "localPackages/Arti"),
-        .package(path: "localPackages/Noise"),
-        .package(path: "localPackages/BitFoundation"),
+        .package(path: "localPackages/Tor"),
        .package(path: "localPackages/BitLogger"),
-        .package(path: "localPackages/Nostr"),
        .package(url: "https://github.com/21-DOT-DEV/swift-secp256k1", exact: "0.21.1")
    ],
    targets: [
@@ -28,17 +25,13 @@ let package = Package(
            name: "bitchat",
            dependencies: [
                .product(name: "P256K", package: "swift-secp256k1"),
-                .product(name: "BitFoundation", package: "BitFoundation"),
                .product(name: "BitLogger", package: "BitLogger"),
-                .product(name: "Noise", package: "Noise"),
-                .product(name: "Nostr", package: "Nostr"),
-                .product(name: "Tor", package: "Arti")
+                .product(name: "Tor", package: "Tor")
            ],
            path: "bitchat",
            exclude: [
                "Info.plist",
                "Assets.xcassets",
-                "_PreviewHelpers/PreviewAssets.xcassets",
                "bitchat.entitlements",
                "bitchat-macOS.entitlements",
                "LaunchScreen.storyboard",
@@ -50,18 +43,15 @@ let package = Package(
        ),
        .testTarget(
            name: "bitchatTests",
-            dependencies: [
-                "bitchat",
-                .product(name: "BitFoundation", package: "BitFoundation"),
-                .product(name: "Nostr", package: "Nostr")
-            ],
+            dependencies: ["bitchat"],
            path: "bitchatTests",
            exclude: [
                "Info.plist",
                "README.md"
            ],
            resources: [
-                .process("Localization")
+                .process("Localization"),
+                .process("Noise")
            ]
        )
    ]
@@ -8,6 +8,9 @@ A decentralized peer-to-peer messaging app with dual transport architecture: loc

 📲 [App Store](https://apps.apple.com/us/app/bitchat-mesh/id6748219622)

+> [!WARNING]
+> Private messages have not received external security review and may contain vulnerabilities. Do not use for sensitive use cases, and do not rely on its security until it has been reviewed. Now uses the [Noise Protocol](https://www.noiseprotocol.org) for identity and encryption. Public local chat (the main feature) has no security concerns.
+
 ## License

 This project is released into the public domain. See the [LICENSE](LICENSE) file for details.
@@ -10,16 +10,11 @@
 		17901751FD8010AFC8E750F2 /* bitchatShareExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 61F92EBA29C47C0FCC482F1F /* bitchatShareExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		3EE336D150427F736F32B56C /* P256K in Frameworks */ = {isa = PBXBuildFile; productRef = B1D9136AA0083366353BFA2F /* P256K */; };
 		885BBED78092484A5B069461 /* P256K in Frameworks */ = {isa = PBXBuildFile; productRef = 4EB6BA1B8464F1EA38F4E286 /* P256K */; };
-		A63163B62F80CB2500B8B128 /* Noise in Frameworks */ = {isa = PBXBuildFile; productRef = A63163B52F80CB2500B8B128 /* Noise */; };
-		A63163B82F80CB2D00B8B128 /* Noise in Frameworks */ = {isa = PBXBuildFile; productRef = A63163B72F80CB2D00B8B128 /* Noise */; };
-		A63180832F8103AB00B8B128 /* Nostr in Frameworks */ = {isa = PBXBuildFile; productRef = A63180822F8103AB00B8B128 /* Nostr */; };
-		A63180852F8103B600B8B128 /* Nostr in Frameworks */ = {isa = PBXBuildFile; productRef = A63180842F8103B600B8B128 /* Nostr */; };
-		A6BCF9482F80953E001CF9B9 /* BitFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = A6BCF9472F80953E001CF9B9 /* BitFoundation */; };
-		A6BCF94A2F809550001CF9B9 /* BitFoundation in Frameworks */ = {isa = PBXBuildFile; productRef = A6BCF9492F809550001CF9B9 /* BitFoundation */; };
 		A6E3E5702E77036A0032EA8A /* BitLogger in Frameworks */ = {isa = PBXBuildFile; productRef = A6E3E56F2E77036A0032EA8A /* BitLogger */; };
 		A6E3E5722E7703760032EA8A /* BitLogger in Frameworks */ = {isa = PBXBuildFile; productRef = A6E3E5712E7703760032EA8A /* BitLogger */; };
 		A6E3EA7F2E7706720032EA8A /* Tor in Frameworks */ = {isa = PBXBuildFile; productRef = A6E3EA7E2E7706720032EA8A /* Tor */; };
 		A6E3EA812E7706A80032EA8A /* Tor in Frameworks */ = {isa = PBXBuildFile; productRef = A6E3EA802E7706A80032EA8A /* Tor */; };
+		A6F183FD2E948783006A9046 /* tor-nolzma.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = A6F183FC2E948783006A9046 /* tor-nolzma.xcframework */; };
 		E0A1B2C3D4E5F6012345678D /* relays/online_relays_gps.csv in Resources */ = {isa = PBXBuildFile; fileRef = E0A1B2C3D4E5F6012345678A /* relays/online_relays_gps.csv */; };
 		E0A1B2C3D4E5F6012345678E /* relays/online_relays_gps.csv in Resources */ = {isa = PBXBuildFile; fileRef = E0A1B2C3D4E5F6012345678A /* relays/online_relays_gps.csv */; };
 /* End PBXBuildFile section */
@@ -160,22 +155,17 @@
 			isa = PBXFrameworksBuildPhase;
 			files = (
 				A6E3E5722E7703760032EA8A /* BitLogger in Frameworks */,
-				A63163B82F80CB2D00B8B128 /* Noise in Frameworks */,
 				3EE336D150427F736F32B56C /* P256K in Frameworks */,
-				A63180852F8103B600B8B128 /* Nostr in Frameworks */,
 				A6E3EA812E7706A80032EA8A /* Tor in Frameworks */,
-				A6BCF94A2F809550001CF9B9 /* BitFoundation in Frameworks */,
 			);
 		};
 		B5A5CC493FFB3D8966548140 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			files = (
+				A6F183FD2E948783006A9046 /* tor-nolzma.xcframework in Frameworks */,
 				A6E3E5702E77036A0032EA8A /* BitLogger in Frameworks */,
-				A63163B62F80CB2500B8B128 /* Noise in Frameworks */,
 				885BBED78092484A5B069461 /* P256K in Frameworks */,
-				A63180832F8103AB00B8B128 /* Nostr in Frameworks */,
 				A6E3EA7F2E7706720032EA8A /* Tor in Frameworks */,
-				A6BCF9482F80953E001CF9B9 /* BitFoundation in Frameworks */,
 			);
 		};
 /* End PBXFrameworksBuildPhase section */
@@ -235,9 +225,6 @@
 				B1D9136AA0083366353BFA2F /* P256K */,
 				A6E3E5712E7703760032EA8A /* BitLogger */,
 				A6E3EA802E7706A80032EA8A /* Tor */,
-				A6BCF9492F809550001CF9B9 /* BitFoundation */,
-				A63163B72F80CB2D00B8B128 /* Noise */,
-				A63180842F8103B600B8B128 /* Nostr */,
 			);
 			productName = bitchat_macOS;
 			productReference = 8F3A7C058C2C8E1A06C8CF8B /* bitchat.app */;
@@ -318,9 +305,6 @@
 				4EB6BA1B8464F1EA38F4E286 /* P256K */,
 				A6E3E56F2E77036A0032EA8A /* BitLogger */,
 				A6E3EA7E2E7706720032EA8A /* Tor */,
-				A6BCF9472F80953E001CF9B9 /* BitFoundation */,
-				A63163B52F80CB2500B8B128 /* Noise */,
-				A63180822F8103AB00B8B128 /* Nostr */,
 			);
 			productName = bitchat_iOS;
 			productReference = 96D0D41CA19EE5A772AA8434 /* bitchat.app */;
@@ -361,10 +345,7 @@
 			packageReferences = (
 				B8C407587481BBB190741C93 /* XCRemoteSwiftPackageReference "swift-secp256k1" */,
 				A6E3E56E2E77036A0032EA8A /* XCLocalSwiftPackageReference "localPackages/BitLogger" */,
-				A6E3EA7D2E7706720032EA8A /* XCLocalSwiftPackageReference "localPackages/Arti" */,
-				A6BCF9462F80953E001CF9B9 /* XCLocalSwiftPackageReference "localPackages/BitFoundation" */,
-				A63163B42F80CB2500B8B128 /* XCLocalSwiftPackageReference "localPackages/Noise" */,
-				A63180812F8103AB00B8B128 /* XCLocalSwiftPackageReference "localPackages/Nostr" */,
+				A6E3EA7D2E7706720032EA8A /* XCLocalSwiftPackageReference "localPackages/Tor" */,
 			);
 			preferredProjectObjectVersion = 90;
 			projectDirPath = "";
@@ -569,7 +550,6 @@
 				CODE_SIGNING_REQUIRED = YES;
 				CODE_SIGN_ENTITLEMENTS = bitchat/bitchat.entitlements;
 				CODE_SIGN_STYLE = "$(CODE_SIGN_STYLE)";
-				DEVELOPMENT_ASSET_PATHS = bitchat/_PreviewHelpers;
 				DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)";
 				ENABLE_PREVIEWS = NO;
 				INFOPLIST_FILE = bitchat/Info.plist;
@@ -580,7 +560,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.1;
+				MARKETING_VERSION = "$(MARKETING_VERSION)";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = bitchat;
 				SDKROOT = iphoneos;
@@ -630,7 +610,6 @@
 				CODE_SIGNING_REQUIRED = YES;
 				CODE_SIGN_ENTITLEMENTS = bitchat/bitchat.entitlements;
 				CODE_SIGN_STYLE = "$(CODE_SIGN_STYLE)";
-				DEVELOPMENT_ASSET_PATHS = bitchat/_PreviewHelpers;
 				DEVELOPMENT_TEAM = "$(DEVELOPMENT_TEAM)";
 				ENABLE_PREVIEWS = YES;
 				INFOPLIST_FILE = bitchat/Info.plist;
@@ -641,7 +620,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.5.1;
+				MARKETING_VERSION = "$(MARKETING_VERSION)";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = bitchat;
 				SDKROOT = iphoneos;
@@ -677,7 +656,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = "$(MACOSX_DEPLOYMENT_TARGET)";
-				MARKETING_VERSION = 1.5.1;
+				MARKETING_VERSION = "$(MARKETING_VERSION)";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = bitchat;
 				REGISTER_APP_GROUPS = YES;
@@ -769,7 +748,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = "$(MACOSX_DEPLOYMENT_TARGET)";
-				MARKETING_VERSION = 1.5.1;
+				MARKETING_VERSION = "$(MARKETING_VERSION)";
 				PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)";
 				PRODUCT_NAME = bitchat;
 				REGISTER_APP_GROUPS = YES;
@@ -930,25 +909,13 @@
 /* End XCConfigurationList section */

 /* Begin XCLocalSwiftPackageReference section */
-		A63163B42F80CB2500B8B128 /* XCLocalSwiftPackageReference "localPackages/Noise" */ = {
-			isa = XCLocalSwiftPackageReference;
-			relativePath = localPackages/Noise;
-		};
-		A63180812F8103AB00B8B128 /* XCLocalSwiftPackageReference "localPackages/Nostr" */ = {
-			isa = XCLocalSwiftPackageReference;
-			relativePath = localPackages/Nostr;
-		};
-		A6BCF9462F80953E001CF9B9 /* XCLocalSwiftPackageReference "localPackages/BitFoundation" */ = {
-			isa = XCLocalSwiftPackageReference;
-			relativePath = localPackages/BitFoundation;
-		};
 		A6E3E56E2E77036A0032EA8A /* XCLocalSwiftPackageReference "localPackages/BitLogger" */ = {
 			isa = XCLocalSwiftPackageReference;
 			relativePath = localPackages/BitLogger;
 		};
-		A6E3EA7D2E7706720032EA8A /* XCLocalSwiftPackageReference "localPackages/Arti" */ = {
+		A6E3EA7D2E7706720032EA8A /* XCLocalSwiftPackageReference "localPackages/Tor" */ = {
 			isa = XCLocalSwiftPackageReference;
-			relativePath = localPackages/Arti;
+			relativePath = localPackages/Tor;
 		};
 /* End XCLocalSwiftPackageReference section */

@@ -957,8 +924,8 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/21-DOT-DEV/swift-secp256k1";
 			requirement = {
-				kind = exactVersion;
-				version = 0.21.1;
+				kind = upToNextMajorVersion;
+				minimumVersion = 0.21.1;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
@@ -969,33 +936,6 @@
 			package = B8C407587481BBB190741C93 /* XCRemoteSwiftPackageReference "swift-secp256k1" */;
 			productName = P256K;
 		};
-		A63163B52F80CB2500B8B128 /* Noise */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = Noise;
-		};
-		A63163B72F80CB2D00B8B128 /* Noise */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = A63163B42F80CB2500B8B128 /* XCLocalSwiftPackageReference "localPackages/Noise" */;
-			productName = Noise;
-		};
-		A63180822F8103AB00B8B128 /* Nostr */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = Nostr;
-		};
-		A63180842F8103B600B8B128 /* Nostr */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = A63180812F8103AB00B8B128 /* XCLocalSwiftPackageReference "localPackages/Nostr" */;
-			productName = Nostr;
-		};
-		A6BCF9472F80953E001CF9B9 /* BitFoundation */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = BitFoundation;
-		};
-		A6BCF9492F809550001CF9B9 /* BitFoundation */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = A6BCF9462F80953E001CF9B9 /* XCLocalSwiftPackageReference "localPackages/BitFoundation" */;
-			productName = BitFoundation;
-		};
 		A6E3E56F2E77036A0032EA8A /* BitLogger */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = BitLogger;
@@ -6,10 +6,8 @@
 // For more information, see <https://unlicense.org>
 //

-import Nostr
 import Tor
 import SwiftUI
-import BitFoundation
 import UserNotifications

@main
@@ -28,11 +26,9 @@ struct BitchatApp: App {
    @NSApplicationDelegateAdaptor(MacAppDelegate.self) var appDelegate
    #endif
    
-    private let idBridge = NostrIdentityBridge(keychain: KeychainManager())
+    private let idBridge = NostrIdentityBridge()
    
    init() {
-        GeoRelayDirectory.setupShared(dependencies: .live())
-        NostrRelayManager.setupShared(dependencies: .live())
        let keychain = KeychainManager()
        let idBridge = self.idBridge
        _chatViewModel = StateObject(
@@ -67,10 +63,6 @@ struct BitchatApp: App {

                    // Initialize network activation policy; will start Tor/Nostr only when allowed
                    NetworkActivationService.shared.start()
-                    
-                    // Start presence service (will wait for Tor readiness)
-                    GeohashPresenceService.shared.start()
-
                    // Check for shared content
                    checkForSharedContent()
                }
@@ -283,3 +275,8 @@ final class NotificationDelegate: NSObject, UNUserNotificationCenterDelegate {
    }
 }

+extension String {
+    var nilIfEmpty: String? {
+        self.isEmpty ? nil : self
+    }
+}
@@ -9,18 +9,6 @@ final class VoiceNotePlaybackController: NSObject, ObservableObject, AVAudioPlay
    @Published private(set) var duration: TimeInterval = 0
    @Published private(set) var progress: Double = 0

-    /// rounded so 4.9s shows "00:05"
-    var roundedDuration: Int {
-        guard duration.isFinite else { return 0 }
-        return Int(duration.rounded())
-    }
-
-    /// ceil so "00:01" stays visible until playback ends, capped to rounded duration
-    var remainingSeconds: Int {
-        let remaining = max(0, duration - currentTime)
-        return min(roundedDuration, Int(ceil(remaining)))
-    }
-
    private var player: AVAudioPlayer?
    private var timer: Timer?
    private var url: URL
@@ -2,7 +2,8 @@ import Foundation
 import AVFoundation

 /// Manages audio capture for mesh voice notes with predictable encoding settings.
-actor VoiceRecorder {
+/// Recording runs on an internal serial queue to avoid AVAudioSession contention.
+final class VoiceRecorder: NSObject, AVAudioRecorderDelegate {
    enum RecorderError: Error {
        case microphoneAccessDenied
        case recorderInitializationFailed
@@ -11,16 +12,21 @@ actor VoiceRecorder {

    static let shared = VoiceRecorder()

+    private let queue = DispatchQueue(label: "com.bitchat.voice-recorder")
    private let paddingInterval: TimeInterval = 0.5
    private let maxRecordingDuration: TimeInterval = 120
-    static let minRecordingDuration: TimeInterval = 1

    private var recorder: AVAudioRecorder?
    private var currentURL: URL?
+    private var stopWorkItem: DispatchWorkItem?
+
+    private override init() {
+        super.init()
+    }

    // MARK: - Permissions

-    nonisolated
+    @discardableResult
    func requestPermission() async -> Bool {
        #if os(iOS)
        return await withCheckedContinuation { continuation in
@@ -41,88 +47,106 @@ actor VoiceRecorder {

    // MARK: - Recording Lifecycle

-    @discardableResult
    func startRecording() throws -> URL {
-        if recorder?.isRecording == true {
-            throw RecorderError.recordingInProgress
+        try queue.sync {
+            if recorder?.isRecording == true {
+                throw RecorderError.recordingInProgress
+            }
+
+            #if os(iOS)
+            let session = AVAudioSession.sharedInstance()
+            guard session.recordPermission == .granted else {
+                throw RecorderError.microphoneAccessDenied
+            }
+            #if targetEnvironment(simulator)
+            // allowBluetoothHFP is not available on iOS Simulator
+            try session.setCategory(
+                .playAndRecord,
+                mode: .default,
+                options: [.defaultToSpeaker, .allowBluetoothA2DP]
+            )
+            #else
+            try session.setCategory(
+                .playAndRecord,
+                mode: .default,
+                options: [.defaultToSpeaker, .allowBluetoothA2DP, .allowBluetoothHFP]
+            )
+            #endif
+            try session.setActive(true, options: .notifyOthersOnDeactivation)
+            #endif
+            #if os(macOS)
+            guard AVCaptureDevice.authorizationStatus(for: .audio) == .authorized else {
+                throw RecorderError.microphoneAccessDenied
+            }
+            #endif
+
+            let outputURL = try makeOutputURL()
+            let settings: [String: Any] = [
+                AVFormatIDKey: kAudioFormatMPEG4AAC,
+                AVSampleRateKey: 16_000,
+                AVNumberOfChannelsKey: 1,
+                AVEncoderBitRateKey: 16_000
+            ]
+
+            let audioRecorder = try AVAudioRecorder(url: outputURL, settings: settings)
+            audioRecorder.delegate = self
+            audioRecorder.isMeteringEnabled = true
+            audioRecorder.prepareToRecord()
+            audioRecorder.record(forDuration: maxRecordingDuration)
+
+            recorder = audioRecorder
+            currentURL = outputURL
+            stopWorkItem?.cancel()
+            stopWorkItem = nil
+            return outputURL
        }
-
-        #if os(iOS)
-        let session = AVAudioSession.sharedInstance()
-        guard session.recordPermission == .granted else {
-            throw RecorderError.microphoneAccessDenied
-        }
-        #if targetEnvironment(simulator)
-        // allowBluetoothHFP is not available on iOS Simulator
-        try session.setCategory(
-            .playAndRecord,
-            mode: .default,
-            options: [.defaultToSpeaker, .allowBluetoothA2DP]
-        )
-        #else
-        try session.setCategory(
-            .playAndRecord,
-            mode: .default,
-            options: [.defaultToSpeaker, .allowBluetoothA2DP, .allowBluetoothHFP]
-        )
-        #endif
-        try session.setActive(true, options: .notifyOthersOnDeactivation)
-        #endif
-        #if os(macOS)
-        guard AVCaptureDevice.authorizationStatus(for: .audio) == .authorized else {
-            throw RecorderError.microphoneAccessDenied
-        }
-        #endif
-
-        let outputURL = try makeOutputURL()
-        let settings: [String: Any] = [
-            AVFormatIDKey: kAudioFormatMPEG4AAC,
-            AVSampleRateKey: 16_000,
-            AVNumberOfChannelsKey: 1,
-            AVEncoderBitRateKey: 16_000
-        ]
-
-        let audioRecorder = try AVAudioRecorder(url: outputURL, settings: settings)
-        audioRecorder.isMeteringEnabled = true
-        audioRecorder.prepareToRecord()
-        audioRecorder.record(forDuration: maxRecordingDuration)
-
-        recorder = audioRecorder
-        currentURL = outputURL
-        return outputURL
    }

-    func stopRecording() async -> URL? {
-        guard let recorder, recorder.isRecording else {
-            return currentURL
+    func stopRecording(completion: @escaping (URL?) -> Void) {
+        queue.async { [weak self] in
+            guard let self = self, let recorder = self.recorder, recorder.isRecording else {
+                completion(self?.currentURL)
+                return
+            }
+
+            let item = DispatchWorkItem { [weak self] in
+                guard let self = self else { return }
+                recorder.stop()
+                self.cleanupSession()
+                let url = self.currentURL
+                self.recorder = nil
+                self.currentURL = url
+                completion(url)
+            }
+            self.stopWorkItem = item
+            self.queue.asyncAfter(deadline: .now() + self.paddingInterval, execute: item)
        }
-
-        let sessionURL = currentURL
-
-        try? await Task.sleep(nanoseconds: UInt64(paddingInterval * 1_000_000_000))
-
-        recorder.stop()
-
-        // A new session may have started during the sleep — don't touch its state
-        if self.recorder === recorder {
-            cleanupSession()
-            self.recorder = nil
-            currentURL = nil
-        }
-
-        return sessionURL
    }

    func cancelRecording() {
-        if let recorder, recorder.isRecording {
-            recorder.stop()
+        queue.async { [weak self] in
+            guard let self = self else { return }
+            self.stopWorkItem?.cancel()
+            self.stopWorkItem = nil
+            if let recorder = self.recorder, recorder.isRecording {
+                recorder.stop()
+            }
+            self.cleanupSession()
+            if let url = self.currentURL {
+                try? FileManager.default.removeItem(at: url)
+            }
+            self.recorder = nil
+            self.currentURL = nil
        }
-        cleanupSession()
-        if let currentURL {
-            try? FileManager.default.removeItem(at: currentURL)
+    }
+
+    // MARK: - Metering
+
+    func currentAveragePower() -> Float {
+        queue.sync {
+            recorder?.updateMeters()
+            return recorder?.averagePower(forChannel: 0) ?? -160
        }
-        recorder = nil
-        currentURL = nil
    }

    // MARK: - Helpers
@@ -81,7 +81,6 @@
 ///

 import Foundation
-import BitFoundation

 // MARK: - Three-Layer Identity Model

@@ -91,7 +91,6 @@
 ///

 import BitLogger
-import BitFoundation
 import Foundation
 import CryptoKit

@@ -332,15 +331,16 @@ final class SecureIdentityStateManager: SecureIdentityStateManagerProtocol {
    
    func updateSocialIdentity(_ identity: SocialIdentity) {
        queue.async(flags: .barrier) {
-            let previousClaimedNickname = self.cache.socialIdentities[identity.fingerprint]?.claimedNickname
            self.cache.socialIdentities[identity.fingerprint] = identity
            
            // Update nickname index
-            if let previousClaimedNickname,
-               previousClaimedNickname != identity.claimedNickname {
-                self.cache.nicknameIndex[previousClaimedNickname]?.remove(identity.fingerprint)
-                if self.cache.nicknameIndex[previousClaimedNickname]?.isEmpty == true {
-                    self.cache.nicknameIndex.removeValue(forKey: previousClaimedNickname)
+            if let existingIdentity = self.cache.socialIdentities[identity.fingerprint] {
+                // Remove old nickname from index if changed
+                if existingIdentity.claimedNickname != identity.claimedNickname {
+                    self.cache.nicknameIndex[existingIdentity.claimedNickname]?.remove(identity.fingerprint)
+                    if self.cache.nicknameIndex[existingIdentity.claimedNickname]?.isEmpty == true {
+                        self.cache.nicknameIndex.removeValue(forKey: existingIdentity.claimedNickname)
+                    }
                }
            }
            
@@ -532,16 +532,4 @@ final class SecureIdentityStateManager: SecureIdentityStateManagerProtocol {
            return cache.verifiedFingerprints
        }
    }
-
-    var debugNicknameIndex: [String: Set<String>] {
-        queue.sync { cache.nicknameIndex }
-    }
-
-    func debugEphemeralSession(for peerID: PeerID) -> EphemeralIdentity? {
-        queue.sync { ephemeralSessions[peerID] }
-    }
-
-    func debugLastInteraction(for fingerprint: String) -> Date? {
-        queue.sync { cache.lastInteractions[fingerprint] }
-    }
 }
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>AppGroupID</key>
-	<string>$(APP_GROUP_ID)</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -39,12 +37,12 @@
 	<string>bitchat uses Bluetooth to discover and connect with other bitchat users nearby.</string>
 	<key>NSCameraUsageDescription</key>
 	<string>bitchat uses the camera to scan QR codes to verify peers.</string>
-	<key>NSLocationWhenInUseUsageDescription</key>
-	<string>bitchat uses your approximate location to compute local geohash channels for optional public chats. Exact GPS is never shared.</string>
-	<key>NSMicrophoneUsageDescription</key>
-	<string>bitchat uses the microphone to record voice notes that relay across the mesh.</string>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>bitchat lets you pick images from your photo library to share with nearby peers.</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>bitchat uses the microphone to record voice notes that relay across the mesh.</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>bitchat uses your approximate location to compute local geohash channels for optional public chats. Exact GPS is never shared.</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>bluetooth-central</string>
@@ -1,68 +0,0 @@
-//
-// BitchatMessage+Media.swift
-// bitchat
-//
-// This is free and unencumbered software released into the public domain.
-// For more information, see <https://unlicense.org>
-//
-
-import Foundation
-
-extension BitchatMessage {
-    enum Media {
-        case voice(URL)
-        case image(URL)
-
-        var url: URL {
-            switch self {
-            case .voice(let url), .image(let url):
-                return url
-            }
-        }
-    }
-
-    // Cache the directory lookup to avoid repeated FileManager calls during view rendering
-    private struct Cache {
-        let filesDir: URL?
-
-        static let shared = Cache()
-        private init() {
-            do {
-                let base = try FileManager.default.url(for: .applicationSupportDirectory, in: .userDomainMask, appropriateFor: nil, create: true)
-                let filesDir = base.appendingPathComponent("files", isDirectory: true)
-                try FileManager.default.createDirectory(at: filesDir, withIntermediateDirectories: true, attributes: nil)
-                self.filesDir = filesDir
-            } catch {
-                filesDir = nil
-            }
-        }
-    }
-
-    func mediaAttachment(for nickname: String) -> Media? {
-        guard let baseDirectory = Cache.shared.filesDir else { return nil }
-
-        func url(for category: MimeType.Category) -> URL? {
-            guard content.hasPrefix(category.messagePrefix),
-                  let filename = String(content.dropFirst(category.messagePrefix.count)).trimmedOrNilIfEmpty
-            else {
-                return nil
-            }
-
-            // Check outgoing first for sent messages, incoming for received
-            let subdir = sender == nickname ? "\(category.mediaDir)/outgoing" : "\(category.mediaDir)/incoming"
-
-            // Construct URL directly without fileExists check (avoids blocking disk I/O in view body)
-            // Files are checked during playback/display, so missing files fail gracefully
-            let directory = baseDirectory.appendingPathComponent(subdir, isDirectory: true)
-            return directory.appendingPathComponent(filename)
-        }
-
-        if let url = url(for: .audio) {
-            return .voice(url)
-        }
-        if let url = url(for: .image) {
-            return .image(url)
-        }
-        return nil
-    }
-}
@@ -7,7 +7,6 @@
 //

 import Foundation
-import BitFoundation

 /// Represents a user-visible message in the BitChat system.
 /// Handles both broadcast messages and private encrypted messages,
@@ -339,7 +338,7 @@ extension BitchatMessage {
 extension Array where Element == BitchatMessage {
    /// Filters out empty ones and deduplicate by ID while preserving order (from oldest to newest)
    func cleanedAndDeduped() -> [Element] {
-        let arr = filter { $0.content.trimmed.isEmpty == false }
+        let arr = filter { $0.content.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == false }
        guard arr.count > 1 else {
            return arr
        }
@@ -7,7 +7,6 @@
 //

 import Foundation
-import BitFoundation

 /// The core packet structure for all BitChat protocol messages.
 /// Encapsulates all data needed for routing through the mesh network,
@@ -23,9 +22,8 @@ struct BitchatPacket: Codable {
    var signature: Data?
    var ttl: UInt8
    var route: [Data]?
-    var isRSR: Bool
    
-    init(type: UInt8, senderID: Data, recipientID: Data?, timestamp: UInt64, payload: Data, signature: Data?, ttl: UInt8, version: UInt8 = 1, route: [Data]? = nil, isRSR: Bool = false) {
+    init(type: UInt8, senderID: Data, recipientID: Data?, timestamp: UInt64, payload: Data, signature: Data?, ttl: UInt8, version: UInt8 = 1, route: [Data]? = nil) {
        self.version = version
        self.type = type
        self.senderID = senderID
@@ -35,11 +33,10 @@ struct BitchatPacket: Codable {
        self.signature = signature
        self.ttl = ttl
        self.route = route
-        self.isRSR = isRSR
    }
    
    // Convenience initializer for new binary format
-    init(type: UInt8, ttl: UInt8, senderID: PeerID, payload: Data, isRSR: Bool = false) {
+    init(type: UInt8, ttl: UInt8, senderID: PeerID, payload: Data) {
        self.version = 1
        self.type = type
        // Convert hex string peer ID to binary data (8 bytes)
@@ -59,7 +56,6 @@ struct BitchatPacket: Codable {
        self.signature = nil
        self.ttl = ttl
        self.route = nil
-        self.isRSR = isRSR
    }
    
    var data: Data? {
@@ -89,8 +85,7 @@ struct BitchatPacket: Codable {
            signature: nil, // Remove signature for signing
            ttl: 0, // Use fixed TTL=0 for signing to ensure relay compatibility
            version: version,
-            route: route,
-            isRSR: false // RSR flag is mutable and not part of the signature
+            route: route
        )
        return BinaryProtocol.encode(unsignedPacket)
    }
@@ -1,6 +1,5 @@
 import Foundation
 import CoreBluetooth
-import BitFoundation

 /// Represents a peer in the BitChat network with all associated metadata
 struct BitchatPeer: Equatable {
@@ -1,27 +1,15 @@
 //
 // PeerID.swift
-// BitFoundation
+// bitchat
 //
 // This is free and unencumbered software released into the public domain.
 // For more information, see <https://unlicense.org>
 //

-import struct Foundation.Data
-import struct Foundation.CharacterSet
+import Foundation

-public struct PeerID: Equatable, Hashable, Sendable {
-    enum Constants {
-        /// 16
-        static let nostrConvKeyPrefixLength = 16
-        /// 8
-        static let nostrShortKeyDisplayLength = 8
-        /// 64
-        fileprivate static let maxIDLength = 64
-        /// 16
-        fileprivate static let hexIDLength = 16 // 8 bytes = 16 hex chars
-    }
-
-    public enum Prefix: String, CaseIterable, Sendable {
+struct PeerID: Equatable, Hashable {
+    enum Prefix: String, CaseIterable {
        /// When no prefix is provided
        case empty = ""
        /// `"mesh:"`
@@ -35,15 +23,15 @@ public struct PeerID: Equatable, Hashable, Sendable {
        /// `"nostr:"` (+ 8 characters hex)
        case geoChat = "nostr:"
    }
-
-    public let prefix: Prefix
-
+    
+    let prefix: Prefix
+    
    /// Returns the actual value without any prefix
-    public let bare: String
-
+    let bare: String
+    
    /// Returns the full `id` value by combining `(prefix + bare)`
-    public var id: String { prefix.rawValue + bare }
-
+    var id: String { prefix.rawValue + bare }
+    
    // Private so the callers have to go through a convenience init
    private init(prefix: Prefix, bare: any StringProtocol) {
        self.prefix = prefix
@@ -53,17 +41,17 @@ public struct PeerID: Equatable, Hashable, Sendable {

 // MARK: - Convenience Inits

-public extension PeerID {
+extension PeerID {
    /// Convenience init to create GeoDM PeerID by appending `"nostr_"` to the first 16 characters of `pubKey`
    init(nostr_ pubKey: String) {
-        self.init(prefix: .geoDM, bare: pubKey.prefix(Constants.nostrConvKeyPrefixLength))
+        self.init(prefix: .geoDM, bare: pubKey.prefix(TransportConfig.nostrConvKeyPrefixLength))
    }
-
+    
    /// Convenience init to create GeoChat PeerID by appending `"nostr:"` to the first 8 characters of `pubKey`
    init(nostr pubKey: String) {
-        self.init(prefix: .geoChat, bare: pubKey.prefix(Constants.nostrShortKeyDisplayLength))
+        self.init(prefix: .geoChat, bare: pubKey.prefix(TransportConfig.nostrShortKeyDisplayLength))
    }
-
+    
    /// Convenience init to create PeerID from String/Substring by splitting it into prefix and bare parts
    init(str: any StringProtocol) {
        if let prefix = Prefix.allCases.first(where: { $0 != .empty && str.hasPrefix($0.rawValue) }) {
@@ -72,23 +60,23 @@ public extension PeerID {
            self.init(prefix: .empty, bare: str)
        }
    }
-
+    
    /// Convenience init to handle `Optional<String>`
    init?(str: (any StringProtocol)?) {
        guard let str else { return nil }
        self.init(str: str)
    }
-
+    
    /// Convenience init to create PeerID by converting Data to String
    init?(data: Data) {
        self.init(str: String(data: data, encoding: .utf8))
    }
-
+    
    /// Convenience init to "hide" hex-encoding implementation detail
    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 }
@@ -98,12 +86,12 @@ public extension PeerID {

 // MARK: - Noise Public Key Helpers

-public extension PeerID {
+extension PeerID {
    /// Derive the stable 16-hex peer ID from a Noise static public key
    init(publicKey: Data) {
        self.init(str: publicKey.sha256Fingerprint().prefix(16))
    }
-
+    
    /// Returns a 16-hex short peer ID derived from a 64-hex Noise public key if needed
    func toShort() -> PeerID {
        if let noiseKey {
@@ -116,11 +104,11 @@ public extension PeerID {
 // MARK: - Codable

 extension PeerID: Codable {
-    public init(from decoder: any Decoder) throws {
+    init(from decoder: any Decoder) throws {
        self.init(str: try decoder.singleValueContainer().decode(String.self))
    }
-
-    public func encode(to encoder: any Encoder) throws {
+    
+    func encode(to encoder: any Encoder) throws {
        var container = encoder.singleValueContainer()
        try container.encode(id)
    }
@@ -128,27 +116,27 @@ extension PeerID: Codable {

 // MARK: - Helpers

-public extension PeerID {
+extension PeerID {
    var isEmpty: Bool {
        id.isEmpty
    }
-
+    
    /// Returns true if `id` starts with "`nostr:`"
    var isGeoChat: Bool {
        prefix == .geoChat
    }
-
+    
    /// Returns true if `id` starts with "`nostr_`"
    var isGeoDM: Bool {
        prefix == .geoDM
    }
-
+    
    func toPercentEncoded() -> String {
        id.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? id
    }
 }

-public 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 }
@@ -164,45 +152,50 @@ public extension PeerID {

 // MARK: - Validation

-public extension PeerID {
+extension PeerID {
+    private enum Constants {
+        static let maxIDLength = 64
+        static let hexIDLength = 16 // 8 bytes = 16 hex chars
+    }
+    
    /// Validates a peer ID from any source (short 16-hex, full 64-hex, or internal alnum/-/_ up to 64)
    var isValid: Bool {
        if prefix != .empty {
            return PeerID(str: bare).isValid
        }
-
+        
        // Accept short routing IDs (exact 16-hex) or Full Noise key hex (exact 64-hex)
        if isShort || isNoiseKeyHex {
            return true
        }
-
+        
        // If length equals short or full but isn't valid hex, reject
        if id.count == Constants.hexIDLength || id.count == Constants.maxIDLength {
            return false
        }
-
+        
        // Internal format: alphanumeric + dash/underscore up to 63 (not 16 or 64)
        let validCharset = CharacterSet.alphanumerics.union(CharacterSet(charactersIn: "-_"))
        return !id.isEmpty &&
                id.count < Constants.maxIDLength &&
                id.rangeOfCharacter(from: validCharset.inverted) == nil
    }
-
+    
    /// Returns true if the `bare` id is all hex
    var isHex: Bool {
        bare.allSatisfy { $0.isHexDigit }
    }
-
+    
    /// Short routing IDs (exact 16-hex)
    var isShort: Bool {
        bare.count == Constants.hexIDLength && isHex
    }
-
+    
    /// Full Noise key hex (exact 64-hex)
    var isNoiseKeyHex: Bool {
        noiseKey != nil
    }
-
+    
    /// Full Noise key (exact 64-hex) as Data
    var noiseKey: Data? {
        guard bare.count == Constants.maxIDLength else { return nil }
@@ -213,7 +206,7 @@ public extension PeerID {
 // MARK: - Comparable

 extension PeerID: Comparable {
-    public static func < (lhs: PeerID, rhs: PeerID) -> Bool {
+    static func < (lhs: PeerID, rhs: PeerID) -> Bool {
        lhs.id < rhs.id
    }
 }
@@ -222,7 +215,7 @@ extension PeerID: Comparable {

 extension PeerID: CustomStringConvertible {
    /// So it returns the actual `id` like before even inside another String
-    public var description: String {
+    var description: String {
        id
    }
 }
@@ -7,7 +7,6 @@
 //

 import Foundation
-import BitFoundation

 struct ReadReceipt: Codable {
    let originalMessageID: String
@@ -9,16 +9,12 @@ struct RequestSyncPacket {
    let m: UInt32
    let data: Data
    let types: SyncTypeFlags?
-    let sinceTimestamp: UInt64?
-    let fragmentIdFilter: String?

-    init(p: Int, m: UInt32, data: Data, types: SyncTypeFlags? = nil, sinceTimestamp: UInt64? = nil, fragmentIdFilter: String? = nil) {
+    init(p: Int, m: UInt32, data: Data, types: SyncTypeFlags? = nil) {
        self.p = p
        self.m = m
        self.data = data
        self.types = types
-        self.sinceTimestamp = sinceTimestamp
-        self.fragmentIdFilter = fragmentIdFilter
    }

    func encode() -> Data {
@@ -40,24 +36,15 @@ struct RequestSyncPacket {
        if let typesData = types?.toData() {
            putTLV(0x04, typesData)
        }
-        if let ts = sinceTimestamp {
-            var tsBE = ts.bigEndian
-            putTLV(0x05, withUnsafeBytes(of: &tsBE) { Data($0) })
-        }
-        if let fid = fragmentIdFilter, let fidData = fid.data(using: .utf8) {
-            putTLV(0x06, fidData)
-        }
        return out
    }
-    
+
    static func decode(from data: Data, maxAcceptBytes: Int = 1024) -> RequestSyncPacket? {
        var off = 0
        var p: Int? = nil
        var m: UInt32? = nil
        var payload: Data? = nil
        var types: SyncTypeFlags? = nil
-        var sinceTimestamp: UInt64? = nil
-        var fragmentIdFilter: String? = nil

        while off + 3 <= data.count {
            let t = Int(data[off]); off += 1
@@ -81,22 +68,12 @@ struct RequestSyncPacket {
                if let decoded = SyncTypeFlags.decode(v) {
                    types = decoded
                }
-            case 0x05:
-                if v.count == 8 {
-                    var ts: UInt64 = 0
-                    for b in v { ts = (ts << 8) | UInt64(b) }
-                    sinceTimestamp = ts
-                }
-            case 0x06:
-                if let fid = String(data: v, encoding: .utf8) {
-                    fragmentIdFilter = fid
-                }
            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, sinceTimestamp: sinceTimestamp, fragmentIdFilter: fragmentIdFilter)
+        return RequestSyncPacket(p: pp, m: mm, data: dd, types: types)
    }
 }
@@ -78,7 +78,6 @@
 ///

 import BitLogger
-import BitFoundation
 import Foundation
 import CryptoKit

@@ -166,23 +165,19 @@ final class NoiseCipherState {
    // MARK: - Sliding Window Replay Protection
    
    /// Check if nonce is valid for replay protection
-    /// BCH-01-010: Use safe arithmetic to prevent integer overflow
    private func isValidNonce(_ receivedNonce: UInt64) -> Bool {
-        // Safe overflow check: instead of (receivedNonce + WINDOW_SIZE <= highest)
-        // use (highest >= WINDOW_SIZE && receivedNonce <= highest - WINDOW_SIZE)
-        let windowSize = UInt64(Self.REPLAY_WINDOW_SIZE)
-        if highestReceivedNonce >= windowSize && receivedNonce <= highestReceivedNonce - windowSize {
+        if receivedNonce + UInt64(Self.REPLAY_WINDOW_SIZE) <= highestReceivedNonce {
            return false  // Too old, outside window
        }
-
+        
        if receivedNonce > highestReceivedNonce {
            return true  // Always accept newer nonces
        }
-
+        
        let offset = Int(highestReceivedNonce - receivedNonce)
        let byteIndex = offset / 8
        let bitIndex = offset % 8
-
+        
        return (replayWindow[byteIndex] & (1 << bitIndex)) == 0  // Not yet seen
    }
    
@@ -352,20 +347,16 @@ final class NoiseCipherState {
        
        do {
            let plaintext = try ChaChaPoly.open(sealedBox, using: key, authenticating: associatedData)
-
-            // BCH-01-010: Atomic nonce state update
-            // Both replay window marking and nonce increment must complete together
-            // to prevent state desynchronization. We perform both after successful
-            // decryption only, ensuring state consistency on any failure path.
+            
            if useExtractedNonce {
+                // Mark nonce as seen after successful decryption
                markNonceAsSeen(decryptionNonce)
            }
            nonce += 1
-
            return plaintext
        } catch {
-            // Decryption failed - nonce state remains unchanged (atomic rollback)
            SecureLogger.debug("Decrypt failed: \(error) for nonce \(decryptionNonce)")
+            // Log authentication failures with nonce info
            SecureLogger.error("Decryption failed at nonce \(decryptionNonce)", category: .encryption)
            throw error
        }
@@ -385,16 +376,6 @@ final class NoiseCipherState {
            replayWindow[i] = 0
        }
    }
-
-    #if DEBUG
-    func setNonceForTesting(_ nonce: UInt64) {
-        self.nonce = nonce
-    }
-
-    func extractNonceFromCiphertextPayloadForTesting(_ combinedPayload: Data) throws -> (nonce: UInt64, ciphertext: Data)? {
-        try extractNonceFromCiphertextPayload(combinedPayload)
-    }
-    #endif
 }

 // MARK: - Symmetric State
@@ -474,36 +455,13 @@ final class NoiseSymmetricState {
        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)
-
-        // BCH-01-010: Clear symmetric state after split per Noise spec
-        // The chaining key and hash should not be retained after handshake completes
-        clearSensitiveData()
-
+        
        return (c1, c2)
    }
-
-    /// BCH-01-010: Securely clear sensitive cryptographic state
-    /// Called after split() to clear chaining key and hash per Noise spec
-    func clearSensitiveData() {
-        // Clear chaining key by overwriting with zeros
-        let chainingKeyCount = chainingKey.count
-        chainingKey = Data(repeating: 0, count: chainingKeyCount)
-
-        // Clear hash by overwriting with zeros
-        let hashCount = hash.count
-        hash = Data(repeating: 0, count: hashCount)
-
-        // Clear the internal cipher state
-        cipherState.clearSensitiveData()
-    }
-
-    deinit {
-        clearSensitiveData()
-    }
-
+    
    // HKDF implementation
    private func hkdf(chainingKey: Data, inputKeyMaterial: Data, numOutputs: Int) -> [Data] {
        let tempKey = HMAC<SHA256>.authenticationCode(for: inputKeyMaterial, using: SymmetricKey(data: chainingKey))
@@ -533,7 +491,7 @@ final class NoiseSymmetricState {
 final class NoiseHandshakeState {
    private let role: NoiseRole
    private let pattern: NoisePattern
-    private let keychain: SecureMemoryCleaner
+    private let keychain: KeychainManagerProtocol
    private var symmetricState: NoiseSymmetricState
    
    // Keys
@@ -556,7 +514,7 @@ final class NoiseHandshakeState {
    init(
        role: NoiseRole,
        pattern: NoisePattern,
-        keychain: SecureMemoryCleaner,
+        keychain: KeychainManagerProtocol,
        localStaticKey: Curve25519.KeyAgreement.PrivateKey? = nil,
        remoteStaticKey: Curve25519.KeyAgreement.PublicKey? = nil,
        prologue: Data = Data(),
@@ -596,9 +554,8 @@ final class NoiseHandshakeState {
            break // No pre-message keys
        case .IK, .NK:
            if role == .initiator, let remoteStatic = remoteStaticPublic {
+                _ = symmetricState.getHandshakeHash()
                symmetricState.mixHash(remoteStatic.rawRepresentation)
-            } else if role == .responder, let localStatic = localStaticPublic {
-                symmetricState.mixHash(localStatic.rawRepresentation)
            }
        }
    }
@@ -850,20 +807,16 @@ final class NoiseHandshakeState {
        return currentPattern >= messagePatterns.count
    }
    
-    func getTransportCiphers(useExtractedNonce: Bool) throws -> (send: NoiseCipherState, receive: NoiseCipherState, handshakeHash: Data) {
+    func getTransportCiphers(useExtractedNonce: Bool) throws -> (send: NoiseCipherState, receive: NoiseCipherState) {
        guard isHandshakeComplete() else {
            throw NoiseError.handshakeNotComplete
        }
-
-        // BCH-01-010: Capture handshake hash BEFORE split() clears symmetric state
-        let finalHandshakeHash = symmetricState.getHandshakeHash()
-
+        
        let (c1, c2) = symmetricState.split(useExtractedNonce: useExtractedNonce)
-
+        
        // Initiator uses c1 for sending, c2 for receiving
        // Responder uses c2 for sending, c1 for receiving
-        let ciphers = role == .initiator ? (c1, c2) : (c2, c1)
-        return (send: ciphers.0, receive: ciphers.1, handshakeHash: finalHandshakeHash)
+        return role == .initiator ? (c1, c2) : (c2, c1)
    }
    
    func getRemoteStaticPublicKey() -> Curve25519.KeyAgreement.PublicKey? {
@@ -873,20 +826,6 @@ final class NoiseHandshakeState {
    func getHandshakeHash() -> Data {
        return symmetricState.getHandshakeHash()
    }
-
-    #if DEBUG
-    func performDHOperationForTesting(_ pattern: NoiseMessagePattern) throws {
-        try performDHOperation(pattern)
-    }
-
-    func setCurrentPatternForTesting(_ currentPattern: Int) {
-        self.currentPattern = currentPattern
-    }
-
-    func setRemoteEphemeralPublicKeyForTesting(_ key: Curve25519.KeyAgreement.PublicKey?) {
-        self.remoteEphemeralPublic = key
-    }
-    #endif
 }

 // MARK: - Pattern Extensions
@@ -924,7 +863,7 @@ extension NoisePattern {

 // MARK: - Errors

-public enum NoiseError: Error {
+enum NoiseError: Error {
    case uninitializedCipher
    case invalidCiphertext
    case handshakeComplete
@@ -938,47 +877,22 @@ public enum NoiseError: Error {
    case nonceExceeded
 }

-// MARK: - Constant-Time Operations
-
-/// BCH-01-010: Constant-time comparison to prevent timing side-channel attacks
-/// This function compares two Data objects in constant time, preventing
-/// information leakage via timing analysis.
-private func constantTimeCompare(_ a: Data, _ b: Data) -> Bool {
-    guard a.count == b.count else { return false }
-
-    var result: UInt8 = 0
-    for i in 0..<a.count {
-        result |= a[a.startIndex.advanced(by: i)] ^ b[b.startIndex.advanced(by: i)]
-    }
-    return result == 0
-}
-
-/// BCH-01-010: Constant-time check if all bytes are zero
-private func constantTimeIsZero(_ data: Data) -> Bool {
-    var result: UInt8 = 0
-    for byte in data {
-        result |= byte
-    }
-    return result == 0
-}
-
 // MARK: - Key Validation

 extension NoiseHandshakeState {
    /// Validate a Curve25519 public key
    /// Checks for weak/invalid keys that could compromise security
-    /// BCH-01-010: Uses constant-time operations to prevent timing side-channels
    static func validatePublicKey(_ keyData: Data) throws -> Curve25519.KeyAgreement.PublicKey {
        // Check key length
        guard keyData.count == 32 else {
            throw NoiseError.invalidPublicKey
        }
-
-        // BCH-01-010: Constant-time check for all-zero key (point at infinity)
-        if constantTimeIsZero(keyData) {
+        
+        // Check for all-zero key (point at infinity)
+        if keyData.allSatisfy({ $0 == 0 }) {
            throw NoiseError.invalidPublicKey
        }
-
+        
        // Check for low-order points that could enable small subgroup attacks
        // These are the known bad points for Curve25519
        let lowOrderPoints: [Data] = [
@@ -999,21 +913,13 @@ extension NoiseHandshakeState {
                  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
                  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff])  // Another bad point
        ]
-
-        // BCH-01-010: Constant-time check against known bad points
-        // We check all points and accumulate matches to avoid early exit timing leaks
-        var foundBadPoint = false
-        for badPoint in lowOrderPoints {
-            if constantTimeCompare(keyData, badPoint) {
-                foundBadPoint = true
-            }
-        }
-
-        if foundBadPoint {
+        
+        // Check against known bad points
+        if lowOrderPoints.contains(keyData) {
            SecureLogger.warning("Low-order point detected", category: .security)
            throw NoiseError.invalidPublicKey
        }
-
+        
        // Try to create the key - CryptoKit will validate curve points internally
        do {
            let publicKey = try Curve25519.KeyAgreement.PublicKey(rawRepresentation: keyData)
@@ -7,10 +7,9 @@
 //

 import BitLogger
-import BitFoundation
 import Foundation

-public final class NoiseRateLimiter {
+final class NoiseRateLimiter {
    private var handshakeTimestamps: [PeerID: [Date]] = [:]
    private var messageTimestamps: [PeerID: [Date]] = [:]
    
@@ -19,10 +18,8 @@ public final class NoiseRateLimiter {
    private var globalMessageTimestamps: [Date] = []
    
    private let queue = DispatchQueue(label: "chat.bitchat.noise.ratelimit", attributes: .concurrent)
-
-    public init() {}
-
-    public func allowHandshake(from peerID: PeerID) -> Bool {
+    
+    func allowHandshake(from peerID: PeerID) -> Bool {
        return queue.sync(flags: .barrier) {
            let now = Date()
            let oneMinuteAgo = now.addingTimeInterval(-60)
@@ -51,7 +48,7 @@ public final class NoiseRateLimiter {
        }
    }
    
-    public func allowMessage(from peerID: PeerID) -> Bool {
+    func allowMessage(from peerID: PeerID) -> Bool {
        return queue.sync(flags: .barrier) {
            let now = Date()
            let oneSecondAgo = now.addingTimeInterval(-1)
@@ -87,7 +84,7 @@ public final class NoiseRateLimiter {
        }
    }

-    public func resetAll() {
+    func resetAll() {
        queue.async(flags: .barrier) {
            self.handshakeTimestamps.removeAll()
            self.messageTimestamps.removeAll()
@@ -8,7 +8,7 @@

 import Foundation

-public enum NoiseSecurityConstants {
+enum NoiseSecurityConstants {
    // Maximum message size to prevent memory exhaustion
    static let maxMessageSize = 65535 // 64KB as per Noise spec
    
@@ -28,10 +28,10 @@ public enum NoiseSecurityConstants {
    static let maxSessionsPerPeer = 3
    
    // Rate limiting
-    public static let maxHandshakesPerMinute = 10
-    public static let maxMessagesPerSecond = 100
+    static let maxHandshakesPerMinute = 10
+    static let maxMessagesPerSecond = 100
    
    // Global rate limiting (across all peers)
-    public static let maxGlobalHandshakesPerMinute = 30
-    public static let maxGlobalMessagesPerSecond = 500
+    static let maxGlobalHandshakesPerMinute = 30
+    static let maxGlobalMessagesPerSecond = 500
 }
@@ -8,7 +8,7 @@

 import Foundation

-public enum NoiseSecurityError: Error {
+enum NoiseSecurityError: Error {
    case sessionExpired
    case sessionExhausted
    case messageTooLarge
@@ -8,15 +8,15 @@

 import Foundation

-public struct NoiseSecurityValidator {
+struct NoiseSecurityValidator {
    
    /// Validate message size
-    public static func validateMessageSize(_ data: Data) -> Bool {
+    static func validateMessageSize(_ data: Data) -> Bool {
        return data.count <= NoiseSecurityConstants.maxMessageSize
    }
    
    /// Validate handshake message size
-    public static func validateHandshakeMessageSize(_ data: Data) -> Bool {
+    static func validateHandshakeMessageSize(_ data: Data) -> Bool {
        return data.count <= NoiseSecurityConstants.maxHandshakeMessageSize
    }
 }
@@ -9,12 +9,11 @@
 import BitLogger
 import Foundation
 import CryptoKit
-import BitFoundation

-public class NoiseSession {
+class NoiseSession {
    let peerID: PeerID
    let role: NoiseRole
-    private let keychain: SecureMemoryCleaner
+    private let keychain: KeychainManagerProtocol
    private var state: NoiseSessionState = .uninitialized
    private var handshakeState: NoiseHandshakeState?
    private var sendCipher: NoiseCipherState?
@@ -34,7 +33,7 @@ public class NoiseSession {
    init(
        peerID: PeerID,
        role: NoiseRole,
-        keychain: SecureMemoryCleaner,
+        keychain: KeychainManagerProtocol,
        localStaticKey: Curve25519.KeyAgreement.PrivateKey,
        remoteStaticKey: Curve25519.KeyAgreement.PublicKey? = nil
    ) {
@@ -103,23 +102,23 @@ public class NoiseSession {
            
            // Check if handshake is complete
            if handshake.isHandshakeComplete() {
-                // Get transport ciphers and handshake hash (hash captured before split clears state)
-                let (send, receive, hash) = try handshake.getTransportCiphers(useExtractedNonce: true)
+                // Get transport ciphers
+                let (send, receive) = try handshake.getTransportCiphers(useExtractedNonce: true)
                sendCipher = send
                receiveCipher = receive
-
+                
                // Store remote static key
                remoteStaticPublicKey = handshake.getRemoteStaticPublicKey()
-
+                
                // Store handshake hash for channel binding
-                handshakeHash = hash
-
+                handshakeHash = handshake.getHandshakeHash()
+                
                state = .established
                handshakeState = nil // Clear handshake state
-
+                
                SecureLogger.debug("NoiseSession[\(peerID)]: Handshake complete (no response needed), transitioning to established")
                SecureLogger.info(.handshakeCompleted(peerID: peerID.id))
-
+                
                return nil
            } else {
                // Generate response
@@ -129,20 +128,20 @@ public class NoiseSession {
                
                // Check if handshake is complete after writing
                if handshake.isHandshakeComplete() {
-                    // Get transport ciphers and handshake hash (hash captured before split clears state)
-                    let (send, receive, hash) = try handshake.getTransportCiphers(useExtractedNonce: true)
+                    // Get transport ciphers
+                    let (send, receive) = try handshake.getTransportCiphers(useExtractedNonce: true)
                    sendCipher = send
                    receiveCipher = receive
-
+                    
                    // Store remote static key
                    remoteStaticPublicKey = handshake.getRemoteStaticPublicKey()
-
+                    
                    // Store handshake hash for channel binding
-                    handshakeHash = hash
-
+                    handshakeHash = handshake.getHandshakeHash()
+                    
                    state = .established
                    handshakeState = nil // Clear handshake state
-
+                    
                    SecureLogger.debug("NoiseSession[\(peerID)]: Handshake complete after writing response, transitioning to established")
                    SecureLogger.info(.handshakeCompleted(peerID: peerID.id))
                }
@@ -182,7 +181,7 @@ public class NoiseSession {
        }
    }
    
-    public func isEstablished() -> Bool {
+    func isEstablished() -> Bool {
        return sessionQueue.sync {
            if case .established = state {
                return true
@@ -217,8 +216,8 @@ public class NoiseSession {
            sentHandshakeMessages.removeAll()
            
            // Clear handshake hash
-            if handshakeHash != nil {
-                keychain.secureClear(&handshakeHash!)
+            if var hash = handshakeHash {
+                keychain.secureClear(&hash)
            }
            handshakeHash = nil
            
@@ -6,7 +6,7 @@
 // For more information, see <https://unlicense.org>
 //

-public enum NoiseSessionError: Error, Equatable {
+enum NoiseSessionError: Error, Equatable {
    case invalidState
    case notEstablished
    case sessionNotFound
@@ -9,53 +9,31 @@
 import BitLogger
 import CryptoKit
 import Foundation
-import BitFoundation

-public final class NoiseSessionManager {
+final class NoiseSessionManager {
    private var sessions: [PeerID: NoiseSession] = [:]
    private let localStaticKey: Curve25519.KeyAgreement.PrivateKey
-    private let keychain: SecureMemoryCleaner
-    private let sessionFactory: (PeerID, NoiseRole) -> NoiseSession
+    private let keychain: KeychainManagerProtocol
    private let managerQueue = DispatchQueue(label: "chat.bitchat.noise.manager", attributes: .concurrent)
    
    // Callbacks
-    public var onSessionEstablished: ((PeerID, Curve25519.KeyAgreement.PublicKey) -> Void)?
+    var onSessionEstablished: ((PeerID, Curve25519.KeyAgreement.PublicKey) -> Void)?
    var onSessionFailed: ((PeerID, Error) -> Void)?
    
-    public init(localStaticKey: Curve25519.KeyAgreement.PrivateKey, keychain: SecureMemoryCleaner) {
+    init(localStaticKey: Curve25519.KeyAgreement.PrivateKey, keychain: KeychainManagerProtocol) {
        self.localStaticKey = localStaticKey
        self.keychain = keychain
-        self.sessionFactory = { peerID, role in
-            SecureNoiseSession(
-                peerID: peerID,
-                role: role,
-                keychain: keychain,
-                localStaticKey: localStaticKey
-            )
-        }
    }
-
-    #if DEBUG
-    init(
-        localStaticKey: Curve25519.KeyAgreement.PrivateKey,
-        keychain: SecureMemoryCleaner,
-        sessionFactory: @escaping (PeerID, NoiseRole) -> NoiseSession
-    ) {
-        self.localStaticKey = localStaticKey
-        self.keychain = keychain
-        self.sessionFactory = sessionFactory
-    }
-    #endif
    
    // MARK: - Session Management
    
-    public func getSession(for peerID: PeerID) -> NoiseSession? {
+    func getSession(for peerID: PeerID) -> NoiseSession? {
        return managerQueue.sync {
            return sessions[peerID]
        }
    }
    
-    public func removeSession(for peerID: PeerID) {
+    func removeSession(for peerID: PeerID) {
        managerQueue.sync(flags: .barrier) {
            if let session = sessions.removeValue(forKey: peerID) {
                session.reset() // Clear sensitive data before removing
@@ -63,7 +41,7 @@ public final class NoiseSessionManager {
        }
    }

-    public func removeAllSessions() {
+    func removeAllSessions() {
        managerQueue.sync(flags: .barrier) {
            for (_, session) in sessions {
                session.reset()
@@ -74,7 +52,7 @@ public final class NoiseSessionManager {
    
    // MARK: - Handshake Helpers
    
-    public func initiateHandshake(with peerID: PeerID) throws -> Data {
+    func initiateHandshake(with peerID: PeerID) throws -> Data {
        return try managerQueue.sync(flags: .barrier) {
            // Check if we already have an established session
            if let existingSession = sessions[peerID], existingSession.isEstablished() {
@@ -88,7 +66,12 @@ public final class NoiseSessionManager {
            }
            
            // Create new initiator session
-            let session = sessionFactory(peerID, .initiator)
+            let session = SecureNoiseSession(
+                peerID: peerID,
+                role: .initiator,
+                keychain: keychain,
+                localStaticKey: localStaticKey
+            )
            sessions[peerID] = session
            
            do {
@@ -103,7 +86,7 @@ public final class NoiseSessionManager {
        }
    }
    
-    public func handleIncomingHandshake(from peerID: PeerID, message: Data) throws -> Data? {
+    func handleIncomingHandshake(from peerID: PeerID, message: Data) throws -> Data? {
        // Process everything within the synchronized block to prevent race conditions
        return try managerQueue.sync(flags: .barrier) {
            var shouldCreateNew = false
@@ -134,7 +117,12 @@ public final class NoiseSessionManager {
            // Get or create session
            let session: NoiseSession
            if shouldCreateNew {
-                let newSession = sessionFactory(peerID, .responder)
+                let newSession = SecureNoiseSession(
+                    peerID: peerID,
+                    role: .responder,
+                    keychain: keychain,
+                    localStaticKey: localStaticKey
+                )
                sessions[peerID] = newSession
                session = newSession
            } else {
@@ -173,7 +161,7 @@ public final class NoiseSessionManager {
    
    // MARK: - Encryption/Decryption
    
-    public func encrypt(_ plaintext: Data, for peerID: PeerID) throws -> Data {
+    func encrypt(_ plaintext: Data, for peerID: PeerID) throws -> Data {
        guard let session = getSession(for: peerID) else {
            throw NoiseSessionError.sessionNotFound
        }
@@ -181,7 +169,7 @@ public final class NoiseSessionManager {
        return try session.encrypt(plaintext)
    }
    
-    public func decrypt(_ ciphertext: Data, from peerID: PeerID) throws -> Data {
+    func decrypt(_ ciphertext: Data, from peerID: PeerID) throws -> Data {
        guard let session = getSession(for: peerID) else {
            throw NoiseSessionError.sessionNotFound
        }
@@ -191,13 +179,13 @@ public final class NoiseSessionManager {
    
    // MARK: - Key Management
    
-    public func getRemoteStaticKey(for peerID: PeerID) -> Curve25519.KeyAgreement.PublicKey? {
+    func getRemoteStaticKey(for peerID: PeerID) -> Curve25519.KeyAgreement.PublicKey? {
        return getSession(for: peerID)?.getRemoteStaticPublicKey()
    }
    
    // MARK: - Session Rekeying
    
-    public func getSessionsNeedingRekey() -> [(peerID: PeerID, needsRekey: Bool)] {
+    func getSessionsNeedingRekey() -> [(peerID: PeerID, needsRekey: Bool)] {
        return managerQueue.sync {
            var needingRekey: [(peerID: PeerID, needsRekey: Bool)] = []
            
@@ -213,7 +201,7 @@ public final class NoiseSessionManager {
        }
    }
    
-    public func initiateRekey(for peerID: PeerID) throws {
+    func initiateRekey(for peerID: PeerID) throws {
        // Remove old session
        removeSession(for: peerID)
        
@@ -10,7 +10,7 @@ import Foundation

 final class SecureNoiseSession: NoiseSession {
    private(set) var messageCount: UInt64 = 0
-    private var sessionStartTime = Date()
+    private let sessionStartTime = Date()
    private(set) var lastActivityTime = Date()
    
    override func encrypt(_ plaintext: Data) throws -> Data {
@@ -77,9 +77,5 @@ final class SecureNoiseSession: NoiseSession {
    func setMessageCountForTesting(_ count: UInt64) {
        messageCount = count
    }
-
-    func setSessionStartTimeForTesting(_ date: Date) {
-        sessionStartTime = date
-    }
    #endif
 }
@@ -1,37 +1,38 @@
 import Foundation

 /// Bech32 encoding for Nostr (minimal implementation)
-public enum Bech32 {
+enum Bech32 {
    private static let charset = "qpzry9x8gf2tvdw0s3jn54khce6mua7l"
    private static let generator = [0x3b6a57b2, 0x26508e6d, 0x1ea119fa, 0x3d4233dd, 0x2a1462b3]
-
-    public static func encode(hrp: String, data: Data) throws -> String {
+    
+    static func encode(hrp: String, data: Data) throws -> String {
        let values = convertBits(from: 8, to: 5, pad: true, data: Array(data))
        let checksum = createChecksum(hrp: hrp, values: values)
        let combined = values + checksum
-
-        return hrp + "1" + combined.map {
+        
+        return hrp + "1" + combined.map { 
            let index = charset.index(charset.startIndex, offsetBy: Int($0))
            return String(charset[index])
        }.joined()
    }
-
-    public static func decode(_ bech32String: String) throws -> (hrp: String, data: Data) {
+    
+    static func decode(_ bech32String: String) throws -> (hrp: String, data: Data) {
+        // Find the last occurrence of '1'
        guard let separatorIndex = bech32String.lastIndex(of: "1") else {
            throw Bech32Error.invalidFormat
        }
-
+        
        let hrp = String(bech32String[..<separatorIndex])
-
+        
        // Validate HRP contains only ASCII characters
        for char in hrp {
            guard char.asciiValue != nil else {
                throw Bech32Error.invalidCharacter
            }
        }
-
+        
        let dataString = String(bech32String[bech32String.index(after: separatorIndex)...])
-
+        
        // Convert characters to values
        var values = [UInt8]()
        for char in dataString {
@@ -40,84 +41,84 @@ public enum Bech32 {
            }
            values.append(UInt8(charset.distance(from: charset.startIndex, to: index)))
        }
-
+        
        // Verify checksum
        guard values.count >= 6 else {
            throw Bech32Error.invalidChecksum
        }
-
+        
        let payloadValues = Array(values.dropLast(6))
        let checksum = Array(values.suffix(6))
        let expectedChecksum = createChecksum(hrp: hrp, values: payloadValues)
-
+        
        guard checksum == expectedChecksum else {
            throw Bech32Error.invalidChecksum
        }
-
+        
        // Convert back to bytes
        let bytes = convertBits(from: 5, to: 8, pad: false, data: payloadValues)
        return (hrp: hrp, data: Data(bytes))
    }
-
+    
    enum Bech32Error: Error {
        case invalidFormat
        case invalidCharacter
        case invalidChecksum
    }
-
+    
    private static func convertBits(from: Int, to: Int, pad: Bool, data: [UInt8]) -> [UInt8] {
        var acc = 0
        var bits = 0
        var result = [UInt8]()
        let maxv = (1 << to) - 1
-
+        
        for value in data {
            acc = (acc << from) | Int(value)
            bits += from
-
+            
            while bits >= to {
                bits -= to
                result.append(UInt8((acc >> bits) & maxv))
            }
        }
-
+        
        if pad && bits > 0 {
            result.append(UInt8((acc << (to - bits)) & maxv))
        }
-
+        
        return result
    }
-
+    
    private static func createChecksum(hrp: String, values: [UInt8]) -> [UInt8] {
        let checksumValues = hrpExpand(hrp) + values + [0, 0, 0, 0, 0, 0]
        let polymod = polymod(checksumValues) ^ 1
        var checksum = [UInt8]()
-
+        
        for i in 0..<6 {
            checksum.append(UInt8((polymod >> (5 * (5 - i))) & 31))
        }
-
+        
        return checksum
    }
-
+    
    private static func hrpExpand(_ hrp: String) -> [UInt8] {
        var result = [UInt8]()
        for c in hrp {
            guard let asciiValue = c.asciiValue else {
-                return []
+                return [] // Return empty array for invalid input
            }
            result.append(UInt8(asciiValue >> 5))
        }
        result.append(0)
        for c in hrp {
            guard let asciiValue = c.asciiValue else {
-                return []
+                return [] // Return empty array for invalid input
            }
            result.append(UInt8(asciiValue & 31))
        }
        return result
    }
-
+    
    private static func polymod(_ values: [UInt8]) -> Int {
        var chk = 1
        for value in values {
@@ -0,0 +1,345 @@
+import BitLogger
+import Foundation
+import Tor
+#if os(iOS)
+import UIKit
+#elseif os(macOS)
+import AppKit
+#endif
+
+/// Directory of online Nostr relays with approximate GPS locations, used for geohash routing.
+@MainActor
+final class GeoRelayDirectory {
+    struct Entry: Hashable {
+        let host: String
+        let lat: Double
+        let lon: Double
+    }
+
+    static let shared = GeoRelayDirectory()
+
+    private(set) var entries: [Entry] = []
+    private let cacheFileName = "georelays_cache.csv"
+    private let lastFetchKey = "georelay.lastFetchAt"
+    private let remoteURL = URL(string: "https://raw.githubusercontent.com/permissionlesstech/georelays/refs/heads/main/nostr_relays.csv")!
+    private let fetchInterval: TimeInterval = TransportConfig.geoRelayFetchIntervalSeconds
+
+    private var refreshTimer: Timer?
+    private var retryTask: Task<Void, Never>?
+    private var retryAttempt: Int = 0
+    private var isFetching: Bool = false
+    private var observers: [NSObjectProtocol] = []
+
+    private init() {
+        entries = loadLocalEntries()
+        registerObservers()
+        startRefreshTimer()
+        prefetchIfNeeded()
+    }
+
+    deinit {
+        observers.forEach { NotificationCenter.default.removeObserver($0) }
+        refreshTimer?.invalidate()
+        retryTask?.cancel()
+    }
+
+    /// Returns up to `count` relay URLs (wss://) closest to the geohash center.
+    func closestRelays(toGeohash geohash: String, count: Int = 5) -> [String] {
+        let center = Geohash.decodeCenter(geohash)
+        return closestRelays(toLat: center.lat, lon: center.lon, count: count)
+    }
+
+    /// Returns up to `count` relay URLs (wss://) closest to the given coordinate.
+    func closestRelays(toLat lat: Double, lon: Double, count: Int = 5) -> [String] {
+        guard !entries.isEmpty, count > 0 else { return [] }
+
+        if entries.count <= count {
+            return entries
+                .sorted { a, b in
+                    haversineKm(lat, lon, a.lat, a.lon) < haversineKm(lat, lon, b.lat, b.lon)
+                }
+                .map { "wss://\($0.host)" }
+        }
+
+        var best: [(entry: Entry, distance: Double)] = []
+        best.reserveCapacity(count)
+
+        for entry in entries {
+            let distance = haversineKm(lat, lon, entry.lat, entry.lon)
+            if best.count < count {
+                let idx = best.firstIndex { $0.distance > distance } ?? best.count
+                best.insert((entry, distance), at: idx)
+            } else if let worstDistance = best.last?.distance, distance < worstDistance {
+                let idx = best.firstIndex { $0.distance > distance } ?? best.count
+                best.insert((entry, distance), at: idx)
+                best.removeLast()
+            }
+        }
+
+        return best.map { "wss://\($0.entry.host)" }
+    }
+
+    // MARK: - Remote Fetch
+    func prefetchIfNeeded(force: Bool = false) {
+        guard !isFetching else { return }
+
+        let now = Date()
+        let last = UserDefaults.standard.object(forKey: lastFetchKey) as? Date ?? .distantPast
+
+        if !force {
+            guard now.timeIntervalSince(last) >= fetchInterval else { return }
+        } else if last != .distantPast,
+                  now.timeIntervalSince(last) < TransportConfig.geoRelayRetryInitialSeconds {
+            // Skip forced fetches if we just refreshed moments ago.
+            return
+        }
+
+        cancelRetry()
+        fetchRemote()
+    }
+
+    private func fetchRemote() {
+        guard !isFetching else { return }
+        isFetching = true
+
+        let request = URLRequest(
+            url: remoteURL,
+            cachePolicy: .reloadIgnoringLocalCacheData,
+            timeoutInterval: 15
+        )
+
+        Task.detached { [weak self] in
+            guard let self else { return }
+
+            let ready = await TorManager.shared.awaitReady()
+            if !ready {
+                await self.handleFetchFailure(.torNotReady)
+                return
+            }
+
+            do {
+                let (data, _) = try await TorURLSession.shared.session.data(for: request)
+                guard let text = String(data: data, encoding: .utf8) else {
+                    await self.handleFetchFailure(.invalidData)
+                    return
+                }
+
+                let parsed = GeoRelayDirectory.parseCSV(text)
+                guard !parsed.isEmpty else {
+                    await self.handleFetchFailure(.invalidData)
+                    return
+                }
+
+                await self.handleFetchSuccess(entries: parsed, csv: text)
+            } catch {
+                await self.handleFetchFailure(.network(error))
+            }
+        }
+    }
+
+    private enum FetchFailure {
+        case torNotReady
+        case invalidData
+        case network(Error)
+    }
+
+    @MainActor
+    private func handleFetchSuccess(entries parsed: [Entry], csv: String) {
+        entries = parsed
+        persistCache(csv)
+        UserDefaults.standard.set(Date(), forKey: lastFetchKey)
+        SecureLogger.info("GeoRelayDirectory: refreshed \(parsed.count) relays from remote", category: .session)
+        isFetching = false
+        retryAttempt = 0
+        cancelRetry()
+    }
+
+    @MainActor
+    private func handleFetchFailure(_ reason: FetchFailure) {
+        switch reason {
+        case .torNotReady:
+            SecureLogger.warning("GeoRelayDirectory: Tor not ready; scheduling retry", category: .session)
+        case .invalidData:
+            SecureLogger.warning("GeoRelayDirectory: remote fetch returned invalid data; scheduling retry", category: .session)
+        case .network(let error):
+            SecureLogger.warning("GeoRelayDirectory: remote fetch failed with error: \(error.localizedDescription)", category: .session)
+        }
+        isFetching = false
+        scheduleRetry()
+    }
+
+    @MainActor
+    private func scheduleRetry() {
+        retryAttempt = min(retryAttempt + 1, 10)
+        let base = TransportConfig.geoRelayRetryInitialSeconds
+        let maxDelay = TransportConfig.geoRelayRetryMaxSeconds
+        let multiplier = pow(2.0, Double(max(retryAttempt - 1, 0)))
+        let calculated = base * multiplier
+        let delay = min(maxDelay, max(base, calculated))
+
+        cancelRetry()
+        retryTask = Task { [weak self] in
+            let nanoseconds = UInt64(delay * 1_000_000_000)
+            try? await Task.sleep(nanoseconds: nanoseconds)
+            await MainActor.run {
+                self?.prefetchIfNeeded(force: true)
+            }
+        }
+    }
+
+    @MainActor
+    private func cancelRetry() {
+        retryTask?.cancel()
+        retryTask = nil
+    }
+
+    private func persistCache(_ text: String) {
+        guard let url = cacheURL() else { return }
+        do {
+            try text.data(using: .utf8)?.write(to: url, options: .atomic)
+        } catch {
+            SecureLogger.warning("GeoRelayDirectory: failed to write cache: \(error)", category: .session)
+        }
+    }
+
+    // MARK: - Loading
+    private func loadLocalEntries() -> [Entry] {
+        // Prefer cached file if present
+        if let cache = cacheURL(),
+           let data = try? Data(contentsOf: cache),
+           let text = String(data: data, encoding: .utf8) {
+            let arr = Self.parseCSV(text)
+            if !arr.isEmpty { return arr }
+        }
+
+        // Try bundled resource(s)
+        let bundleCandidates = [
+            Bundle.main.url(forResource: "nostr_relays", withExtension: "csv"),
+            Bundle.main.url(forResource: "online_relays_gps", withExtension: "csv"),
+            Bundle.main.url(forResource: "online_relays_gps", withExtension: "csv", subdirectory: "relays")
+        ].compactMap { $0 }
+
+        for url in bundleCandidates {
+            if let data = try? Data(contentsOf: url),
+               let text = String(data: data, encoding: .utf8) {
+                let arr = Self.parseCSV(text)
+                if !arr.isEmpty { return arr }
+            }
+        }
+
+        // Try filesystem path (development/test)
+        if let cwd = FileManager.default.currentDirectoryPath as String?,
+           let data = try? Data(contentsOf: URL(fileURLWithPath: cwd).appendingPathComponent("relays/online_relays_gps.csv")),
+           let text = String(data: data, encoding: .utf8) {
+            return Self.parseCSV(text)
+        }
+
+        SecureLogger.warning("GeoRelayDirectory: no local CSV found; entries empty", category: .session)
+        return []
+    }
+
+    nonisolated static func parseCSV(_ text: String) -> [Entry] {
+        var result: Set<Entry> = []
+        let lines = text.split(whereSeparator: { $0.isNewline })
+        for (idx, raw) in lines.enumerated() {
+            let line = raw.trimmingCharacters(in: .whitespacesAndNewlines)
+            if line.isEmpty { continue }
+            if idx == 0 && line.lowercased().contains("relay url") { continue }
+            let parts = line.split(separator: ",").map { String($0).trimmingCharacters(in: .whitespaces) }
+            guard parts.count >= 3 else { continue }
+            var host = parts[0]
+            host = host.replacingOccurrences(of: "https://", with: "")
+            host = host.replacingOccurrences(of: "http://", with: "")
+            host = host.replacingOccurrences(of: "wss://", with: "")
+            host = host.replacingOccurrences(of: "ws://", with: "")
+            host = host.trimmingCharacters(in: CharacterSet(charactersIn: "/"))
+            guard let lat = Double(parts[1]), let lon = Double(parts[2]) else { continue }
+            result.insert(Entry(host: host, lat: lat, lon: lon))
+        }
+        return Array(result)
+    }
+
+    private func cacheURL() -> URL? {
+        do {
+            let base = try FileManager.default.url(
+                for: .applicationSupportDirectory,
+                in: .userDomainMask,
+                appropriateFor: nil,
+                create: true
+            )
+            let dir = base.appendingPathComponent("bitchat", isDirectory: true)
+            try? FileManager.default.createDirectory(at: dir, withIntermediateDirectories: true)
+            return dir.appendingPathComponent(cacheFileName)
+        } catch {
+            return nil
+        }
+    }
+
+    // MARK: - Observers & Timers
+    private func registerObservers() {
+        let center = NotificationCenter.default
+
+        let torReady = center.addObserver(
+            forName: .TorDidBecomeReady,
+            object: nil,
+            queue: .main
+        ) { [weak self] _ in
+            guard let self else { return }
+            Task { @MainActor in
+                self.prefetchIfNeeded(force: true)
+            }
+        }
+        observers.append(torReady)
+
+#if os(iOS)
+        let didBecomeActive = center.addObserver(
+            forName: UIApplication.didBecomeActiveNotification,
+            object: nil,
+            queue: .main
+        ) { [weak self] _ in
+            guard let self else { return }
+            Task { @MainActor in
+                self.prefetchIfNeeded()
+            }
+        }
+        observers.append(didBecomeActive)
+#elseif os(macOS)
+        let didBecomeActive = center.addObserver(
+            forName: NSApplication.didBecomeActiveNotification,
+            object: nil,
+            queue: .main
+        ) { [weak self] _ in
+            guard let self else { return }
+            Task { @MainActor in
+                self.prefetchIfNeeded()
+            }
+        }
+        observers.append(didBecomeActive)
+#endif
+    }
+
+    private func startRefreshTimer() {
+        refreshTimer?.invalidate()
+        let interval = TransportConfig.geoRelayRefreshCheckIntervalSeconds
+        guard interval > 0 else { return }
+
+        let timer = Timer.scheduledTimer(withTimeInterval: interval, repeats: true) { [weak self] _ in
+            guard let self else { return }
+            Task { @MainActor in
+                self.prefetchIfNeeded()
+            }
+        }
+        refreshTimer = timer
+        RunLoop.main.add(timer, forMode: .common)
+    }
+}
+
+// MARK: - Distance
+private func haversineKm(_ lat1: Double, _ lon1: Double, _ lat2: Double, _ lon2: Double) -> Double {
+    let r = 6371.0 // Earth radius in km
+    let dLat = (lat2 - lat1) * .pi / 180
+    let dLon = (lon2 - lon1) * .pi / 180
+    let a = sin(dLat/2) * sin(dLat/2) + cos(lat1 * .pi/180) * cos(lat2 * .pi/180) * sin(dLon/2) * sin(dLon/2)
+    let c = 2 * atan2(sqrt(a), sqrt(1 - a))
+    return r * c
+}
@@ -1,5 +1,4 @@
 import Foundation
-import BitFoundation

 // MARK: - BitChat-over-Nostr Adapter

@@ -2,56 +2,59 @@ import Foundation
 import P256K

 /// Manages Nostr identity (secp256k1 keypair) for NIP-17 private messaging
-public struct NostrIdentity: Codable, Sendable {
-    public let privateKey: Data
-    public let publicKey: Data
-    public let npub: String // Bech32-encoded public key
-    public let createdAt: Date
-
-    public init(privateKey: Data, publicKey: Data, npub: String, createdAt: Date) {
+struct NostrIdentity: Codable {
+    let privateKey: Data
+    let publicKey: Data
+    let npub: String // Bech32-encoded public key
+    let createdAt: Date
+    
+    /// Memberwise initializer
+    init(privateKey: Data, publicKey: Data, npub: String, createdAt: Date) {
        self.privateKey = privateKey
        self.publicKey = publicKey
        self.npub = npub
        self.createdAt = createdAt
    }
-
+    
    /// Generate a new Nostr identity
-    public static func generate() throws -> NostrIdentity {
+    static func generate() throws -> NostrIdentity {
+        // Generate Schnorr key for Nostr
        let schnorrKey = try P256K.Schnorr.PrivateKey()
        let xOnlyPubkey = Data(schnorrKey.xonly.bytes)
        let npub = try Bech32.encode(hrp: "npub", data: xOnlyPubkey)
-
+        
        return NostrIdentity(
            privateKey: schnorrKey.dataRepresentation,
-            publicKey: xOnlyPubkey,
+            publicKey: xOnlyPubkey, // Store x-only public key
            npub: npub,
            createdAt: Date()
        )
    }
-
+    
    /// Initialize from existing private key data
-    public init(privateKeyData: Data) throws {
+    init(privateKeyData: Data) throws {
        let schnorrKey = try P256K.Schnorr.PrivateKey(dataRepresentation: privateKeyData)
        let xOnlyPubkey = Data(schnorrKey.xonly.bytes)
-
+        
        self.privateKey = privateKeyData
        self.publicKey = xOnlyPubkey
        self.npub = try Bech32.encode(hrp: "npub", data: xOnlyPubkey)
        self.createdAt = Date()
    }
-
+    
    /// Get signing key for event signatures
-    public func signingKey() throws -> P256K.Signing.PrivateKey {
+    func signingKey() throws -> P256K.Signing.PrivateKey {
        try P256K.Signing.PrivateKey(dataRepresentation: privateKey)
    }
-
+    
    /// Get Schnorr signing key for Nostr event signatures
-    public func schnorrSigningKey() throws -> P256K.Schnorr.PrivateKey {
+    func schnorrSigningKey() throws -> P256K.Schnorr.PrivateKey {
        try P256K.Schnorr.PrivateKey(dataRepresentation: privateKey)
    }
-
+    
    /// Get hex-encoded public key (for Nostr events)
-    public var publicKeyHex: String {
-        publicKey.hexEncodedString()
+    var publicKeyHex: String {
+        // Public key is already stored as x-only (32 bytes)
+        return publicKey.hexEncodedString()
    }
 }
@@ -1,54 +1,51 @@
 import Foundation
 import CryptoKit

-/// Minimal keychain access required by NostrIdentityBridge.
-public protocol NostrKeychainStoring: Sendable {
-    func save(key: String, data: Data, service: String, accessible: CFString?)
-    func load(key: String, service: String) -> Data?
-}
-
 /// Bridge between Noise and Nostr identities
-public final class NostrIdentityBridge {
+final class NostrIdentityBridge {
    private let keychainService = "chat.bitchat.nostr"
    private let currentIdentityKey = "nostr-current-identity"
    private let deviceSeedKey = "nostr-device-seed"
-    private let deviceSeedCache: NSLock = NSLock()
-    private var _deviceSeedCacheValue: Data?
+    // In-memory cache to avoid transient keychain access issues
+    private var deviceSeedCache: Data?
    // Cache derived identities to avoid repeated crypto during view rendering
-    private var _derivedIdentityCache: [String: NostrIdentity] = [:]
+    private var derivedIdentityCache: [String: NostrIdentity] = [:]
    private let cacheLock = NSLock()

-    private let keychain: any NostrKeychainStoring
+    private let keychain: KeychainManagerProtocol

-    public init(keychain: any NostrKeychainStoring) {
+    init(keychain: KeychainManagerProtocol = KeychainManager()) {
        self.keychain = keychain
    }
-
+    
    /// Get or create the current Nostr identity
-    public func getCurrentNostrIdentity() throws -> NostrIdentity? {
+    func getCurrentNostrIdentity() throws -> NostrIdentity? {
+        // Check if we already have a Nostr identity
        if let existingData = keychain.load(key: currentIdentityKey, service: keychainService),
           let identity = try? JSONDecoder().decode(NostrIdentity.self, from: existingData) {
            return identity
        }
-
+        
+        // Generate new Nostr identity
        let nostrIdentity = try NostrIdentity.generate()
-
+        
+        // Store it
        let data = try JSONEncoder().encode(nostrIdentity)
        keychain.save(key: currentIdentityKey, data: data, service: keychainService, accessible: nil)
-
+        
        return nostrIdentity
    }
-
+    
    /// Associate a Nostr identity with a Noise public key (for favorites)
-    public func associateNostrIdentity(_ nostrPubkey: String, with noisePublicKey: Data) {
+    func associateNostrIdentity(_ nostrPubkey: String, with noisePublicKey: Data) {
        let key = "nostr-noise-\(noisePublicKey.base64EncodedString())"
        if let data = nostrPubkey.data(using: .utf8) {
            keychain.save(key: key, data: data, service: keychainService, accessible: nil)
        }
    }
-
+    
    /// Get Nostr public key associated with a Noise public key
-    public func getNostrPublicKey(for noisePublicKey: Data) -> String? {
+    func getNostrPublicKey(for noisePublicKey: Data) -> String? {
        let key = "nostr-noise-\(noisePublicKey.base64EncodedString())"
        guard let data = keychain.load(key: key, service: keychainService),
              let pubkey = String(data: data, encoding: .utf8) else {
@@ -56,9 +53,9 @@ public final class NostrIdentityBridge {
        }
        return pubkey
    }
-
+    
    /// Clear all Nostr identity associations and current identity
-    public func clearAllAssociations() {
+    func clearAllAssociations() {
        let query: [String: Any] = [
            kSecClass as String: kSecClassGenericPassword,
            kSecAttrService as String: keychainService,
@@ -79,45 +76,42 @@ public final class NostrIdentityBridge {
                }
                SecItemDelete(deleteQuery as CFDictionary)
            }
+        } else if status == errSecItemNotFound {
+            // nothing persisted; no action needed
        }

-        deviceSeedCache.lock()
-        _deviceSeedCacheValue = nil
-        deviceSeedCache.unlock()
+        deviceSeedCache = nil
    }

    // MARK: - Per-Geohash Identities (Location Channels)

+    /// Returns a stable device seed used to derive unlinkable per-geohash identities.
+    /// Stored only on device keychain.
    private func getOrCreateDeviceSeed() -> Data {
-        deviceSeedCache.lock()
-        if let cached = _deviceSeedCacheValue {
-            deviceSeedCache.unlock()
-            return cached
-        }
-        deviceSeedCache.unlock()
-
+        if let cached = deviceSeedCache { return cached }
        if let existing = keychain.load(key: deviceSeedKey, service: keychainService) {
+            // Migrate to AfterFirstUnlockThisDeviceOnly for stability during lock
            keychain.save(key: deviceSeedKey, data: existing, service: keychainService, accessible: kSecAttrAccessibleAfterFirstUnlockThisDeviceOnly)
-            deviceSeedCache.lock()
-            _deviceSeedCacheValue = existing
-            deviceSeedCache.unlock()
+            deviceSeedCache = existing
            return existing
        }
        var seed = Data(count: 32)
        _ = seed.withUnsafeMutableBytes { ptr in
            SecRandomCopyBytes(kSecRandomDefault, 32, ptr.baseAddress!)
        }
+        // Ensure availability after first unlock to prevent unintended rotation when locked
        keychain.save(key: deviceSeedKey, data: seed, service: keychainService, accessible: kSecAttrAccessibleAfterFirstUnlockThisDeviceOnly)
-        deviceSeedCache.lock()
-        _deviceSeedCacheValue = seed
-        deviceSeedCache.unlock()
+        deviceSeedCache = seed
        return seed
    }

    /// Derive a deterministic, unlinkable Nostr identity for a given geohash.
-    public func deriveIdentity(forGeohash geohash: String) throws -> NostrIdentity {
+    /// Uses HMAC-SHA256(deviceSeed, geohash) as private key material, with fallback rehashing
+    /// if the candidate is not a valid secp256k1 private key.
+    func deriveIdentity(forGeohash geohash: String) throws -> NostrIdentity {
+        // Check cache first to avoid repeated crypto + keychain I/O during view rendering
        cacheLock.lock()
-        if let cached = _derivedIdentityCache[geohash] {
+        if let cached = derivedIdentityCache[geohash] {
            cacheLock.unlock()
            return cached
        }
@@ -138,21 +132,24 @@ public final class NostrIdentityBridge {
            return Data(code)
        }

+        // Try a few iterations to ensure a valid key can be formed
        for i in 0..<10 {
            let keyData = candidateKey(iteration: UInt32(i))
            if let identity = try? NostrIdentity(privateKeyData: keyData) {
+                // Cache the result
                cacheLock.lock()
-                _derivedIdentityCache[geohash] = identity
+                derivedIdentityCache[geohash] = identity
                cacheLock.unlock()
                return identity
            }
        }
-
+        // As a final fallback, hash the seed+msg and try again
        let fallback = (seed + msg).sha256Hash()
        let identity = try NostrIdentity(privateKeyData: fallback)

+        // Cache the result
        cacheLock.lock()
-        _derivedIdentityCache[geohash] = identity
+        derivedIdentityCache[geohash] = identity
        cacheLock.unlock()

        return identity
@@ -1,118 +0,0 @@
-import Nostr
-import Combine
-import Foundation
-import Tor
-#if os(iOS)
-import UIKit
-#elseif os(macOS)
-import AppKit
-#endif
-
-// MARK: - GeoRelayDirectory Live Dependencies
-
-extension GeoRelayDirectoryDependencies {
-    @MainActor
-    static func live() -> Self {
-        #if os(iOS)
-        let activeNotificationName: Notification.Name? = UIApplication.didBecomeActiveNotification
-        #elseif os(macOS)
-        let activeNotificationName: Notification.Name? = NSApplication.didBecomeActiveNotification
-        #else
-        let activeNotificationName: Notification.Name? = nil
-        #endif
-
-        return Self(
-            userDefaults: .standard,
-            notificationCenter: .default,
-            now: Date.init,
-            remoteURL: URL(string: "https://raw.githubusercontent.com/permissionlesstech/georelays/refs/heads/main/nostr_relays.csv")!,
-            fetchInterval: TransportConfig.geoRelayFetchIntervalSeconds,
-            refreshCheckInterval: TransportConfig.geoRelayRefreshCheckIntervalSeconds,
-            retryInitialSeconds: TransportConfig.geoRelayRetryInitialSeconds,
-            retryMaxSeconds: TransportConfig.geoRelayRetryMaxSeconds,
-            awaitTorReady: { await TorManager.shared.awaitReady() },
-            makeFetchData: {
-                let session = TorURLSession.shared.session
-                return { request in
-                    let (data, _) = try await session.data(for: request)
-                    return data
-                }
-            },
-            readData: { try? Data(contentsOf: $0) },
-            writeData: { data, url in
-                try data.write(to: url, options: .atomic)
-            },
-            cacheURL: {
-                do {
-                    let base = try FileManager.default.url(
-                        for: .applicationSupportDirectory,
-                        in: .userDomainMask,
-                        appropriateFor: nil,
-                        create: true
-                    )
-                    let dir = base.appendingPathComponent("bitchat", isDirectory: true)
-                    try? FileManager.default.createDirectory(at: dir, withIntermediateDirectories: true)
-                    return dir.appendingPathComponent("georelays_cache.csv")
-                } catch {
-                    return nil
-                }
-            },
-            bundledCSVURLs: {
-                [
-                    Bundle.main.url(forResource: "nostr_relays", withExtension: "csv"),
-                    Bundle.main.url(forResource: "online_relays_gps", withExtension: "csv"),
-                    Bundle.main.url(forResource: "online_relays_gps", withExtension: "csv", subdirectory: "relays")
-                ].compactMap { $0 }
-            },
-            currentDirectoryPath: { FileManager.default.currentDirectoryPath },
-            retrySleep: { delay in
-                let nanoseconds = UInt64(delay * 1_000_000_000)
-                try? await Task.sleep(nanoseconds: nanoseconds)
-            },
-            torReadyNotificationName: .TorDidBecomeReady,
-            activeNotificationName: activeNotificationName,
-            autoStart: true
-        )
-    }
-}
-
-// MARK: - NostrRelayManager Live Dependencies
-
-extension NostrRelayManagerDependencies {
-    @MainActor
-    static func live() -> Self {
-        Self(
-            activationAllowed: { NetworkActivationService.shared.activationAllowed },
-            userTorEnabled: { NetworkActivationService.shared.userTorEnabled },
-            hasMutualFavorites: { !FavoritesPersistenceService.shared.mutualFavorites.isEmpty },
-            hasLocationPermission: { LocationChannelManager.shared.permissionState == .authorized },
-            mutualFavoritesPublisher: FavoritesPersistenceService.shared.$mutualFavorites.eraseToAnyPublisher(),
-            locationPermissionPublisher: LocationChannelManager.shared.$permissionState
-                .map { state -> LocationPermissionState in
-                    switch state {
-                    case .notDetermined:.notDetermined
-                    case .authorized:   .authorized
-                    case .denied:       .denied
-                    case .restricted:   .denied
-                    }
-                }
-                .eraseToAnyPublisher(),
-            torEnforced: { TorManager.shared.torEnforced },
-            torIsReady: { TorManager.shared.isReady },
-            torIsForeground: { TorManager.shared.isForeground() },
-            awaitTorReady: { completion in
-                Task.detached {
-                    let ready = await TorManager.shared.awaitReady()
-                    await MainActor.run {
-                        completion(ready)
-                    }
-                }
-            },
-            makeSession: { NostrRelayManager.makeURLSession(TorURLSession.shared.session) },
-            scheduleAfter: { delay, action in
-                DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: action)
-            },
-            now: Date.init
-        )
-    }
-}
@@ -1,88 +1,106 @@
-import BitFoundation
 import BitLogger
 import Foundation
 import CryptoKit
 import P256K
 import Security

-/// NIP-17 Protocol Implementation for Private Direct Messages
-public struct NostrProtocol {
+// Note: This file depends on Data extension from BinaryEncodingUtils.swift
+// Make sure BinaryEncodingUtils.swift is included in the target

+/// NIP-17 Protocol Implementation for Private Direct Messages
+struct NostrProtocol {
+    
    /// Nostr event kinds
-    public enum EventKind: Int, Sendable {
+    enum EventKind: Int {
        case metadata = 0
        case textNote = 1
        case dm = 14 // NIP-17 DM rumor kind
        case seal = 13 // NIP-17 sealed event
        case giftWrap = 1059 // NIP-59 gift wrap
        case ephemeralEvent = 20000
-        case geohashPresence = 20001
    }
-
+    
    /// Create a NIP-17 private message
-    public static func createPrivateMessage(
+    static func createPrivateMessage(
        content: String,
        recipientPubkey: String,
        senderIdentity: NostrIdentity
    ) throws -> NostrEvent {
+        
+        // Creating private message
+        
+        // 1. Create the rumor (unsigned event)
        let rumor = NostrEvent(
            pubkey: senderIdentity.publicKeyHex,
            createdAt: Date(),
-            kind: .dm,
+            kind: .dm, // NIP-17: DM rumor kind 14
            tags: [],
            content: content
        )
-
+        
+        // 2. Create ephemeral key for this message
        let ephemeralKey = try P256K.Schnorr.PrivateKey()
-
+        // Created ephemeral key for seal
+        
+        // 3. Seal the rumor (encrypt to recipient)
        let sealedEvent = try createSeal(
            rumor: rumor,
            recipientPubkey: recipientPubkey,
            senderKey: ephemeralKey
        )
-
+        
+        // 4. Gift wrap the sealed event (encrypt to recipient again)
        let giftWrap = try createGiftWrap(
            seal: sealedEvent,
            recipientPubkey: recipientPubkey,
            senderKey: ephemeralKey
        )
-
+        
+        // Created gift wrap
+        
        return giftWrap
    }
-
+    
    /// Decrypt a received NIP-17 message
    /// Returns the content, sender pubkey, and the actual message timestamp (not the randomized gift wrap timestamp)
-    public static func decryptPrivateMessage(
+    static func decryptPrivateMessage(
        giftWrap: NostrEvent,
        recipientIdentity: NostrIdentity
    ) throws -> (content: String, senderPubkey: String, timestamp: Int) {
+        
+        // Starting decryption
+        
+        // 1. Unwrap the gift wrap
        let seal: NostrEvent
        do {
            seal = try unwrapGiftWrap(
                giftWrap: giftWrap,
                recipientKey: recipientIdentity.schnorrSigningKey()
            )
+            // Successfully unwrapped gift wrap
        } catch {
            SecureLogger.error("❌ Failed to unwrap gift wrap: \(error)", category: .session)
            throw error
        }
-
+        
+        // 2. Open the seal
        let rumor: NostrEvent
        do {
            rumor = try openSeal(
                seal: seal,
                recipientKey: recipientIdentity.schnorrSigningKey()
            )
+            // Successfully opened seal
        } catch {
            SecureLogger.error("❌ Failed to open seal: \(error)", category: .session)
            throw error
        }
-
+        
        return (content: rumor.content, senderPubkey: rumor.pubkey, timestamp: rumor.created_at)
    }

    /// Create a geohash-scoped ephemeral public message (kind 20000)
-    public static func createEphemeralGeohashEvent(
+    static func createEphemeralGeohashEvent(
        content: String,
        geohash: String,
        senderIdentity: NostrIdentity,
@@ -90,7 +108,7 @@ public struct NostrProtocol {
        teleported: Bool = false
    ) throws -> NostrEvent {
        var tags = [["g", geohash]]
-        if let nickname = nickname?.trimmedOrNilIfEmpty {
+        if let nickname = nickname?.trimmingCharacters(in: .whitespacesAndNewlines), !nickname.isEmpty {
            tags.append(["n", nickname])
        }
        if teleported {
@@ -107,33 +125,15 @@ public struct NostrProtocol {
        return try event.sign(with: schnorrKey)
    }

-    /// Create a geohash presence heartbeat (kind 20001)
-    /// Must contain empty content and NO nickname tag
-    public static func createGeohashPresenceEvent(
-        geohash: String,
-        senderIdentity: NostrIdentity
-    ) throws -> NostrEvent {
-        let tags = [["g", geohash]]
-        let event = NostrEvent(
-            pubkey: senderIdentity.publicKeyHex,
-            createdAt: Date(),
-            kind: .geohashPresence,
-            tags: tags,
-            content: ""
-        )
-        let schnorrKey = try senderIdentity.schnorrSigningKey()
-        return try event.sign(with: schnorrKey)
-    }
-
    /// Create a persistent location note (kind 1: text note) tagged to a street-level geohash.
-    public static func createGeohashTextNote(
+    static func createGeohashTextNote(
        content: String,
        geohash: String,
        senderIdentity: NostrIdentity,
        nickname: String? = nil
    ) throws -> NostrEvent {
        var tags = [["g", geohash]]
-        if let nickname = nickname?.trimmedOrNilIfEmpty {
+        if let nickname = nickname?.trimmingCharacters(in: .whitespacesAndNewlines), !nickname.isEmpty {
            tags.append(["n", nickname])
        }
        let event = NostrEvent(
@@ -146,21 +146,22 @@ public struct NostrProtocol {
        let schnorrKey = try senderIdentity.schnorrSigningKey()
        return try event.sign(with: schnorrKey)
    }
-
+    
    // MARK: - Private Methods
-
+    
    private static func createSeal(
        rumor: NostrEvent,
        recipientPubkey: String,
        senderKey: P256K.Schnorr.PrivateKey
    ) throws -> NostrEvent {
+        
        let rumorJSON = try rumor.jsonString()
        let encrypted = try encrypt(
            plaintext: rumorJSON,
            recipientPubkey: recipientPubkey,
            senderKey: senderKey
        )
-
+        
        let seal = NostrEvent(
            pubkey: Data(senderKey.xonly.bytes).hexEncodedString(),
            createdAt: randomizedTimestamp(),
@@ -168,108 +169,130 @@ public struct NostrProtocol {
            tags: [],
            content: encrypted
        )
-
+        
+        // Sign the seal with the sender's Schnorr private key
        return try seal.sign(with: senderKey)
    }
-
+    
    private static func createGiftWrap(
        seal: NostrEvent,
        recipientPubkey: String,
-        senderKey: P256K.Schnorr.PrivateKey
+        senderKey: P256K.Schnorr.PrivateKey  // This is the ephemeral key used for the seal
    ) throws -> NostrEvent {
+        
        let sealJSON = try seal.jsonString()
+        
+        // Create new ephemeral key for gift wrap
        let wrapKey = try P256K.Schnorr.PrivateKey()
-
+        // Creating gift wrap with ephemeral key
+        
+        // Encrypt the seal with the new ephemeral key (not the seal's key)
        let encrypted = try encrypt(
            plaintext: sealJSON,
            recipientPubkey: recipientPubkey,
-            senderKey: wrapKey
+            senderKey: wrapKey  // Use the gift wrap ephemeral key
        )
-
+        
        let giftWrap = NostrEvent(
            pubkey: Data(wrapKey.xonly.bytes).hexEncodedString(),
            createdAt: randomizedTimestamp(),
            kind: .giftWrap,
-            tags: [["p", recipientPubkey]],
+            tags: [["p", recipientPubkey]], // Tag recipient
            content: encrypted
        )
-
+        
+        // Sign the gift wrap with the wrap Schnorr private key
        return try giftWrap.sign(with: wrapKey)
    }
-
+    
    private static func unwrapGiftWrap(
        giftWrap: NostrEvent,
        recipientKey: P256K.Schnorr.PrivateKey
    ) throws -> NostrEvent {
+        
+        // Unwrapping gift wrap
+        
        let decrypted = try decrypt(
            ciphertext: giftWrap.content,
            senderPubkey: giftWrap.pubkey,
            recipientKey: recipientKey
        )
-
+        
        guard let data = decrypted.data(using: .utf8),
              let sealDict = try JSONSerialization.jsonObject(with: data) as? [String: Any] else {
            throw NostrError.invalidEvent
        }
-
-        return try NostrEvent(from: sealDict)
+        
+        let seal = try NostrEvent(from: sealDict)
+        // Unwrapped seal
+        
+        return seal
    }
-
+    
    private static func openSeal(
        seal: NostrEvent,
        recipientKey: P256K.Schnorr.PrivateKey
    ) throws -> NostrEvent {
+        
        let decrypted = try decrypt(
            ciphertext: seal.content,
            senderPubkey: seal.pubkey,
            recipientKey: recipientKey
        )
-
+        
        guard let data = decrypted.data(using: .utf8),
              let rumorDict = try JSONSerialization.jsonObject(with: data) as? [String: Any] else {
            throw NostrError.invalidEvent
        }
-
+        
        return try NostrEvent(from: rumorDict)
    }
-
+    
    // MARK: - Encryption (NIP-44 v2)
-
+    
    private static func encrypt(
        plaintext: String,
        recipientPubkey: String,
        senderKey: P256K.Schnorr.PrivateKey
    ) throws -> String {
+        
        guard let recipientPubkeyData = Data(hexString: recipientPubkey) else {
            throw NostrError.invalidPublicKey
        }
-
+        
+        // Encrypting message (NIP-44 v2: XChaCha20-Poly1305, versioned)
+        
+        // Derive shared secret
        let sharedSecret = try deriveSharedSecret(
            privateKey: senderKey,
            publicKey: recipientPubkeyData
        )
+        // Derive NIP-44 v2 symmetric key (HKDF-SHA256 with label in info)
        let key = try deriveNIP44V2Key(from: sharedSecret)
-
+        
+        // 24-byte random nonce for XChaCha20-Poly1305
        var nonce24 = Data(count: 24)
        _ = nonce24.withUnsafeMutableBytes { ptr in
            SecRandomCopyBytes(kSecRandomDefault, 24, ptr.baseAddress!)
        }
-
+        
        let pt = Data(plaintext.utf8)
        let sealed = try XChaCha20Poly1305Compat.seal(plaintext: pt, key: key, nonce24: nonce24)
-
+        
+        // v2: base64url(nonce24 || ciphertext || tag)
        var combined = Data()
        combined.append(nonce24)
        combined.append(sealed.ciphertext)
        combined.append(sealed.tag)
        return "v2:" + base64URLEncode(combined)
    }
-
+    
    private static func decrypt(
        ciphertext: String,
        senderPubkey: String,
        recipientKey: P256K.Schnorr.PrivateKey
    ) throws -> String {
+        // Expect NIP-44 v2 format
        guard ciphertext.hasPrefix("v2:") else { throw NostrError.invalidCiphertext }
        let encoded = String(ciphertext.dropFirst(3))
        guard let data = base64URLDecode(encoded),
@@ -283,6 +306,7 @@ public struct NostrProtocol {
        let tag = rest.suffix(16)
        let ct = rest.dropLast(16)

+        // Try decryption with even-Y then odd-Y when sender pubkey is x-only
        func attemptDecrypt(using pubKeyData: Data) throws -> Data {
            let ss = try deriveSharedSecret(privateKey: recipientKey, publicKey: pubKeyData)
            let key = try deriveNIP44V2Key(from: ss)
@@ -294,6 +318,7 @@ public struct NostrProtocol {
            )
        }

+        // If 32 bytes (x-only) try both parities, otherwise single try
        if senderPubkeyData.count == 32 {
            let even = Data([0x02]) + senderPubkeyData
            if let pt = try? attemptDecrypt(using: even) {
@@ -307,23 +332,32 @@ public struct NostrProtocol {
            return String(data: pt, encoding: .utf8) ?? ""
        }
    }
-
+    
    private static func deriveSharedSecret(
        privateKey: P256K.Schnorr.PrivateKey,
        publicKey: Data
    ) throws -> Data {
+        // Deriving shared secret
+        
+        // Convert Schnorr private key to KeyAgreement private key
        let keyAgreementPrivateKey = try P256K.KeyAgreement.PrivateKey(
            dataRepresentation: privateKey.dataRepresentation
        )
-
+        
+        // Create KeyAgreement public key from the public key data
+        // For ECDH, we need the full 33-byte compressed public key (with 0x02 or 0x03 prefix)
        var fullPublicKey = Data()
-        if publicKey.count == 32 {
+        if publicKey.count == 32 { // X-only key, need to add prefix
+            // For x-only keys in Nostr/Bitcoin, we need to try both possible Y coordinates
+            // First try with even Y (0x02 prefix)
            fullPublicKey.append(0x02)
            fullPublicKey.append(publicKey)
+            // Trying with even Y coordinate
        } else {
            fullPublicKey = publicKey
        }
-
+        
+        // Try to create public key, if it fails with even Y, try odd Y
        let keyAgreementPublicKey: P256K.KeyAgreement.PublicKey
        do {
            keyAgreementPublicKey = try P256K.KeyAgreement.PublicKey(
@@ -332,6 +366,8 @@ public struct NostrProtocol {
            )
        } catch {
            if publicKey.count == 32 {
+                // Try with odd Y (0x03 prefix)
+                // Even Y failed, trying odd Y
                fullPublicKey = Data()
                fullPublicKey.append(0x03)
                fullPublicKey.append(publicKey)
@@ -343,32 +379,85 @@ public struct NostrProtocol {
                throw error
            }
        }
-
+        
+        // Perform ECDH
        let sharedSecret = try keyAgreementPrivateKey.sharedSecretFromKeyAgreement(
            with: keyAgreementPublicKey,
            format: .compressed
        )
-
-        return sharedSecret.withUnsafeBytes { Data($0) }
+        
+        // Convert SharedSecret to Data
+        let sharedSecretData = sharedSecret.withUnsafeBytes { Data($0) }
+        // ECDH shared secret derived
+        
+        // Return raw ECDH shared secret; HKDF is applied by deriveNIP44V2Key
+        return sharedSecretData
    }
-
+    
+    // Direct version that doesn't try to add prefixes
+    private static func deriveSharedSecretDirect(
+        privateKey: P256K.Schnorr.PrivateKey,
+        publicKey: Data
+    ) throws -> Data {
+        // Direct shared secret calculation
+        
+        // Convert Schnorr private key to KeyAgreement private key
+        let keyAgreementPrivateKey = try P256K.KeyAgreement.PrivateKey(
+            dataRepresentation: privateKey.dataRepresentation
+        )
+        
+        // Use the public key as-is (should already have prefix)
+        let keyAgreementPublicKey = try P256K.KeyAgreement.PublicKey(
+            dataRepresentation: publicKey,
+            format: .compressed
+        )
+        
+        // Perform ECDH
+        let sharedSecret = try keyAgreementPrivateKey.sharedSecretFromKeyAgreement(
+            with: keyAgreementPublicKey,
+            format: .compressed
+        )
+        
+        // Convert SharedSecret to Data
+        let sharedSecretData = sharedSecret.withUnsafeBytes { Data($0) }
+        
+        // Return raw ECDH shared secret; HKDF is applied by deriveNIP44V2Key
+        return sharedSecretData
+    }
+    
    private static func randomizedTimestamp() -> Date {
-        let offset = TimeInterval.random(in: -900...900)
-        return Date().addingTimeInterval(offset)
+        // Add random offset to current time for privacy
+        // This prevents timing correlation attacks while the actual message timestamp
+        // is preserved in the encrypted rumor
+        let offset = TimeInterval.random(in: -900...900) // +/- 15 minutes
+        let now = Date()
+        let randomized = now.addingTimeInterval(offset)
+        
+        // Log with explicit UTC and local time for debugging
+        let formatter = DateFormatter()
+        //
+        formatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
+        formatter.timeZone = TimeZone(abbreviation: "UTC")
+        
+        formatter.timeZone = TimeZone.current
+        
+        // Timestamp randomized for privacy
+        
+        return randomized
    }
 }

 /// Nostr Event structure
-public struct NostrEvent: Codable, Sendable {
-    public var id: String
-    public let pubkey: String
-    public let created_at: Int
-    public let kind: Int
-    public let tags: [[String]]
-    public let content: String
-    public var sig: String?
-
-    public init(
+struct NostrEvent: Codable {
+    var id: String
+    let pubkey: String
+    let created_at: Int
+    let kind: Int
+    let tags: [[String]]
+    let content: String
+    var sig: String?
+    
+    init(
        pubkey: String,
        createdAt: Date,
        kind: NostrProtocol.EventKind,
@@ -381,10 +470,10 @@ public struct NostrEvent: Codable, Sendable {
        self.tags = tags
        self.content = content
        self.sig = nil
-        self.id = ""
+        self.id = "" // Will be set during signing
    }
-
-    public init(from dict: [String: Any]) throws {
+    
+    init(from dict: [String: Any]) throws {
        guard let pubkey = dict["pubkey"] as? String,
              let createdAt = dict["created_at"] as? Int,
              let kind = dict["kind"] as? Int,
@@ -392,7 +481,7 @@ public struct NostrEvent: Codable, Sendable {
              let content = dict["content"] as? String else {
            throw NostrError.invalidEvent
        }
-
+        
        self.id = dict["id"] as? String ?? ""
        self.pubkey = pubkey
        self.created_at = createdAt
@@ -401,45 +490,26 @@ public struct NostrEvent: Codable, Sendable {
        self.content = content
        self.sig = dict["sig"] as? String
    }
-
-    public func sign(with key: P256K.Schnorr.PrivateKey) throws -> NostrEvent {
+    
+    func sign(with key: P256K.Schnorr.PrivateKey) throws -> NostrEvent {
        let (eventId, eventIdHash) = try calculateEventId()
-
+        
+        // Sign with Schnorr (BIP-340)
        var messageBytes = [UInt8](eventIdHash)
        var auxRand = [UInt8](repeating: 0, count: 32)
        _ = auxRand.withUnsafeMutableBytes { ptr in
            SecRandomCopyBytes(kSecRandomDefault, 32, ptr.baseAddress!)
        }
        let schnorrSignature = try key.signature(message: &messageBytes, auxiliaryRand: &auxRand)
-
+        
        let signatureHex = schnorrSignature.dataRepresentation.hexEncodedString()
-
+        
        var signed = self
        signed.id = eventId
        signed.sig = signatureHex
        return signed
    }
-
-    /// Validate that the event ID and Schnorr signature match the content and pubkey.
-    /// Returns false when the signature is missing, malformed, or does not verify.
-    public func isValidSignature() -> Bool {
-        guard let sig = sig,
-              let sigData = Data(hexString: sig),
-              let pubData = Data(hexString: pubkey),
-              sigData.count == 64,
-              pubData.count == 32,
-              let signature = try? P256K.Schnorr.SchnorrSignature(dataRepresentation: sigData),
-              let (expectedId, eventHash) = try? calculateEventId(),
-              expectedId == id
-        else {
-            return false
-        }
-
-        var messageBytes = [UInt8](eventHash)
-        let xonly = P256K.Schnorr.XonlyKey(dataRepresentation: pubData)
-        return xonly.isValid(signature, for: &messageBytes)
-    }
-
+    
    private func calculateEventId() throws -> (String, Data) {
        let serialized = [
            0,
@@ -449,12 +519,12 @@ public struct NostrEvent: Codable, Sendable {
            tags,
            content
        ] as [Any]
-
+        
        let data = try JSONSerialization.data(withJSONObject: serialized, options: [.withoutEscapingSlashes])
        return (data.sha256Fingerprint(), data.sha256Hash())
    }
-
-    public func jsonString() throws -> String {
+    
+    func jsonString() throws -> String {
        let encoder = JSONEncoder()
        encoder.outputFormatting = [.withoutEscapingSlashes]
        let data = try encoder.encode(self)
@@ -462,7 +532,7 @@ public struct NostrEvent: Codable, Sendable {
    }
 }

-public enum NostrError: Error, Sendable {
+enum NostrError: Error {
    case invalidPublicKey
    case invalidPrivateKey
    case invalidEvent
@@ -6,6 +6,7 @@ import CryptoKit
 /// 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)
@@ -58,6 +59,7 @@ enum XChaCha20Poly1305Compat {
    }

    private static func hchacha20(key: Data, nonce16: Data) throws -> 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)
        }
@@ -68,22 +70,28 @@ enum XChaCha20Poly1305Compat {
        // Constants "expand 32-byte k"
        var state: [UInt32] = [
            0x61707865, 0x3320646e, 0x79622d32, 0x6b206574,
+            // key (8 words)
            key.loadLEWord(0), key.loadLEWord(4), key.loadLEWord(8), key.loadLEWord(12),
            key.loadLEWord(16), key.loadLEWord(20), key.loadLEWord(24), key.loadLEWord(28),
+            // nonce (4 words)
            nonce16.loadLEWord(0), nonce16.loadLEWord(4), nonce16.loadLEWord(8), nonce16.loadLEWord(12)
        ]

+        // 20 rounds (10 double rounds)
        for _ in 0..<10 {
+            // Column rounds
            quarterRound(&state, 0, 4, 8, 12)
            quarterRound(&state, 1, 5, 9, 13)
            quarterRound(&state, 2, 6, 10, 14)
            quarterRound(&state, 3, 7, 11, 15)
+            // Diagonal rounds
            quarterRound(&state, 0, 5, 10, 15)
            quarterRound(&state, 1, 6, 11, 12)
            quarterRound(&state, 2, 7, 8, 13)
            quarterRound(&state, 3, 4, 9, 14)
        }

+        // Output subkey: state[0..3] and state[12..15]
        var out = Data(count: 32)
        out.storeLEWord(state[0], at: 0)
        out.storeLEWord(state[1], at: 4)
@@ -124,3 +132,4 @@ private extension Data {
        replaceSubrange(offset..<(offset+4), with: bytes)
    }
 }
+
@@ -6,7 +6,62 @@
 //

 import Foundation
-import BitFoundation
+import CryptoKit
+
+// MARK: - Hex Encoding/Decoding
+
+extension Data {
+    func hexEncodedString() -> String {
+        if self.isEmpty {
+            return ""
+        }
+        return self.map { String(format: "%02x", $0) }.joined()
+    }
+
+    func sha256Hex() -> String {
+        let digest = SHA256.hash(data: self)
+        return digest.map { String(format: "%02x", $0) }.joined()
+    }
+    
+    /// Initialize Data from a hex string.
+    /// - Parameter hexString: A hex string, optionally prefixed with "0x" or "0X".
+    ///   Whitespace is trimmed. Must have even length after prefix removal.
+    /// - Returns: nil if the string has odd length or contains invalid hex characters.
+    init?(hexString: String) {
+        var hex = hexString.trimmingCharacters(in: .whitespaces)
+
+        // Remove optional 0x prefix
+        if hex.hasPrefix("0x") || hex.hasPrefix("0X") {
+            hex = String(hex.dropFirst(2))
+        }
+
+        // Reject odd-length strings
+        guard hex.count % 2 == 0 else {
+            return nil
+        }
+
+        // Reject empty strings
+        guard !hex.isEmpty else {
+            self = Data()
+            return
+        }
+
+        let len = hex.count / 2
+        var data = Data(capacity: len)
+        var index = hex.startIndex
+
+        for _ in 0..<len {
+            let nextIndex = hex.index(index, offsetBy: 2)
+            guard let byte = UInt8(String(hex[index..<nextIndex]), radix: 16) else {
+                return nil
+            }
+            data.append(byte)
+            index = nextIndex
+        }
+
+        self = data
+    }
+}

 // MARK: - Binary Encoding Utilities

@@ -138,7 +138,6 @@ struct BinaryProtocol {
        static let hasSignature: UInt8 = 0x02
        static let isCompressed: UInt8 = 0x04
        static let hasRoute: UInt8 = 0x08
-        static let isRSR: UInt8 = 0x10
    }
    
    // Encode BitchatPacket to binary format
@@ -162,9 +161,7 @@ struct BinaryProtocol {
        }

        let lengthFieldBytes = lengthFieldSize(for: version)
-        
-        // Route is only supported for v2+ packets (per SOURCE_ROUTING.md spec)
-        let originalRoute = (version >= 2) ? (packet.route ?? []) : []
+        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 }
@@ -178,14 +175,13 @@ struct BinaryProtocol {
        let hasRoute = !sanitizedRoute.isEmpty
        let routeLength = hasRoute ? 1 + sanitizedRoute.count * senderIDSize : 0
        let originalSizeFieldBytes = isCompressed ? lengthFieldBytes : 0
-        // payloadLength in header is payload-only (does NOT include route bytes)
-        let payloadDataSize = payload.count + originalSizeFieldBytes
+        let payloadDataSize = routeLength + payload.count + originalSizeFieldBytes

        if version == 1 && payloadDataSize > Int(UInt16.max) { return nil }
        if version == 2 && payloadDataSize > Int(UInt32.max) { return nil }

        guard let headerSize = headerSize(for: version) else { return nil }
-        let estimatedHeader = headerSize + senderIDSize + (packet.recipientID == nil ? 0 : recipientIDSize) + routeLength
+        let estimatedHeader = headerSize + senderIDSize + (packet.recipientID == nil ? 0 : recipientIDSize)
        let estimatedPayload = payloadDataSize
        let estimatedSignature = (packet.signature == nil ? 0 : signatureSize)
        var data = Data()
@@ -203,11 +199,9 @@ struct BinaryProtocol {
        if packet.recipientID != nil { flags |= Flags.hasRecipient }
        if packet.signature != nil { flags |= Flags.hasSignature }
        if isCompressed { flags |= Flags.isCompressed }
-        // HAS_ROUTE is only valid for v2+ packets
-        if hasRoute && version >= 2 { flags |= Flags.hasRoute }
-        if packet.isRSR { flags |= Flags.isRSR }
+        if hasRoute { flags |= Flags.hasRoute }
        data.append(flags)
-        
+
        if version == 2 {
            let length = UInt32(payloadDataSize)
            for shift in stride(from: 24, through: 0, by: -8) {
@@ -329,10 +323,7 @@ struct BinaryProtocol {
            let hasRecipient = (flags & Flags.hasRecipient) != 0
            let hasSignature = (flags & Flags.hasSignature) != 0
            let isCompressed = (flags & Flags.isCompressed) != 0
-            // HAS_ROUTE is only valid for v2+ packets; ignore the flag for v1
-            let hasRoute = (version >= 2) && (flags & Flags.hasRoute) != 0
-            let isRSR = (flags & Flags.isRSR) != 0
-            
+
            let payloadLength: Int
            if version == 2 {
                guard let len = read32() else { return nil }
@@ -343,7 +334,6 @@ struct BinaryProtocol {
            }

            guard payloadLength >= 0 else { return nil }
-            guard payloadLength <= FileTransferLimits.maxFramedFileBytes else { return nil }

            guard let senderID = readData(senderIDSize) else { return nil }

@@ -353,24 +343,27 @@ struct BinaryProtocol {
                if recipientID == nil { return nil }
            }

-            // Route (optional, v2+ only): route bytes are NOT included in payloadLength
            var route: [Data]? = nil
-            if hasRoute {
-                guard let routeCount = read8() else { return 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 let hop = readData(senderIDSize) else { return nil }
+                        guard remainingPayloadBytes >= senderIDSize,
+                              let hop = readData(senderIDSize) else { return nil }
+                        remainingPayloadBytes -= senderIDSize
                        hops.append(hop)
                    }
                    route = hops
                }
            }

-            // Payload: payloadLength is exactly the payload size (+ compression preamble if compressed)
            let payload: Data
            if isCompressed {
-                guard payloadLength >= lengthFieldBytes else { return nil }
+                guard remainingPayloadBytes >= lengthFieldBytes else { return nil }
                let originalSize: Int
                if version == 2 {
                    guard let rawSize = read32() else { return nil }
@@ -379,9 +372,11 @@ struct BinaryProtocol {
                    guard let rawSize = read16() else { return nil }
                    originalSize = Int(rawSize)
                }
+                remainingPayloadBytes -= lengthFieldBytes
                guard originalSize >= 0 && originalSize <= FileTransferLimits.maxFramedFileBytes else { return nil }
-                let compressedSize = payloadLength - lengthFieldBytes
+                let compressedSize = remainingPayloadBytes
                guard compressedSize > 0, let compressed = readData(compressedSize) else { return nil }
+                remainingPayloadBytes = 0

                let compressionRatio = Double(originalSize) / Double(compressedSize)
                guard compressionRatio <= 50_000.0 else {
@@ -393,7 +388,9 @@ struct BinaryProtocol {
                      decompressed.count == originalSize else { return nil }
                payload = decompressed
            } else {
-                guard let rawPayload = readData(payloadLength) else { return nil }
+                guard remainingPayloadBytes >= 0,
+                      let rawPayload = readData(remainingPayloadBytes) else { return nil }
+                remainingPayloadBytes = 0
                payload = rawPayload
            }

@@ -414,8 +411,7 @@ struct BinaryProtocol {
                signature: signature,
                ttl: ttl,
                version: version,
-                route: route,
-                isRSR: isRSR
+                route: route
            )
        }
    }
@@ -60,7 +60,6 @@

 import Foundation
 import CoreBluetooth
-import BitFoundation

 // MARK: - Message Types

@@ -191,22 +191,5 @@ enum MimeType: CaseIterable, Hashable {
 extension MimeType {
    enum Category: String {
        case audio, image, file
-
-        /// Ends with a space
-        var messagePrefix: String {
-            switch self {
-            case .audio: "[voice] "
-            case .image: "[image] "
-            case .file: "[file] "
-            }
-        }
-
-        var mediaDir: String {
-            switch self {
-            case .audio: "voicenotes"
-            case .image: "images"
-            case .file: "files"
-            }
-        }
    }
 }
@@ -6,9 +6,7 @@
 // This is free and unencumbered software released into the public domain.
 //

-import Nostr
 import Foundation
-import BitFoundation

 /// Result of command processing
 enum CommandResult {
@@ -61,11 +59,22 @@ final class CommandProcessor {
    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
        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
@@ -168,7 +177,7 @@ final class CommandProcessor {
    }
    
    private func handleEmote(_ args: String, command: String, action: String, emoji: String, suffix: String = "") -> CommandResult {
-        let targetName = args.trimmed
+        let targetName = args.trimmingCharacters(in: .whitespaces)
        guard !targetName.isEmpty else {
            return .error(message: "usage: /\(command) <nickname>")
        }
@@ -211,7 +220,7 @@ final class CommandProcessor {
    }
    
    private func handleBlock(_ args: String) -> CommandResult {
-        let targetName = args.trimmed
+        let targetName = args.trimmingCharacters(in: .whitespaces)
        
        if targetName.isEmpty {
            // List blocked users (mesh) and geohash (Nostr) blocks
@@ -286,7 +295,7 @@ final class CommandProcessor {
    }
    
    private func handleUnblock(_ args: String) -> CommandResult {
-        let targetName = args.trimmed
+        let targetName = args.trimmingCharacters(in: .whitespaces)
        guard !targetName.isEmpty else {
            return .error(message: "usage: /unblock <nickname>")
        }
@@ -313,7 +322,7 @@ final class CommandProcessor {
    }
    
    private func handleFavorite(_ args: String, add: Bool) -> CommandResult {
-        let targetName = args.trimmed
+        let targetName = args.trimmingCharacters(in: .whitespaces)
        guard !targetName.isEmpty else {
            return .error(message: "usage: /\(add ? "fav" : "unfav") <nickname>")
        }
@@ -1,5 +1,4 @@
 import BitLogger
-import BitFoundation
 import Foundation
 import Combine

@@ -32,6 +31,9 @@ final class FavoritesPersistenceService: ObservableObject {
    @Published private(set) var favorites: [Data: FavoriteRelationship] = [:] // Noise pubkey -> relationship
    @Published private(set) var mutualFavorites: Set<Data> = []
    
+    private let userDefaults = UserDefaults.standard
+    private var cancellables = Set<AnyCancellable>()
+    
    static let shared = FavoritesPersistenceService()

    init(keychain: KeychainManagerProtocol = KeychainManager()) {
@@ -83,9 +83,6 @@ public final class GeohashParticipantTracker: ObservableObject {
        var map = participants[geohash] ?? [:]
        map[key] = Date()
        participants[geohash] = map
-        
-        // Always notify observers that state has changed so counts in UI update
-        objectWillChange.send()

        // Only refresh visible list if this geohash is currently active
        if activeGeohash == geohash {
@@ -1,265 +0,0 @@
-//
-// GeohashPresenceService.swift
-// bitchat
-//
-// Manages the broadcasting of ephemeral presence heartbeats (Kind 20001)
-// to geohash location channels.
-//
-// This is free and unencumbered software released into the public domain.
-//
-
-import Nostr
-import Foundation
-import Combine
-import BitLogger
-import Tor
-
-protocol GeohashPresenceTimerProtocol: AnyObject {
-    var isValid: Bool { get }
-    func invalidate()
-}
-
-private final class GeohashPresenceTimerAdapter: GeohashPresenceTimerProtocol {
-    private let base: Timer
-
-    init(base: Timer) {
-        self.base = base
-    }
-
-    var isValid: Bool { base.isValid }
-
-    func invalidate() {
-        base.invalidate()
-    }
-}
-
-/// Service that coordinates the broadcasting of presence heartbeats.
-///
-/// Behavior:
-/// - Monitors location changes via LocationStateManager
-/// - Broadcasts Kind 20001 events to low-precision geohash channels
-/// - Uses randomized timing (40-80s loop) and decorrelated bursts
-/// - Respects privacy by NOT broadcasting to Neighborhood/Block/Building levels
-@MainActor
-final class GeohashPresenceService: ObservableObject {
-    static let shared = GeohashPresenceService()
-
-    private var subscriptions = Set<AnyCancellable>()
-    private var heartbeatTimer: GeohashPresenceTimerProtocol?
-    private let availableChannelsProvider: () -> [GeohashChannel]
-    private let locationChanges: AnyPublisher<[GeohashChannel], Never>
-    private let torReadyPublisher: AnyPublisher<Void, Never>
-    private let torIsReady: () -> Bool
-    private let torIsForeground: () -> Bool
-    private let deriveIdentity: (String) throws -> NostrIdentity
-    private let relayLookup: (String, Int) -> [String]
-    private let relaySender: (NostrEvent, [String]) -> Void
-    private let sleeper: (UInt64) async -> Void
-    private let scheduleTimer: (TimeInterval, @escaping () -> Void) -> GeohashPresenceTimerProtocol
-    
-    // MARK: - Constants
-
-    // Loop interval range in seconds
-    private let loopMinInterval: TimeInterval
-    private let loopMaxInterval: TimeInterval
-    
-    // Per-broadcast decorrelation delay range in seconds
-    private let burstMinDelay: TimeInterval
-    private let burstMaxDelay: TimeInterval
-
-    // Privacy: Only broadcast to these levels
-    private let allowedPrecisions: Set<Int> = [
-        GeohashChannelLevel.region.precision,    // 2
-        GeohashChannelLevel.province.precision,  // 4
-        GeohashChannelLevel.city.precision       // 5
-    ]
-
-    private init() {
-        let idBridge = NostrIdentityBridge(keychain: KeychainManager())
-        self.availableChannelsProvider = { LocationStateManager.shared.availableChannels }
-        self.locationChanges = LocationStateManager.shared.$availableChannels.eraseToAnyPublisher()
-        self.torReadyPublisher = NotificationCenter.default.publisher(for: .TorDidBecomeReady)
-            .map { _ in () }
-            .eraseToAnyPublisher()
-        self.torIsReady = { TorManager.shared.isReady }
-        self.torIsForeground = { TorManager.shared.isForeground() }
-        self.deriveIdentity = { try idBridge.deriveIdentity(forGeohash: $0) }
-        self.relayLookup = { geohash, count in
-            GeoRelayDirectory.shared.closestRelays(toGeohash: geohash, count: count)
-        }
-        self.relaySender = { event, relays in
-            NostrRelayManager.shared.sendEvent(event, to: relays)
-        }
-        self.sleeper = { nanoseconds in
-            try? await Task.sleep(nanoseconds: nanoseconds)
-        }
-        self.scheduleTimer = { interval, action in
-            GeohashPresenceTimerAdapter(
-                base: Timer.scheduledTimer(withTimeInterval: interval, repeats: false) { _ in
-                    action()
-                }
-            )
-        }
-        self.loopMinInterval = 40.0
-        self.loopMaxInterval = 80.0
-        self.burstMinDelay = 2.0
-        self.burstMaxDelay = 5.0
-        setupObservers()
-    }
-
-    internal init(
-        availableChannelsProvider: @escaping () -> [GeohashChannel],
-        locationChanges: AnyPublisher<[GeohashChannel], Never>,
-        torReadyPublisher: AnyPublisher<Void, Never>,
-        torIsReady: @escaping () -> Bool,
-        torIsForeground: @escaping () -> Bool,
-        deriveIdentity: @escaping (String) throws -> NostrIdentity,
-        relayLookup: @escaping (String, Int) -> [String],
-        relaySender: @escaping (NostrEvent, [String]) -> Void,
-        sleeper: @escaping (UInt64) async -> Void = { nanoseconds in try? await Task.sleep(nanoseconds: nanoseconds) },
-        scheduleTimer: @escaping (TimeInterval, @escaping () -> Void) -> GeohashPresenceTimerProtocol = { interval, action in
-            GeohashPresenceTimerAdapter(
-                base: Timer.scheduledTimer(withTimeInterval: interval, repeats: false) { _ in
-                    action()
-                }
-            )
-        },
-        loopMinInterval: TimeInterval = 40.0,
-        loopMaxInterval: TimeInterval = 80.0,
-        burstMinDelay: TimeInterval = 2.0,
-        burstMaxDelay: TimeInterval = 5.0
-    ) {
-        self.availableChannelsProvider = availableChannelsProvider
-        self.locationChanges = locationChanges
-        self.torReadyPublisher = torReadyPublisher
-        self.torIsReady = torIsReady
-        self.torIsForeground = torIsForeground
-        self.deriveIdentity = deriveIdentity
-        self.relayLookup = relayLookup
-        self.relaySender = relaySender
-        self.sleeper = sleeper
-        self.scheduleTimer = scheduleTimer
-        self.loopMinInterval = loopMinInterval
-        self.loopMaxInterval = loopMaxInterval
-        self.burstMinDelay = burstMinDelay
-        self.burstMaxDelay = burstMaxDelay
-        setupObservers()
-    }
-    
-    /// Start the service (safe to call multiple times)
-    func start() {
-        SecureLogger.info("Presence: service starting...", category: .session)
-        scheduleNextHeartbeat()
-    }
-
-    private func setupObservers() {
-        // Monitor location channel changes
-        locationChanges
-            .dropFirst()
-            .sink { [weak self] _ in
-                self?.handleLocationChange()
-            }
-            .store(in: &subscriptions)
-
-        // Monitor Tor readiness to kick off heartbeat if it was stalled
-        torReadyPublisher
-            .sink { [weak self] _ in
-                self?.handleConnectivityChange()
-            }
-            .store(in: &subscriptions)
-    }
-
-    func handleLocationChange() {
-        // When location changes, we trigger an immediate (but slightly delayed) heartbeat
-        // to announce presence in the new zone, then reset the loop.
-        SecureLogger.debug("Presence: location changed, scheduling update", category: .session)
-        heartbeatTimer?.invalidate()
-        
-        // Small delay to allow location state to settle
-        heartbeatTimer = scheduleTimer(5.0) { [weak self] in
-            Task { @MainActor [weak self] in
-                self?.performHeartbeat()
-            }
-        }
-    }
-    
-    func handleConnectivityChange() {
-        SecureLogger.debug("Presence: connectivity restored, triggering heartbeat", category: .session)
-        // If we were waiting for network, do it now
-        if heartbeatTimer == nil || !heartbeatTimer!.isValid {
-            scheduleNextHeartbeat()
-        }
-    }
-
-    func scheduleNextHeartbeat() {
-        heartbeatTimer?.invalidate()
-        let interval = TimeInterval.random(in: loopMinInterval...loopMaxInterval)
-        heartbeatTimer = scheduleTimer(interval) { [weak self] in
-            Task { @MainActor [weak self] in
-                self?.performHeartbeat()
-            }
-        }
-    }
-
-    func performHeartbeat() {
-        // Always schedule next loop first ensures continuity even if this one fails/skips
-        defer { scheduleNextHeartbeat() }
-
-        // 1. Check preconditions
-        guard torIsReady() else {
-            SecureLogger.debug("Presence: skipping heartbeat (Tor not ready)", category: .session)
-            return
-        }
-        
-        // App must be active (or at least we shouldn't broadcast if in background, usually)
-        if !torIsForeground() {
-            return
-        }
-
-        // 2. Get channels
-        let channels = availableChannelsProvider()
-        guard !channels.isEmpty else { return }
-
-        // 3. Filter and broadcast
-        // We use Task + sleep for decorrelation to allow the main runloop to proceed
-        for channel in channels {
-            // Check privacy restriction
-            if !self.allowedPrecisions.contains(channel.geohash.count) {
-                continue
-            }
-            
-            // Launch independent task for each channel's delay
-            Task { @MainActor in
-                // Random delay for decorrelation
-                let delay = TimeInterval.random(in: self.burstMinDelay...self.burstMaxDelay)
-                let nanoseconds = UInt64(delay * 1_000_000_000)
-                await self.sleeper(nanoseconds)
-                
-                self.broadcastPresence(for: channel.geohash)
-            }
-        }
-    }
-
-    func broadcastPresence(for geohash: String) {
-        do {
-            guard let identity = try? deriveIdentity(geohash) else {
-                return
-            }
-            
-            let event = try NostrProtocol.createGeohashPresenceEvent(
-                geohash: geohash,
-                senderIdentity: identity
-            )
-            
-            // Send via RelayManager
-            let targetRelays = relayLookup(geohash, TransportConfig.nostrGeoRelayCount)
-            
-            if !targetRelays.isEmpty {
-                relaySender(event, targetRelays)
-                SecureLogger.debug("Presence: sent heartbeat for \(geohash) (pub=\(identity.publicKeyHex.prefix(6))...)", category: .session)
-            }
-        } catch {
-            SecureLogger.error("Presence: failed to create event for \(geohash): \(error)", category: .session)
-        }
-    }
-}
@@ -7,53 +7,10 @@
 //

 import BitLogger
-import protocol Nostr.NostrKeychainStoring
-import protocol Noise.SecureMemoryCleaner
 import Foundation
 import Security

-// MARK: - Keychain Error Types
-// BCH-01-009: Proper error classification to distinguish expected states from critical failures
-
-/// Result of a keychain read operation with proper error classification
-enum KeychainReadResult {
-    case success(Data)
-    case itemNotFound        // Expected: key doesn't exist yet
-    case accessDenied        // Critical: app lacks keychain access
-    case deviceLocked        // Recoverable: device is locked
-    case authenticationFailed // Recoverable: biometric/passcode failed
-    case otherError(OSStatus) // Unexpected error
-
-    var isRecoverableError: Bool {
-        switch self {
-        case .deviceLocked, .authenticationFailed:
-            return true
-        default:
-            return false
-        }
-    }
-}
-
-/// Result of a keychain save operation with proper error classification
-enum KeychainSaveResult {
-    case success
-    case duplicateItem       // Can retry with update
-    case accessDenied        // Critical: app lacks keychain access
-    case deviceLocked        // Recoverable: device is locked
-    case storageFull         // Critical: no space available
-    case otherError(OSStatus)
-
-    var isRecoverableError: Bool {
-        switch self {
-        case .duplicateItem, .deviceLocked:
-            return true
-        default:
-            return false
-        }
-    }
-}
-
-protocol KeychainManagerProtocol: SecureMemoryCleaner, NostrKeychainStoring {
+protocol KeychainManagerProtocol {
    func saveIdentityKey(_ keyData: Data, forKey key: String) -> Bool
    func getIdentityKey(forKey key: String) -> Data?
    func deleteIdentityKey(forKey key: String) -> Bool
@@ -64,12 +21,6 @@ protocol KeychainManagerProtocol: SecureMemoryCleaner, NostrKeychainStoring {

    func verifyIdentityKeyExists() -> Bool

-    // BCH-01-009: Methods with proper error classification
-    /// Get identity key with detailed result for error handling
-    func getIdentityKeyWithResult(forKey key: String) -> KeychainReadResult
-    /// Save identity key with detailed result for error handling
-    func saveIdentityKeyWithResult(_ keyData: Data, forKey key: String) -> KeychainSaveResult
-
    // MARK: - Generic Data Storage (consolidated from KeychainHelper)
    /// Save data with a custom service name
    func save(key: String, data: Data, service: String, accessible: CFString?)
@@ -103,181 +54,7 @@ final class KeychainManager: KeychainManagerProtocol {
        SecureLogger.logKeyOperation(.delete, keyType: key, success: result)
        return result
    }
-
-    // MARK: - BCH-01-009: Methods with Proper Error Classification
-
-    /// Get identity key with detailed result for proper error handling
-    /// Distinguishes between missing keys (expected) and critical failures
-    func getIdentityKeyWithResult(forKey key: String) -> KeychainReadResult {
-        let fullKey = "identity_\(key)"
-        return retrieveDataWithResult(forKey: fullKey)
-    }
-
-    /// Save identity key with detailed result and retry logic for transient errors
-    func saveIdentityKeyWithResult(_ keyData: Data, forKey key: String) -> KeychainSaveResult {
-        let fullKey = "identity_\(key)"
-        return saveDataWithResult(keyData, forKey: fullKey)
-    }
-
-    /// Internal method to save data with detailed result and retry for transient errors
-    private func saveDataWithResult(_ data: Data, forKey key: String, retryCount: Int = 2) -> KeychainSaveResult {
-        // Delete any existing item first to ensure clean state
-        _ = delete(forKey: key)
-
-        // Build base query
-        var base: [String: Any] = [
-            kSecClass as String: kSecClassGenericPassword,
-            kSecAttrAccount as String: key,
-            kSecValueData as String: data,
-            kSecAttrService as String: service,
-            kSecAttrAccessible as String: kSecAttrAccessibleWhenUnlocked,
-            kSecAttrLabel as String: "bitchat-\(key)"
-        ]
-        #if os(macOS)
-        base[kSecAttrSynchronizable as String] = false
-        #endif
-
-        func attempt(addAccessGroup: Bool) -> OSStatus {
-            var query = base
-            if addAccessGroup { query[kSecAttrAccessGroup as String] = appGroup }
-            return SecItemAdd(query as CFDictionary, nil)
-        }
-
-        #if os(iOS)
-        var status = attempt(addAccessGroup: true)
-        if status == -34018 { // Missing entitlement, retry without access group
-            status = attempt(addAccessGroup: false)
-        }
-        #else
-        let status = attempt(addAccessGroup: false)
-        #endif
-
-        // Classify the result
-        let result = classifySaveStatus(status)
-
-        // Log all outcomes consistently
-        switch result {
-        case .success:
-            SecureLogger.debug("Keychain save succeeded for key: \(key)", category: .keychain)
-        case .duplicateItem:
-            SecureLogger.warning("Keychain save found duplicate for key: \(key)", category: .keychain)
-        case .accessDenied:
-            SecureLogger.error(NSError(domain: "Keychain", code: Int(status)),
-                               context: "Keychain access denied for key: \(key)", category: .keychain)
-        case .deviceLocked:
-            SecureLogger.warning("Device locked during keychain save for key: \(key)", category: .keychain)
-        case .storageFull:
-            SecureLogger.error(NSError(domain: "Keychain", code: Int(status)),
-                               context: "Keychain storage full for key: \(key)", category: .keychain)
-        case .otherError(let code):
-            SecureLogger.error(NSError(domain: "Keychain", code: Int(code)),
-                               context: "Keychain save failed for key: \(key)", category: .keychain)
-        }
-
-        // Retry transient errors with exponential backoff
-        if result.isRecoverableError && retryCount > 0 {
-            let delayMs = UInt32((3 - retryCount) * 100) // 100ms, 200ms backoff
-            usleep(delayMs * 1000)
-            SecureLogger.debug("Retrying keychain save for key: \(key), attempts remaining: \(retryCount)", category: .keychain)
-            return saveDataWithResult(data, forKey: key, retryCount: retryCount - 1)
-        }
-
-        return result
-    }
-
-    /// Internal method to retrieve data with detailed result
-    private func retrieveDataWithResult(forKey key: String) -> KeychainReadResult {
-        let base: [String: Any] = [
-            kSecClass as String: kSecClassGenericPassword,
-            kSecAttrAccount as String: key,
-            kSecAttrService as String: service,
-            kSecReturnData as String: true,
-            kSecMatchLimit as String: kSecMatchLimitOne
-        ]
-
-        var result: AnyObject?
-        func attempt(withAccessGroup: Bool) -> OSStatus {
-            var q = base
-            if withAccessGroup { q[kSecAttrAccessGroup as String] = appGroup }
-            return SecItemCopyMatching(q as CFDictionary, &result)
-        }
-
-        #if os(iOS)
-        var status = attempt(withAccessGroup: true)
-        if status == -34018 { status = attempt(withAccessGroup: false) }
-        #else
-        let status = attempt(withAccessGroup: false)
-        #endif
-
-        // Classify the result
-        let readResult = classifyReadStatus(status, data: result as? Data)
-
-        // Log all outcomes consistently
-        switch readResult {
-        case .success:
-            SecureLogger.debug("Keychain read succeeded for key: \(key)", category: .keychain)
-        case .itemNotFound:
-            // Expected case - no logging needed for missing keys
-            break
-        case .accessDenied:
-            SecureLogger.error(NSError(domain: "Keychain", code: Int(status)),
-                               context: "Keychain access denied for key: \(key)", category: .keychain)
-        case .deviceLocked:
-            SecureLogger.warning("Device locked during keychain read for key: \(key)", category: .keychain)
-        case .authenticationFailed:
-            SecureLogger.warning("Authentication failed for keychain read of key: \(key)", category: .keychain)
-        case .otherError(let code):
-            SecureLogger.error(NSError(domain: "Keychain", code: Int(code)),
-                               context: "Keychain read failed for key: \(key)", category: .keychain)
-        }
-
-        return readResult
-    }
-
-    /// Classify keychain read status into meaningful categories
-    private func classifyReadStatus(_ status: OSStatus, data: Data?) -> KeychainReadResult {
-        switch status {
-        case errSecSuccess:
-            if let data = data {
-                return .success(data)
-            }
-            return .otherError(status)
-        case errSecItemNotFound:
-            return .itemNotFound
-        case errSecInteractionNotAllowed:
-            // Device is locked or in a state that doesn't allow keychain access
-            return .deviceLocked
-        case errSecAuthFailed:
-            return .authenticationFailed
-        case -34018: // errSecMissingEntitlement
-            return .accessDenied
-        case errSecNotAvailable:
-            return .accessDenied
-        default:
-            return .otherError(status)
-        }
-    }
-
-    /// Classify keychain save status into meaningful categories
-    private func classifySaveStatus(_ status: OSStatus) -> KeychainSaveResult {
-        switch status {
-        case errSecSuccess:
-            return .success
-        case errSecDuplicateItem:
-            return .duplicateItem
-        case errSecInteractionNotAllowed:
-            return .deviceLocked
-        case -34018: // errSecMissingEntitlement
-            return .accessDenied
-        case errSecNotAvailable:
-            return .accessDenied
-        case errSecDiskFull:
-            return .storageFull
-        default:
-            return .otherError(status)
-        }
-    }
-
+    
    // MARK: - Generic Operations
    
    private func save(_ value: String, forKey key: String) -> Bool {
@@ -1,5 +1,4 @@
 import BitLogger
-import Nostr
 import Foundation

 /// Dependencies for location notes, allowing tests to stub relay/identity behavior.
@@ -16,7 +15,7 @@ struct LocationNotesDependencies {
    var deriveIdentity: (_ geohash: String) throws -> NostrIdentity
    var now: () -> Date
    
-    private static let idBridge = NostrIdentityBridge(keychain: KeychainManager())
+    private static let idBridge = NostrIdentityBridge()

    static let live = LocationNotesDependencies(
        relayLookup: { geohash, count in
@@ -64,7 +63,7 @@ final class LocationNotesManager: ObservableObject {

        var displayName: String {
            let suffix = String(pubkey.suffix(4))
-            if let nick = nickname?.trimmedOrNilIfEmpty {
+            if let nick = nickname, !nick.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
                return "\(nick)#\(suffix)"
            }
            return "anon#\(suffix)"
@@ -200,7 +199,8 @@ final class LocationNotesManager: ObservableObject {

    /// Send a location note for the current geohash using the per-geohash identity.
    func send(content: String, nickname: String) {
-        guard let trimmed = content.trimmedOrNilIfEmpty else { return }
+        let trimmed = content.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmed.isEmpty else { return }
        let relays = dependencies.relayLookup(geohash, TransportConfig.nostrGeoRelayCount)
        guard !relays.isEmpty else {
            state = .noRelays
@@ -5,79 +5,6 @@ import Combine
 #if os(iOS) || os(macOS)
 import CoreLocation

-protocol LocationStateManaging: AnyObject {
-    var delegate: CLLocationManagerDelegate? { get set }
-    var desiredAccuracy: CLLocationAccuracy { get set }
-    var distanceFilter: CLLocationDistance { get set }
-    var authorizationStatus: CLAuthorizationStatus { get }
-    func requestWhenInUseAuthorization()
-    func requestLocation()
-    func startUpdatingLocation()
-    func stopUpdatingLocation()
-}
-
-protocol LocationStateGeocoding: AnyObject {
-    func cancelGeocode()
-    func reverseGeocodeLocation(
-        _ location: CLLocation,
-        completionHandler: @escaping ([CLPlacemark]?, Error?) -> Void
-    )
-}
-
-private final class CLLocationManagerAdapter: NSObject, LocationStateManaging {
-    private let base = CLLocationManager()
-
-    var delegate: CLLocationManagerDelegate? {
-        get { base.delegate }
-        set { base.delegate = newValue }
-    }
-
-    var desiredAccuracy: CLLocationAccuracy {
-        get { base.desiredAccuracy }
-        set { base.desiredAccuracy = newValue }
-    }
-
-    var distanceFilter: CLLocationDistance {
-        get { base.distanceFilter }
-        set { base.distanceFilter = newValue }
-    }
-
-    var authorizationStatus: CLAuthorizationStatus {
-        base.authorizationStatus
-    }
-
-    func requestWhenInUseAuthorization() {
-        base.requestWhenInUseAuthorization()
-    }
-
-    func requestLocation() {
-        base.requestLocation()
-    }
-
-    func startUpdatingLocation() {
-        base.startUpdatingLocation()
-    }
-
-    func stopUpdatingLocation() {
-        base.stopUpdatingLocation()
-    }
-}
-
-private final class CLGeocoderAdapter: LocationStateGeocoding {
-    private let base = CLGeocoder()
-
-    func cancelGeocode() {
-        base.cancelGeocode()
-    }
-
-    func reverseGeocodeLocation(
-        _ location: CLLocation,
-        completionHandler: @escaping ([CLPlacemark]?, Error?) -> Void
-    ) {
-        base.reverseGeocodeLocation(location, completionHandler: completionHandler)
-    }
-}
-
 /// Unified manager for location-based channel state including:
 /// - CoreLocation permissions and one-shot location retrieval
 /// - Geohash channel computation from coordinates
@@ -99,8 +26,8 @@ final class LocationStateManager: NSObject, CLLocationManagerDelegate, Observabl

    // MARK: - Private Properties (CoreLocation)

-    private let cl: LocationStateManaging
-    private let geocoder: LocationStateGeocoding
+    private let cl = CLLocationManager()
+    private let geocoder = CLGeocoder()
    private var lastLocation: CLLocation?
    private var refreshTimer: Timer?
    private var isGeocoding: Bool = false
@@ -146,8 +73,6 @@ final class LocationStateManager: NSObject, CLLocationManagerDelegate, Observabl

    private override init() {
        self.storage = .standard
-        self.cl = CLLocationManagerAdapter()
-        self.geocoder = CLGeocoderAdapter()
        super.init()

        // Skip CoreLocation setup in test environments
@@ -167,30 +92,10 @@ final class LocationStateManager: NSObject, CLLocationManagerDelegate, Observabl
    /// Internal initializer for testing with custom storage
    init(storage: UserDefaults) {
        self.storage = storage
-        self.cl = CLLocationManagerAdapter()
-        self.geocoder = CLGeocoderAdapter()
        super.init()
        loadPersistedState()
    }

-    internal init(
-        storage: UserDefaults,
-        locationManager: LocationStateManaging,
-        geocoder: LocationStateGeocoding,
-        shouldInitializeCoreLocation: Bool
-    ) {
-        self.storage = storage
-        self.cl = locationManager
-        self.geocoder = geocoder
-        super.init()
-        loadPersistedState()
-        guard shouldInitializeCoreLocation else { return }
-        cl.delegate = self
-        cl.desiredAccuracy = kCLLocationAccuracyHundredMeters
-        cl.distanceFilter = TransportConfig.locationDistanceFilterMeters
-        initializePermissionState()
-    }
-
    private func loadPersistedState() {
        // Load selected channel
        if let data = storage.data(forKey: selectedChannelKey),
@@ -227,7 +132,12 @@ final class LocationStateManager: NSObject, CLLocationManagerDelegate, Observabl
    }

    private func initializePermissionState() {
-        let status = cl.authorizationStatus
+        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
@@ -246,7 +156,12 @@ final class LocationStateManager: NSObject, CLLocationManagerDelegate, Observabl
    // MARK: - Public API (Permissions & Location)

    func enableLocationChannels() {
-        let status = cl.authorizationStatus
+        let status: CLAuthorizationStatus
+        if #available(iOS 14.0, macOS 11.0, *) {
+            status = cl.authorizationStatus
+        } else {
+            status = CLLocationManager.authorizationStatus()
+        }
        switch status {
        case .notDetermined:
            cl.requestWhenInUseAuthorization()
@@ -597,7 +512,7 @@ final class LocationStateManager: NSObject, CLLocationManagerDelegate, Observabl
    private static func normalizeGeohash(_ s: String) -> String {
        let allowed = Set("0123456789bcdefghjkmnpqrstuvwxyz")
        return s
-            .trimmed
+            .trimmingCharacters(in: .whitespacesAndNewlines)
            .lowercased()
            .replacingOccurrences(of: "#", with: "")
            .filter { allowed.contains($0) }
@@ -6,114 +6,104 @@ final class MeshTopologyTracker {

    private let queue = DispatchQueue(label: "mesh.topology", attributes: .concurrent)
    private let hopSize = 8
-    // Directed claims: Key claims to see Value (neighbors)
-    private var claims: [RoutingID: Set<RoutingID>] = [:]
-    // Last time we received an update from a node
-    private var lastSeen: [RoutingID: Date] = [:]
-
-    // Maximum age for topology claims to be considered fresh for routing
-    // Routes computed using stale topology can fail when the network has changed
-    private static let routeFreshnessThreshold: TimeInterval = 60 // 60 seconds
+    private var adjacency: [RoutingID: Set<RoutingID>] = [:]

    func reset() {
        queue.sync(flags: .barrier) {
-            self.claims.removeAll()
-            self.lastSeen.removeAll()
+            self.adjacency.removeAll()
        }
    }

-    /// Update the topology with a node's self-reported neighbor list
-    func updateNeighbors(for sourceData: Data?, neighbors: [Data]) {
-        guard let source = sanitize(sourceData) else { return }
-        // Sanitize neighbors and exclude self-loops
-        let validNeighbors = Set(neighbors.compactMap { sanitize($0) }).subtracting([source])
-        
+    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) {
-            self.claims[source] = validNeighbors
-            self.lastSeen[source] = Date()
+            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) {
-            self.claims.removeValue(forKey: peer)
-            self.lastSeen.removeValue(forKey: peer)
-        }
-    }
-    
-    /// Prune nodes that haven't updated their topology in `age` seconds
-    func prune(olderThan age: TimeInterval) {
-        let deadline = Date().addingTimeInterval(-age)
-        queue.sync(flags: .barrier) {
-            let stale = self.lastSeen.filter { $0.value < deadline }
-            for (peer, _) in stale {
-                self.claims.removeValue(forKey: peer)
-                self.lastSeen.removeValue(forKey: peer)
+            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 computeRoute(from start: Data?, to goal: Data?, maxHops: Int = 10) -> [Data]? {
+    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 [] } // Direct connection, no intermediate hops
+        if source == target { return [source] }

-        return queue.sync {
-            let now = Date()
-            let freshnessDeadline = now.addingTimeInterval(-Self.routeFreshnessThreshold)
+        let graph = queue.sync { adjacency }
+        guard graph[source] != nil, graph[target] != nil else { return nil }

-            // BFS
-            var visited: Set<RoutingID> = [source]
-            // Queue stores paths: [Start, Hop1, Hop2, ..., Current]
-            var queuePaths: [[RoutingID]] = [[source]]
+        var visited: Set<RoutingID> = [source]
+        var queuePaths: [[RoutingID]] = [[source]]
+        var index = 0

-            while !queuePaths.isEmpty {
-                let path = queuePaths.removeFirst()
-                // Limit path length (path contains source + maxHops + target) -> maxHops intermediate
-                // If maxHops = 10, max edges = 11, max nodes = 12.
-                if path.count > maxHops + 1 { continue }
+        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 }

-                guard let last = path.last else { continue }
-
-                // Get neighbors that 'last' claims to see
-                guard let neighbors = claims[last] else { continue }
-
-                // Check if 'last' node's topology info is fresh
-                guard let lastSeenTime = lastSeen[last], lastSeenTime > freshnessDeadline else {
-                    continue // Skip stale nodes
-                }
-
-                for neighbor in neighbors {
-                    if visited.contains(neighbor) { continue }
-
-                    // CONFIRMED EDGE CHECK:
-                    // 'last' claims 'neighbor' (checked above)
-                    // Does 'neighbor' claim 'last'?
-                    guard let neighborClaims = claims[neighbor],
-                          neighborClaims.contains(last) else {
-                        continue
-                    }
-
-                    // Check if 'neighbor' node's topology info is fresh
-                    guard let neighborSeenTime = lastSeen[neighbor], neighborSeenTime > freshnessDeadline else {
-                        continue // Skip edges to stale nodes
-                    }
-
-                    var nextPath = path
-                    nextPath.append(neighbor)
-
-                    if neighbor == target {
-                        // Return only intermediate hops
-                        // Path: [Source, I1, I2, Target] -> [I1, I2]
-                        return Array(nextPath.dropFirst().dropLast())
-                    }
-
-                    visited.insert(neighbor)
+            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
        }
+
+        return nil
    }

    // MARK: - Helpers
@@ -145,7 +145,7 @@ enum ContentNormalizer {
        }

        // Trim and collapse whitespace
-        let trimmed = simplified.trimmed
+        let trimmed = simplified.trimmingCharacters(in: .whitespacesAndNewlines)
        let collapsed = trimmed.replacingOccurrences(of: "\\s+", with: " ", options: .regularExpression)

        // Take prefix and hash
@@ -6,7 +6,6 @@
 // This is free and unencumbered software released into the public domain.
 //

-import BitFoundation
 import Foundation
 import SwiftUI

@@ -1,25 +1,11 @@
 import BitLogger
-import BitFoundation
 import Foundation

 /// Routes messages using available transports (Mesh, Nostr, etc.)
@MainActor
 final class MessageRouter {
    private let transports: [Transport]
-
-    // Outbox entry with timestamp for TTL-based eviction
-    private struct QueuedMessage {
-        let content: String
-        let nickname: String
-        let messageID: String
-        let timestamp: Date
-    }
-
-    private var outbox: [PeerID: [QueuedMessage]] = [:]
-
-    // Outbox limits to prevent unbounded memory growth
-    private static let maxMessagesPerPeer = 100
-    private static let messageTTLSeconds: TimeInterval = 24 * 60 * 60 // 24 hours
+    private var outbox: [PeerID: [(content: String, nickname: String, messageID: String)]] = [:] // peerID -> queued messages

    init(transports: [Transport]) {
        self.transports = transports
@@ -48,60 +34,52 @@ final class MessageRouter {
        }
    }

-    // MARK: - Transport Selection
-
-    private func reachableTransport(for peerID: PeerID) -> Transport? {
-        transports.first { $0.isPeerReachable(peerID) }
-    }
-
-    private func connectedTransport(for peerID: PeerID) -> Transport? {
-        transports.first { $0.isPeerConnected(peerID) }
-    }
-
-    // MARK: - Message Sending
-
    func sendPrivate(_ content: String, to peerID: PeerID, recipientNickname: String, messageID: String) {
-        if let transport = reachableTransport(for: peerID) {
+        // 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)
        } else {
-            // Queue for later with timestamp for TTL tracking
+            // Queue for later
            if outbox[peerID] == nil { outbox[peerID] = [] }
-
-            let message = QueuedMessage(content: content, nickname: recipientNickname, messageID: messageID, timestamp: Date())
-            outbox[peerID]?.append(message)
-
-            // Enforce per-peer size limit with FIFO eviction
-            if let count = outbox[peerID]?.count, count > Self.maxMessagesPerPeer {
-                let evicted = outbox[peerID]?.removeFirst()
-                SecureLogger.warning("📤 Outbox overflow for \(peerID.id.prefix(8))… - evicted oldest message: \(evicted?.messageID.prefix(8) ?? "?")…", category: .session)
-            }
-
-            SecureLogger.debug("Queued PM for \(peerID.id.prefix(8))… (no reachable transport) id=\(messageID.prefix(8))… queue=\(outbox[peerID]?.count ?? 0)", category: .session)
+            outbox[peerID]?.append((content, recipientNickname, messageID))
+            SecureLogger.debug("Queued PM for \(peerID.id.prefix(8))… (no reachable transport) id=\(messageID.prefix(8))…", category: .session)
        }
    }

    func sendReadReceipt(_ receipt: ReadReceipt, to peerID: PeerID) {
-        if let transport = reachableTransport(for: 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)
        }
    }

    func sendDeliveryAck(_ messageID: String, to peerID: PeerID) {
-        if let transport = reachableTransport(for: 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)
        }
    }

    func sendFavoriteNotification(to peerID: PeerID, isFavorite: Bool) {
-        if let transport = connectedTransport(for: peerID) {
-            transport.sendFavoriteNotification(to: peerID, isFavorite: isFavorite)
-        } else if let transport = reachableTransport(for: peerID) {
+        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)
+        } 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.
        }
    }

@@ -110,25 +88,17 @@ final class MessageRouter {
    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)
-
-        let now = Date()
-        var remaining: [QueuedMessage] = []
-
-        for message in queued {
-            // Skip expired messages (TTL exceeded)
-            if now.timeIntervalSince(message.timestamp) > Self.messageTTLSeconds {
-                SecureLogger.debug("⏰ Expired queued message for \(peerID.id.prefix(8))… id=\(message.messageID.prefix(8))… (age: \(Int(now.timeIntervalSince(message.timestamp)))s)", category: .session)
-                continue
-            }
-
-            if let transport = reachableTransport(for: peerID) {
-                SecureLogger.debug("Outbox -> \(type(of: transport)) for \(peerID.id.prefix(8))… id=\(message.messageID.prefix(8))…", category: .session)
-                transport.sendPrivateMessage(message.content, to: peerID, recipientNickname: message.nickname, messageID: message.messageID)
+        var remaining: [(content: String, nickname: String, messageID: String)] = []
+        
+        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)
            } else {
-                remaining.append(message)
+                remaining.append((content, nickname, messageID))
            }
        }
-
+        
        if remaining.isEmpty {
            outbox.removeValue(forKey: peerID)
        } else {
@@ -139,15 +109,4 @@ final class MessageRouter {
    func flushAllOutbox() {
        for key in Array(outbox.keys) { flushOutbox(for: key) }
    }
-
-    /// Periodically clean up expired messages from all outboxes
-    func cleanupExpiredMessages() {
-        let now = Date()
-        for peerID in Array(outbox.keys) {
-            outbox[peerID]?.removeAll { now.timeIntervalSince($0.timestamp) > Self.messageTTLSeconds }
-            if outbox[peerID]?.isEmpty == true {
-                outbox.removeValue(forKey: peerID)
-            }
-        }
-    }
 }
@@ -1,30 +1,8 @@
-import Nostr
 import Foundation
 import BitLogger
 import Combine
 import Tor

-@MainActor
-protocol NetworkActivationTorControlling: AnyObject {
-    func setAutoStartAllowed(_ allowed: Bool)
-    func startIfNeeded()
-    func shutdownCompletely()
-}
-
-@MainActor
-protocol NetworkActivationRelayControlling: AnyObject {
-    func connect()
-    func disconnect()
-}
-
-protocol NetworkActivationProxyControlling: AnyObject {
-    func setProxyMode(useTor: Bool)
-}
-
-extension TorManager: NetworkActivationTorControlling {}
-extension NostrRelayManager: NetworkActivationRelayControlling {}
-extension TorURLSession: NetworkActivationProxyControlling {}
-
 /// Coordinates when the app is allowed to start Tor and connect to Nostr relays.
 /// Policy: permit start when either location permissions are authorized OR
 /// there exists at least one mutual favorite. Otherwise, do not start.
@@ -39,55 +17,14 @@ final class NetworkActivationService: ObservableObject {
    private var started = false
    private let torPreferenceKey = "networkActivationService.userTorEnabled"
    private var torAutoStartDesired: Bool = false
-    private let storage: UserDefaults
-    private let locationPermissionPublisher: AnyPublisher<LocationChannelManager.PermissionState, Never>
-    private let mutualFavoritesPublisher: AnyPublisher<Set<Data>, Never>
-    private let permissionProvider: () -> LocationChannelManager.PermissionState
-    private let mutualFavoritesProvider: () -> Set<Data>
-    private let torController: NetworkActivationTorControlling
-    private let relayController: NetworkActivationRelayControlling
-    private let proxyController: NetworkActivationProxyControlling
-    private let notificationCenter: NotificationCenter

-    private init() {
-        storage = .standard
-        locationPermissionPublisher = LocationChannelManager.shared.$permissionState.eraseToAnyPublisher()
-        mutualFavoritesPublisher = FavoritesPersistenceService.shared.$mutualFavorites.eraseToAnyPublisher()
-        permissionProvider = { LocationChannelManager.shared.permissionState }
-        mutualFavoritesProvider = { FavoritesPersistenceService.shared.mutualFavorites }
-        torController = TorManager.shared
-        relayController = NostrRelayManager.shared
-        proxyController = TorURLSession.shared
-        notificationCenter = .default
-    }
-
-    internal init(
-        storage: UserDefaults,
-        locationPermissionPublisher: AnyPublisher<LocationChannelManager.PermissionState, Never>,
-        mutualFavoritesPublisher: AnyPublisher<Set<Data>, Never>,
-        permissionProvider: @escaping () -> LocationChannelManager.PermissionState,
-        mutualFavoritesProvider: @escaping () -> Set<Data>,
-        torController: NetworkActivationTorControlling,
-        relayController: NetworkActivationRelayControlling,
-        proxyController: NetworkActivationProxyControlling,
-        notificationCenter: NotificationCenter = .default
-    ) {
-        self.storage = storage
-        self.locationPermissionPublisher = locationPermissionPublisher
-        self.mutualFavoritesPublisher = mutualFavoritesPublisher
-        self.permissionProvider = permissionProvider
-        self.mutualFavoritesProvider = mutualFavoritesProvider
-        self.torController = torController
-        self.relayController = relayController
-        self.proxyController = proxyController
-        self.notificationCenter = notificationCenter
-    }
+    private init() {}

    func start() {
        guard !started else { return }
        started = true

-        if let stored = storage.object(forKey: torPreferenceKey) as? Bool {
+        if let stored = UserDefaults.standard.object(forKey: torPreferenceKey) as? Bool {
            userTorEnabled = stored
        } else {
            userTorEnabled = true
@@ -97,16 +34,16 @@ final class NetworkActivationService: ObservableObject {
        let allowed = basePolicyAllowed()
        activationAllowed = allowed
        torAutoStartDesired = allowed && userTorEnabled
-        torController.setAutoStartAllowed(torAutoStartDesired)
+        TorManager.shared.setAutoStartAllowed(torAutoStartDesired)
        applyTorState(torDesired: torAutoStartDesired)
        if allowed {
-            relayController.connect()
+            NostrRelayManager.shared.connect()
        } else {
-            relayController.disconnect()
+            NostrRelayManager.shared.disconnect()
        }

        // React to location permission changes
-        locationPermissionPublisher
+        LocationChannelManager.shared.$permissionState
            .receive(on: DispatchQueue.main)
            .sink { [weak self] _ in
                self?.reevaluate()
@@ -114,7 +51,7 @@ final class NetworkActivationService: ObservableObject {
            .store(in: &cancellables)

        // React to mutual favorites changes
-        mutualFavoritesPublisher
+        FavoritesPersistenceService.shared.$mutualFavorites
            .receive(on: DispatchQueue.main)
            .sink { [weak self] _ in
                self?.reevaluate()
@@ -125,8 +62,8 @@ final class NetworkActivationService: ObservableObject {
    func setUserTorEnabled(_ enabled: Bool) {
        guard enabled != userTorEnabled else { return }
        userTorEnabled = enabled
-        storage.set(enabled, forKey: torPreferenceKey)
-        notificationCenter.post(
+        UserDefaults.standard.set(enabled, forKey: torPreferenceKey)
+        NotificationCenter.default.post(
            name: .TorUserPreferenceChanged,
            object: nil,
            userInfo: ["enabled": enabled]
@@ -145,33 +82,33 @@ final class NetworkActivationService: ObservableObject {
        }
        if statusChanged || torChanged {
            torAutoStartDesired = torDesired
-            torController.setAutoStartAllowed(torDesired)
+            TorManager.shared.setAutoStartAllowed(torDesired)
            applyTorState(torDesired: torDesired)
        }

        if allowed {
            if torChanged {
                // Reset relay sockets when switching transport path (Tor ↔︎ direct)
-                relayController.disconnect()
+                NostrRelayManager.shared.disconnect()
            }
-            relayController.connect()
+            NostrRelayManager.shared.connect()
        } else if statusChanged {
-            relayController.disconnect()
+            NostrRelayManager.shared.disconnect()
        }
    }

    private func basePolicyAllowed() -> Bool {
-        let permOK = permissionProvider() == .authorized
-        let hasMutual = !mutualFavoritesProvider().isEmpty
+        let permOK = LocationChannelManager.shared.permissionState == .authorized
+        let hasMutual = !FavoritesPersistenceService.shared.mutualFavorites.isEmpty
        return permOK || hasMutual
    }

    private func applyTorState(torDesired: Bool) {
-        proxyController.setProxyMode(useTor: torDesired)
+        TorURLSession.shared.setProxyMode(useTor: torDesired)
        if torDesired {
-            torController.startIfNeeded()
+            TorManager.shared.startIfNeeded()
        } else {
-            torController.shutdownCompletely()
+            TorManager.shared.shutdownCompletely()
        }
    }
 }
@@ -83,8 +83,6 @@
 ///

 import BitLogger
-import BitFoundation
-import Noise
 import Foundation
 import CryptoKit

@@ -201,153 +199,64 @@ final class NoiseEncryptionService {
    
    init(keychain: KeychainManagerProtocol) {
        self.keychain = keychain
-
-        // BCH-01-009: Load or create static identity key with proper error handling
+        
+        // Load or create static identity key (ONLY from keychain)
        let loadedKey: Curve25519.KeyAgreement.PrivateKey
-
-        // Try to load from keychain with proper error classification
-        let noiseKeyResult = keychain.getIdentityKeyWithResult(forKey: "noiseStaticKey")
-
-        switch noiseKeyResult {
-        case .success(let identityData):
-            if let key = try? Curve25519.KeyAgreement.PrivateKey(rawRepresentation: identityData) {
-                loadedKey = key
-                SecureLogger.logKeyOperation(.load, keyType: "noiseStaticKey", success: true)
-            } else {
-                // Data corrupted, regenerate
-                SecureLogger.warning("Noise static key data corrupted, regenerating", category: .keychain)
-                loadedKey = Self.generateAndSaveNoiseKey(keychain: keychain)
-            }
-
-        case .itemNotFound:
-            // Expected case: no key exists yet, create new one
-            loadedKey = Self.generateAndSaveNoiseKey(keychain: keychain)
-
-        case .accessDenied:
-            // Critical error - log but proceed with ephemeral key (will be lost on restart)
-            SecureLogger.error(NSError(domain: "Keychain", code: -1),
-                               context: "Keychain access denied - using ephemeral identity", category: .keychain)
-            loadedKey = Curve25519.KeyAgreement.PrivateKey()
-
-        case .deviceLocked, .authenticationFailed:
-            // Recoverable error - use ephemeral key and warn
-            SecureLogger.warning("Device locked or auth failed - using ephemeral identity until unlocked", category: .keychain)
-            loadedKey = Curve25519.KeyAgreement.PrivateKey()
-
-        case .otherError(let status):
-            // Unexpected error - log and use ephemeral key
-            SecureLogger.error(NSError(domain: "Keychain", code: Int(status)),
-                               context: "Unexpected keychain error - using ephemeral identity", category: .keychain)
-            loadedKey = Curve25519.KeyAgreement.PrivateKey()
+        
+        // Try to load from keychain
+        if let identityData = keychain.getIdentityKey(forKey: "noiseStaticKey"),
+           let key = try? Curve25519.KeyAgreement.PrivateKey(rawRepresentation: identityData) {
+            loadedKey = key
+            SecureLogger.logKeyOperation(.load, keyType: "noiseStaticKey", success: true)
        }
-
+        // If no identity exists, create new one
+        else {
+            loadedKey = Curve25519.KeyAgreement.PrivateKey()
+            let keyData = loadedKey.rawRepresentation
+            
+            // Save to keychain
+            let saved = keychain.saveIdentityKey(keyData, forKey: "noiseStaticKey")
+            SecureLogger.logKeyOperation(.create, keyType: "noiseStaticKey", success: saved)
+        }
+        
        // Now assign the final value
        self.staticIdentityKey = loadedKey
        self.staticIdentityPublicKey = staticIdentityKey.publicKey
-
-        // BCH-01-009: Load or create signing key pair with proper error handling
+        
+        // Load or create signing key pair
        let loadedSigningKey: Curve25519.Signing.PrivateKey
-
-        let signingKeyResult = keychain.getIdentityKeyWithResult(forKey: "ed25519SigningKey")
-
-        switch signingKeyResult {
-        case .success(let signingData):
-            if let key = try? Curve25519.Signing.PrivateKey(rawRepresentation: signingData) {
-                loadedSigningKey = key
-                SecureLogger.logKeyOperation(.load, keyType: "ed25519SigningKey", success: true)
-            } else {
-                // Data corrupted, regenerate
-                SecureLogger.warning("Ed25519 signing key data corrupted, regenerating", category: .keychain)
-                loadedSigningKey = Self.generateAndSaveSigningKey(keychain: keychain)
-            }
-
-        case .itemNotFound:
-            // Expected case: no key exists yet, create new one
-            loadedSigningKey = Self.generateAndSaveSigningKey(keychain: keychain)
-
-        case .accessDenied:
-            // Critical error - log but proceed with ephemeral key
-            SecureLogger.error(NSError(domain: "Keychain", code: -1),
-                               context: "Keychain access denied - using ephemeral signing key", category: .keychain)
-            loadedSigningKey = Curve25519.Signing.PrivateKey()
-
-        case .deviceLocked, .authenticationFailed:
-            // Recoverable error - use ephemeral key and warn
-            SecureLogger.warning("Device locked or auth failed - using ephemeral signing key until unlocked", category: .keychain)
-            loadedSigningKey = Curve25519.Signing.PrivateKey()
-
-        case .otherError(let status):
-            // Unexpected error - log and use ephemeral key
-            SecureLogger.error(NSError(domain: "Keychain", code: Int(status)),
-                               context: "Unexpected keychain error - using ephemeral signing key", category: .keychain)
-            loadedSigningKey = Curve25519.Signing.PrivateKey()
+        
+        // Try to load from keychain
+        if let signingData = keychain.getIdentityKey(forKey: "ed25519SigningKey"),
+           let key = try? Curve25519.Signing.PrivateKey(rawRepresentation: signingData) {
+            loadedSigningKey = key
+            SecureLogger.logKeyOperation(.load, keyType: "ed25519SigningKey", success: true)
        }
-
+        // If no signing key exists, create new one
+        else {
+            loadedSigningKey = Curve25519.Signing.PrivateKey()
+            let keyData = loadedSigningKey.rawRepresentation
+            
+            // Save to keychain
+            let saved = keychain.saveIdentityKey(keyData, forKey: "ed25519SigningKey")
+            SecureLogger.logKeyOperation(.create, keyType: "ed25519SigningKey", success: saved)
+        }
+        
        // Now assign the signing keys
        self.signingKey = loadedSigningKey
        self.signingPublicKey = signingKey.publicKey
-
+        
        // Initialize session manager
        self.sessionManager = NoiseSessionManager(localStaticKey: staticIdentityKey, keychain: keychain)
-
+        
        // Set up session callbacks
        sessionManager.onSessionEstablished = { [weak self] peerID, remoteStaticKey in
            self?.handleSessionEstablished(peerID: peerID, remoteStaticKey: remoteStaticKey)
        }
-
+        
        // Start session maintenance timer
        startRekeyTimer()
    }
-
-    // MARK: - BCH-01-009: Key Generation Helpers with Save Verification
-
-    /// Generate and save a new Noise static key, verifying the save succeeds
-    private static func generateAndSaveNoiseKey(keychain: KeychainManagerProtocol) -> Curve25519.KeyAgreement.PrivateKey {
-        let newKey = Curve25519.KeyAgreement.PrivateKey()
-        let keyData = newKey.rawRepresentation
-
-        // Save to keychain and verify success
-        let saveResult = keychain.saveIdentityKeyWithResult(keyData, forKey: "noiseStaticKey")
-
-        switch saveResult {
-        case .success:
-            SecureLogger.logKeyOperation(.create, keyType: "noiseStaticKey", success: true)
-        case .duplicateItem:
-            // This shouldn't happen since we just tried to load, but handle it
-            SecureLogger.warning("Noise key already exists (race condition?)", category: .keychain)
-        default:
-            // Save failed - log but continue with the key (it will be ephemeral)
-            SecureLogger.error(NSError(domain: "Keychain", code: -1),
-                               context: "Failed to persist noise static key - identity will be lost on restart",
-                               category: .keychain)
-        }
-
-        return newKey
-    }
-
-    /// Generate and save a new Ed25519 signing key, verifying the save succeeds
-    private static func generateAndSaveSigningKey(keychain: KeychainManagerProtocol) -> Curve25519.Signing.PrivateKey {
-        let newKey = Curve25519.Signing.PrivateKey()
-        let keyData = newKey.rawRepresentation
-
-        // Save to keychain and verify success
-        let saveResult = keychain.saveIdentityKeyWithResult(keyData, forKey: "ed25519SigningKey")
-
-        switch saveResult {
-        case .success:
-            SecureLogger.logKeyOperation(.create, keyType: "ed25519SigningKey", success: true)
-        case .duplicateItem:
-            // This shouldn't happen since we just tried to load, but handle it
-            SecureLogger.warning("Signing key already exists (race condition?)", category: .keychain)
-        default:
-            // Save failed - log but continue with the key (it will be ephemeral)
-            SecureLogger.error(NSError(domain: "Keychain", code: -1),
-                               context: "Failed to persist signing key - identity will be lost on restart",
-                               category: .keychain)
-        }
-
-        return newKey
-    }
    
    // MARK: - Public Interface
    
@@ -618,17 +527,6 @@ final class NoiseEncryptionService {
        }
        rateLimiter.resetAll()
    }
-
-    /// Clear session for a specific peer (e.g., on decryption failure to allow re-handshake)
-    func clearSession(for peerID: PeerID) {
-        sessionManager.removeSession(for: peerID)
-        serviceQueue.sync(flags: .barrier) {
-            if let fingerprint = peerFingerprints.removeValue(forKey: peerID) {
-                fingerprintToPeerID.removeValue(forKey: fingerprint)
-            }
-        }
-        SecureLogger.debug("🔓 Cleared Noise session for \(peerID)", category: .session)
-    }
    
    // MARK: - Private Helpers
    
@@ -1,37 +1,9 @@
 import BitLogger
-import BitFoundation
-import Nostr
 import Foundation
 import Combine

 // Minimal Nostr transport conforming to Transport for offline sending
 final class NostrTransport: Transport, @unchecked Sendable {
-    struct Dependencies {
-        let notificationCenter: NotificationCenter
-        let loadFavorites: @MainActor () -> [Data: FavoritesPersistenceService.FavoriteRelationship]
-        let favoriteStatusForNoiseKey: @MainActor (Data) -> FavoritesPersistenceService.FavoriteRelationship?
-        let favoriteStatusForPeerID: @MainActor (PeerID) -> FavoritesPersistenceService.FavoriteRelationship?
-        let currentIdentity: @MainActor () throws -> NostrIdentity?
-        let registerPendingGiftWrap: @MainActor (String) -> Void
-        let sendEvent: @MainActor (NostrEvent) -> Void
-        let scheduleAfter: @Sendable (TimeInterval, @escaping @Sendable () -> Void) -> Void
-
-        static func live(idBridge: NostrIdentityBridge) -> Dependencies {
-            Dependencies(
-                notificationCenter: .default,
-                loadFavorites: { FavoritesPersistenceService.shared.favorites },
-                favoriteStatusForNoiseKey: { FavoritesPersistenceService.shared.getFavoriteStatus(for: $0) },
-                favoriteStatusForPeerID: { FavoritesPersistenceService.shared.getFavoriteStatus(forPeerID: $0) },
-                currentIdentity: { try idBridge.getCurrentNostrIdentity() },
-                registerPendingGiftWrap: { NostrRelayManager.registerPendingGiftWrap(id: $0) },
-                sendEvent: { NostrRelayManager.shared.sendEvent($0) },
-                scheduleAfter: { delay, action in
-                    DispatchQueue.main.asyncAfter(deadline: .now() + delay, execute: action)
-                }
-            )
-        }
-    }
-
    // Provide BLE short peer ID for BitChat embedding
    var senderPeerID = PeerID(str: "")

@@ -45,27 +17,20 @@ final class NostrTransport: Transport, @unchecked Sendable {
    private let readAckInterval: TimeInterval = TransportConfig.nostrReadAckInterval
    private let keychain: KeychainManagerProtocol
    private let idBridge: NostrIdentityBridge
-    private let dependencies: Dependencies
-    private var favoriteStatusObserver: NSObjectProtocol?

    // 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,
-        dependencies: Dependencies? = nil
-    ) {
+    init(keychain: KeychainManagerProtocol, idBridge: NostrIdentityBridge) {
        self.keychain = keychain
        self.idBridge = idBridge
-        self.dependencies = dependencies ?? .live(idBridge: idBridge)
        
        setupObservers()
        
        // Synchronously warm the cache to avoid startup race
-        let favorites = self.dependencies.loadFavorites()
+        let favorites = FavoritesPersistenceService.shared.favorites
        let reachable = favorites.values
            .filter { $0.peerNostrPublicKey != nil }
            .map { PeerID(publicKey: $0.peerNoisePublicKey) }
@@ -75,14 +40,8 @@ final class NostrTransport: Transport, @unchecked Sendable {
        }
    }

-    deinit {
-        if let favoriteStatusObserver {
-            dependencies.notificationCenter.removeObserver(favoriteStatusObserver)
-        }
-    }
-
    private func setupObservers() {
-        favoriteStatusObserver = dependencies.notificationCenter.addObserver(
+        NotificationCenter.default.addObserver(
            forName: .favoriteStatusChanged,
            object: nil,
            queue: nil
@@ -93,7 +52,7 @@ final class NostrTransport: Transport, @unchecked Sendable {

    private func refreshReachablePeers() {
        Task { @MainActor in
-            let favorites = dependencies.loadFavorites()
+            let favorites = FavoritesPersistenceService.shared.favorites
            let reachable = favorites.values
                .filter { $0.peerNostrPublicKey != nil }
                .map { PeerID(publicKey: $0.peerNoisePublicKey) }
@@ -159,15 +118,32 @@ final class NostrTransport: Transport, @unchecked Sendable {

    func sendPrivateMessage(_ content: String, to peerID: PeerID, recipientNickname: String, messageID: String) {
        Task { @MainActor in
-            guard let recipientNpub = resolveRecipientNpub(for: peerID),
-                  let recipientHex = npubToHex(recipientNpub),
-                  let senderIdentity = try? dependencies.currentIdentity() else { return }
-            SecureLogger.debug("NostrTransport: preparing PM to \(recipientNpub.prefix(16))… id=\(messageID.prefix(8))…", category: .session)
+            guard let recipientNpub = resolveRecipientNpub(for: peerID) else { return }
+            guard let senderIdentity = try? idBridge.getCurrentNostrIdentity() else { return }
+            SecureLogger.debug("NostrTransport: preparing PM to \(recipientNpub.prefix(16))… for peerID \(peerID.id.prefix(8))… id=\(messageID.prefix(8))…", category: .session)
+            // Convert recipient npub -> hex (x-only)
+            let recipientHex: String
+            do {
+                let (hrp, data) = try Bech32.decode(recipientNpub)
+                guard hrp == "npub" else {
+                    SecureLogger.error("NostrTransport: recipient key not npub (hrp=\(hrp))", category: .session)
+                    return
+                }
+                recipientHex = data.hexEncodedString()
+            } catch {
+                SecureLogger.error("NostrTransport: failed to decode npub -> hex: \(error)", category: .session)
+                return
+            }
            guard let embedded = NostrEmbeddedBitChat.encodePMForNostr(content: content, messageID: messageID, recipientPeerID: peerID, senderPeerID: senderPeerID) else {
                SecureLogger.error("NostrTransport: failed to embed PM packet", category: .session)
                return
            }
-            sendWrappedMessage(content: embedded, recipientHex: recipientHex, senderIdentity: senderIdentity)
+            guard let event = try? NostrProtocol.createPrivateMessage(content: embedded, recipientPubkey: recipientHex, senderIdentity: senderIdentity) else {
+                SecureLogger.error("NostrTransport: failed to build Nostr event for PM", category: .session)
+                return
+            }
+            SecureLogger.debug("NostrTransport: sending PM giftWrap id=\(event.id.prefix(16))…", category: .session)
+            NostrRelayManager.shared.sendEvent(event)
        }
    }

@@ -182,31 +158,58 @@ final class NostrTransport: Transport, @unchecked Sendable {

    func sendFavoriteNotification(to peerID: PeerID, isFavorite: Bool) {
        Task { @MainActor in
-            guard let recipientNpub = resolveRecipientNpub(for: peerID),
-                  let recipientHex = npubToHex(recipientNpub),
-                  let senderIdentity = try? dependencies.currentIdentity() else { return }
+            guard let recipientNpub = resolveRecipientNpub(for: peerID) else { return }
+            guard let senderIdentity = try? idBridge.getCurrentNostrIdentity() else { return }
            let content = isFavorite ? "[FAVORITED]:\(senderIdentity.npub)" : "[UNFAVORITED]:\(senderIdentity.npub)"
            SecureLogger.debug("NostrTransport: preparing FAVORITE(\(isFavorite)) to \(recipientNpub.prefix(16))…", category: .session)
+            // Convert recipient npub -> hex
+            let recipientHex: String
+            do {
+                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
+            }
            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
            }
-            sendWrappedMessage(content: embedded, recipientHex: recipientHex, senderIdentity: senderIdentity)
+            guard let event = try? NostrProtocol.createPrivateMessage(content: embedded, recipientPubkey: recipientHex, senderIdentity: senderIdentity) else {
+                SecureLogger.error("NostrTransport: failed to build Nostr event for favorite notification", category: .session)
+                return
+            }
+            SecureLogger.debug("NostrTransport: sending favorite giftWrap id=\(event.id.prefix(16))…", category: .session)
+            NostrRelayManager.shared.sendEvent(event)
        }
    }

    func sendBroadcastAnnounce() { /* no-op for Nostr */ }
    func sendDeliveryAck(for messageID: String, to peerID: PeerID) {
        Task { @MainActor in
-            guard let recipientNpub = resolveRecipientNpub(for: peerID),
-                  let recipientHex = npubToHex(recipientNpub),
-                  let senderIdentity = try? dependencies.currentIdentity() else { return }
-            SecureLogger.debug("NostrTransport: preparing DELIVERED ack id=\(messageID.prefix(8))…", category: .session)
+            guard let recipientNpub = resolveRecipientNpub(for: peerID) else { return }
+            guard let senderIdentity = try? idBridge.getCurrentNostrIdentity() else { return }
+            SecureLogger.debug("NostrTransport: preparing DELIVERED ack for id=\(messageID.prefix(8))… to \(recipientNpub.prefix(16))…", category: .session)
+            let recipientHex: String
+            do {
+                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
+            }
            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
            }
-            sendWrappedMessage(content: ack, recipientHex: recipientHex, senderIdentity: senderIdentity)
+            guard let event = try? NostrProtocol.createPrivateMessage(content: ack, recipientPubkey: recipientHex, senderIdentity: senderIdentity) else {
+                SecureLogger.error("NostrTransport: failed to build Nostr event for DELIVERED ack", category: .session)
+                return
+            }
+            SecureLogger.debug("NostrTransport: sending DELIVERED ack giftWrap id=\(event.id.prefix(16))…", category: .session)
+            NostrRelayManager.shared.sendEvent(event)
        }
    }
 }
@@ -218,17 +221,21 @@ extension NostrTransport {
    // MARK: Geohash ACK helpers
    func sendDeliveryAckGeohash(for messageID: String, toRecipientHex recipientHex: String, from identity: NostrIdentity) {
        Task { @MainActor in
-            SecureLogger.debug("GeoDM: send DELIVERED mid=\(messageID.prefix(8))…", category: .session)
+            SecureLogger.debug("GeoDM: send DELIVERED -> recip=\(recipientHex.prefix(8))… mid=\(messageID.prefix(8))… from=\(identity.publicKeyHex.prefix(8))…", category: .session)
            guard let embedded = NostrEmbeddedBitChat.encodeAckForNostrNoRecipient(type: .delivered, messageID: messageID, senderPeerID: senderPeerID) else { return }
-            sendWrappedMessage(content: embedded, recipientHex: recipientHex, senderIdentity: identity, registerPending: true)
+            guard let event = try? NostrProtocol.createPrivateMessage(content: embedded, recipientPubkey: recipientHex, senderIdentity: identity) else { return }
+            NostrRelayManager.registerPendingGiftWrap(id: event.id)
+            NostrRelayManager.shared.sendEvent(event)
        }
    }

    func sendReadReceiptGeohash(_ messageID: String, toRecipientHex recipientHex: String, from identity: NostrIdentity) {
        Task { @MainActor in
-            SecureLogger.debug("GeoDM: send READ mid=\(messageID.prefix(8))…", category: .session)
+            SecureLogger.debug("GeoDM: send READ -> recip=\(recipientHex.prefix(8))… mid=\(messageID.prefix(8))… from=\(identity.publicKeyHex.prefix(8))…", category: .session)
            guard let embedded = NostrEmbeddedBitChat.encodeAckForNostrNoRecipient(type: .readReceipt, messageID: messageID, senderPeerID: senderPeerID) else { return }
-            sendWrappedMessage(content: embedded, recipientHex: recipientHex, senderIdentity: identity, registerPending: true)
+            guard let event = try? NostrProtocol.createPrivateMessage(content: embedded, recipientPubkey: recipientHex, senderIdentity: identity) else { return }
+            NostrRelayManager.registerPendingGiftWrap(id: event.id)
+            NostrRelayManager.shared.sendEvent(event)
        }
    }

@@ -236,12 +243,19 @@ extension NostrTransport {
    func sendPrivateMessageGeohash(content: String, toRecipientHex recipientHex: String, from identity: NostrIdentity, messageID: String) {
        Task { @MainActor in
            guard !recipientHex.isEmpty else { return }
-            SecureLogger.debug("GeoDM: send PM mid=\(messageID.prefix(8))…", category: .session)
+            SecureLogger.debug("GeoDM: send PM -> recip=\(recipientHex.prefix(8))… mid=\(messageID.prefix(8))… from=\(identity.publicKeyHex.prefix(8))…", category: .session)
+            // Build embedded BitChat packet without recipient peer ID
            guard let embedded = NostrEmbeddedBitChat.encodePMForNostrNoRecipient(content: content, messageID: messageID, senderPeerID: senderPeerID) else {
                SecureLogger.error("NostrTransport: failed to embed geohash PM packet", category: .session)
                return
            }
-            sendWrappedMessage(content: embedded, recipientHex: recipientHex, senderIdentity: identity, registerPending: true)
+            guard let event = try? NostrProtocol.createPrivateMessage(content: embedded, recipientPubkey: recipientHex, senderIdentity: identity) else {
+                SecureLogger.error("NostrTransport: failed to build Nostr event for geohash PM", category: .session)
+                return
+            }
+            SecureLogger.debug("NostrTransport: sending geohash PM giftWrap id=\(event.id.prefix(16))…", category: .session)
+            NostrRelayManager.registerPendingGiftWrap(id: event.id)
+            NostrRelayManager.shared.sendEvent(event)
        }
    }
 }
@@ -249,32 +263,6 @@ extension NostrTransport {
 // MARK: - Private Helpers

 extension NostrTransport {
-    /// Converts npub bech32 string to hex pubkey
-    @MainActor
-    private func npubToHex(_ npub: String) -> String? {
-        do {
-            let (hrp, data) = try Bech32.decode(npub)
-            guard hrp == "npub" else { return nil }
-            return data.hexEncodedString()
-        } catch {
-            SecureLogger.error("NostrTransport: failed to decode npub -> hex: \(error)", category: .session)
-            return nil
-        }
-    }
-
-    /// Creates and sends a gift-wrapped private message event
-    @MainActor
-    private func sendWrappedMessage(content: String, recipientHex: String, senderIdentity: NostrIdentity, registerPending: Bool = false) {
-        guard let event = try? NostrProtocol.createPrivateMessage(content: content, recipientPubkey: recipientHex, senderIdentity: senderIdentity) else {
-            SecureLogger.error("NostrTransport: failed to build Nostr event", category: .session)
-            return
-        }
-        if registerPending {
-            dependencies.registerPendingGiftWrap(event.id)
-        }
-        dependencies.sendEvent(event)
-    }
-
    /// Must be called within a barrier on `queue`
    private func processReadQueueIfNeeded() {
        guard !isSendingReadAcks else { return }
@@ -287,21 +275,36 @@ extension NostrTransport {
    /// Sends a single read ack item (called after extraction from queue within barrier)
    private func sendReadAckItem(_ item: QueuedRead) {
        Task { @MainActor in
-            defer { scheduleNextReadAck() }
-            guard let recipientNpub = resolveRecipientNpub(for: item.peerID),
-                  let recipientHex = npubToHex(recipientNpub),
-                  let senderIdentity = try? dependencies.currentIdentity() else { return }
-            SecureLogger.debug("NostrTransport: preparing READ ack id=\(item.receipt.originalMessageID.prefix(8))…", category: .session)
-            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)
+            guard let recipientNpub = resolveRecipientNpub(for: item.peerID) else { scheduleNextReadAck(); return }
+            guard let senderIdentity = try? idBridge.getCurrentNostrIdentity() else { scheduleNextReadAck(); return }
+            SecureLogger.debug("NostrTransport: preparing READ ack for id=\(item.receipt.originalMessageID.prefix(8))… to \(recipientNpub.prefix(16))…", category: .session)
+            // Convert recipient npub -> hex
+            let recipientHex: String
+            do {
+                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
            }
-            sendWrappedMessage(content: ack, recipientHex: recipientHex, senderIdentity: senderIdentity)
+            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
+            }
+            guard let event = try? NostrProtocol.createPrivateMessage(content: ack, recipientPubkey: recipientHex, senderIdentity: senderIdentity) else {
+                SecureLogger.error("NostrTransport: failed to build Nostr event for READ ack", category: .session)
+                scheduleNextReadAck(); return
+            }
+            SecureLogger.debug("NostrTransport: sending READ ack giftWrap id=\(event.id.prefix(16))…", category: .session)
+            NostrRelayManager.shared.sendEvent(event)
+            scheduleNextReadAck()
        }
    }

    private func scheduleNextReadAck() {
-        dependencies.scheduleAfter(readAckInterval) { [weak self] in
+        DispatchQueue.main.asyncAfter(deadline: .now() + readAckInterval) { [weak self] in
            self?.queue.async(flags: .barrier) { [weak self] in
                self?.isSendingReadAcks = false
                self?.processReadQueueIfNeeded()
@@ -312,12 +315,12 @@ extension NostrTransport {
    @MainActor
    private func resolveRecipientNpub(for peerID: PeerID) -> String? {
        if let noiseKey = Data(hexString: peerID.id),
-           let fav = dependencies.favoriteStatusForNoiseKey(noiseKey),
+           let fav = FavoritesPersistenceService.shared.getFavoriteStatus(for: noiseKey),
           let npub = fav.peerNostrPublicKey {
            return npub
        }
        if peerID.id.count == 16,
-           let fav = dependencies.favoriteStatusForPeerID(peerID),
+           let fav = FavoritesPersistenceService.shared.getFavoriteStatus(forPeerID: peerID),
           let npub = fav.peerNostrPublicKey {
            return npub
        }
@@ -6,7 +6,6 @@
 // For more information, see <https://unlicense.org>
 //

-import BitFoundation
 import Foundation
 import UserNotifications
 #if os(iOS)
@@ -15,103 +14,24 @@ import UIKit
 import AppKit
 #endif

-protocol NotificationAuthorizing {
-    func requestAuthorization(
-        options: UNAuthorizationOptions,
-        completionHandler: @escaping (Bool, Error?) -> Void
-    )
-}
-
-protocol NotificationRequestDelivering {
-    func add(_ request: UNNotificationRequest)
-}
-
-private final class NotificationCenterAuthorizerAdapter: NotificationAuthorizing {
-    private let center: UNUserNotificationCenter
-
-    init(center: UNUserNotificationCenter) {
-        self.center = center
-    }
-
-    func requestAuthorization(
-        options: UNAuthorizationOptions,
-        completionHandler: @escaping (Bool, Error?) -> Void
-    ) {
-        center.requestAuthorization(options: options, completionHandler: completionHandler)
-    }
-}
-
-private final class NotificationCenterRequestDelivererAdapter: NotificationRequestDelivering {
-    private let center: UNUserNotificationCenter
-
-    init(center: UNUserNotificationCenter) {
-        self.center = center
-    }
-
-    func add(_ request: UNNotificationRequest) {
-        Task {
-            try? await center.add(request)
-        }
-    }
-}
-
-private struct NoopNotificationAuthorizer: NotificationAuthorizing {
-    func requestAuthorization(
-        options: UNAuthorizationOptions,
-        completionHandler: @escaping (Bool, Error?) -> Void
-    ) {
-        completionHandler(false, nil)
-    }
-}
-
-private struct NoopNotificationRequestDeliverer: NotificationRequestDelivering {
-    func add(_ request: UNNotificationRequest) {}
-}
-
 final class NotificationService {
    static let shared = NotificationService()

-    private let isRunningTestsProvider: () -> Bool
-    private let authorizer: NotificationAuthorizing
-    private let requestDeliverer: NotificationRequestDelivering
-
    /// Returns true if running in test environment (XCTest, Swift Testing, or CI)
    private var isRunningTests: Bool {
-        isRunningTestsProvider()
+        let env = ProcessInfo.processInfo.environment
+        return NSClassFromString("XCTestCase") != nil ||
+               env["XCTestConfigurationFilePath"] != nil ||
+               env["XCTestBundlePath"] != nil ||
+               env["GITHUB_ACTIONS"] != nil ||
+               env["CI"] != nil
    }

-    private init() {
-        self.isRunningTestsProvider = {
-            let env = ProcessInfo.processInfo.environment
-            return NSClassFromString("XCTestCase") != nil ||
-                   env["XCTestConfigurationFilePath"] != nil ||
-                   env["XCTestBundlePath"] != nil ||
-                   env["GITHUB_ACTIONS"] != nil ||
-                   env["CI"] != nil
-        }
-        if isRunningTestsProvider() {
-            self.authorizer = NoopNotificationAuthorizer()
-            self.requestDeliverer = NoopNotificationRequestDeliverer()
-        } else {
-            let center = UNUserNotificationCenter.current()
-            self.authorizer = NotificationCenterAuthorizerAdapter(center: center)
-            self.requestDeliverer = NotificationCenterRequestDelivererAdapter(center: center)
-        }
-    }
-
-    internal init(
-        isRunningTestsProvider: @escaping () -> Bool,
-        authorizer: NotificationAuthorizing,
-        requestDeliverer: NotificationRequestDelivering
-    ) {
-        self.isRunningTestsProvider = isRunningTestsProvider
-        self.authorizer = authorizer
-        self.requestDeliverer = requestDeliverer
-    }
+    private init() {}

    func requestAuthorization() {
        guard !isRunningTests else { return }
-        authorizer.requestAuthorization(options: [.alert, .sound, .badge]) { granted, error in
+        UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .sound, .badge]) { granted, error in
            if granted {
                // Permission granted
            } else {
@@ -144,7 +64,7 @@ final class NotificationService {
            trigger: nil // Deliver immediately
        )

-        requestDeliverer.add(request)
+        UNUserNotificationCenter.current().add(request)
    }
    
    func sendMentionNotification(from sender: String, message: String) {
@@ -176,8 +96,7 @@ final class NotificationService {
    func sendNetworkAvailableNotification(peerCount: Int) {
        let title = "👥 bitchatters nearby!"
        let body = peerCount == 1 ? "1 person around" : "\(peerCount) people around"
-        // Fixed identifier so iOS updates the existing notification instead of creating new ones
-        let identifier = "network-available"
+        let identifier = "network-available-\(Date().timeIntervalSince1970)"

        sendLocalNotification(
            title: title,
@@ -62,7 +62,6 @@ struct NotificationStreamAssembler {
            let hasRecipient = (flags & BinaryProtocol.Flags.hasRecipient) != 0
            let hasSignature = (flags & BinaryProtocol.Flags.hasSignature) != 0
            let isCompressed = (flags & BinaryProtocol.Flags.isCompressed) != 0
-            let hasRoute = (version >= 2) && (flags & BinaryProtocol.Flags.hasRoute) != 0

            let lengthOffset = 12
            let payloadLength: Int
@@ -81,15 +80,6 @@ struct NotificationStreamAssembler {
            var frameLength = framePrefix + payloadLength
            if hasRecipient { frameLength += BinaryProtocol.recipientIDSize }
            if hasSignature { frameLength += BinaryProtocol.signatureSize }
-            
-            if hasRoute {
-                let routeCountOffset = framePrefix + (hasRecipient ? BinaryProtocol.recipientIDSize : 0)
-                let routeCountIndex = buffer.startIndex + routeCountOffset
-                guard buffer.count > routeCountOffset else { break }
-                let routeCount = Int(buffer[routeCountIndex])
-                frameLength += 1 + (routeCount * BinaryProtocol.senderIDSize)
-            }
-            
            if isCompressed {
                let rawLengthFieldBytes = (version == 2) ? 4 : 2
                if payloadLength < rawLengthFieldBytes {
@@ -7,7 +7,6 @@
 //

 import BitLogger
-import BitFoundation
 import Foundation
 import SwiftUI

@@ -1,4 +1,3 @@
-import BitFoundation
 import Foundation
 import Combine

@@ -59,10 +58,6 @@ protocol Transport: AnyObject {
    // QR verification (optional for transports)
    func sendVerifyChallenge(to peerID: PeerID, noiseKeyHex: String, nonceA: Data)
    func sendVerifyResponse(to peerID: PeerID, noiseKeyHex: String, nonceA: Data)
-
-    // Pending file management (BCH-01-002: files held in memory until user accepts)
-    func acceptPendingFile(id: String) -> URL?
-    func declinePendingFile(id: String)
 }

 extension Transport {
@@ -75,9 +70,6 @@ extension Transport {
    func sendMessage(_ content: String, mentions: [String], messageID: String, timestamp: Date) {
        sendMessage(content, mentions: mentions)
    }
-
-    func acceptPendingFile(id: String) -> URL? { nil }
-    func declinePendingFile(id: String) {}
 }

 protocol TransportPeerEventsDelegate: AnyObject {
@@ -21,7 +21,6 @@ enum TransportConfig {

    // Timers
    static let networkResetGraceSeconds: TimeInterval = 600 // 10 minutes
-    static let networkNotificationCooldownSeconds: TimeInterval = 300 // 5 minutes
    static let basePublicFlushInterval: TimeInterval = 0.08  // ~12.5 fps batching

    // BLE duty/announce/connect
@@ -97,12 +96,11 @@ enum TransportConfig {
    // Keep scanning fully ON when we saw traffic very recently
    static let bleRecentTrafficForceScanSeconds: TimeInterval = 10.0
    static let bleThreadSleepWriteShortDelaySeconds: TimeInterval = 0.05
-    static let bleExpectedWritePerFragmentMs: Int = 20
-    static let bleExpectedWriteMaxMs: Int = 5000
-    // Fragment pacing: Conservative spacing to prevent BLE buffer overflow
-    // Aggressive pacing causes packet loss; needs 25-30ms between fragments for reliable delivery
-    static let bleFragmentSpacingMs: Int = 30
-    static let bleFragmentSpacingDirectedMs: Int = 25
+    static let bleExpectedWritePerFragmentMs: Int = 8
+    static let bleExpectedWriteMaxMs: Int = 2000
+    // Faster fragment pacing; use slightly tighter spacing for directed trains
+    static let bleFragmentSpacingMs: Int = 5
+    static let bleFragmentSpacingDirectedMs: Int = 4
    static let bleAnnounceIntervalSeconds: TimeInterval = 4.0
    static let bleDutyOnDurationDense: TimeInterval = 3.0
    static let bleDutyOffDurationDense: TimeInterval = 15.0
@@ -164,14 +162,6 @@ enum TransportConfig {
    static let blePostAnnounceDelaySeconds: TimeInterval = 0.4
    static let bleForceAnnounceMinIntervalSeconds: TimeInterval = 0.15

-    // BCH-01-004: Rate-limiting for subscription-triggered announces
-    // Prevents rapid enumeration attacks by rate-limiting announce responses
-    static let bleSubscriptionRateLimitMinSeconds: TimeInterval = 2.0       // Minimum interval between announces per central
-    static let bleSubscriptionRateLimitBackoffFactor: Double = 2.0          // Exponential backoff multiplier
-    static let bleSubscriptionRateLimitMaxBackoffSeconds: TimeInterval = 30.0  // Maximum backoff period
-    static let bleSubscriptionRateLimitWindowSeconds: TimeInterval = 60.0   // Window for tracking subscription attempts
-    static let bleSubscriptionRateLimitMaxAttempts: Int = 5                 // Max attempts before extended cooldown
-
    // Store-and-forward for directed packets at relays
    static let bleDirectedSpoolWindowSeconds: TimeInterval = 15.0

@@ -213,18 +203,4 @@ enum TransportConfig {
    static let uiShareExtensionDismissDelaySeconds: TimeInterval = 2.0
    static let uiShareAcceptWindowSeconds: TimeInterval = 30.0
    static let uiMigrationCutoffSeconds: TimeInterval = 24 * 60 * 60
-
-    // Gossip Sync Configuration
-    static let syncSeenCapacity: Int = 1000
-    static let syncGCSMaxBytes: Int = 400
-    static let syncGCSTargetFpr: Double = 0.01
-    static let syncMaxMessageAgeSeconds: TimeInterval = 900
-    static let syncMaintenanceIntervalSeconds: TimeInterval = 30.0
-    static let syncStalePeerCleanupIntervalSeconds: TimeInterval = 60.0
-    static let syncStalePeerTimeoutSeconds: TimeInterval = 60.0
-    static let syncFragmentCapacity: Int = 600
-    static let syncFileTransferCapacity: Int = 200
-    static let syncFragmentIntervalSeconds: TimeInterval = 30.0
-    static let syncFileTransferIntervalSeconds: TimeInterval = 60.0
-    static let syncMessageIntervalSeconds: TimeInterval = 15.0
 }
@@ -7,8 +7,6 @@
 //

 import BitLogger
-import BitFoundation
-import Nostr
 import Foundation
 import Combine
 import SwiftUI
@@ -1,6 +1,4 @@
 import Foundation
-import BitLogger
-import BitFoundation

 // Gossip-based sync manager using on-demand GCS filters
 final class GossipSyncManager {
@@ -8,7 +6,6 @@ final class GossipSyncManager {
        func sendPacket(_ packet: BitchatPacket)
        func sendPacket(to peerID: PeerID, packet: BitchatPacket)
        func signPacketForBroadcast(_ packet: BitchatPacket) -> BitchatPacket
-        func getConnectedPeers() -> [PeerID]
    }

    private struct PacketStore {
@@ -77,7 +74,6 @@ final class GossipSyncManager {

    private let myPeerID: PeerID
    private let config: Config
-    private let requestSyncManager: RequestSyncManager
    weak var delegate: Delegate?

    // Storage: broadcast packets by type, and latest announce per sender
@@ -92,10 +88,9 @@ final class GossipSyncManager {
    private var lastStalePeerCleanup: Date = .distantPast
    private var syncSchedules: [SyncSchedule] = []

-    init(myPeerID: PeerID, config: Config = Config(), requestSyncManager: RequestSyncManager) {
+    init(myPeerID: PeerID, config: Config = Config()) {
        self.myPeerID = myPeerID
        self.config = config
-        self.requestSyncManager = requestSyncManager
        var schedules: [SyncSchedule] = []
        if config.seenCapacity > 0 && config.messageSyncIntervalSeconds > 0 {
            schedules.append(SyncSchedule(types: .publicMessages, interval: config.messageSyncIntervalSeconds, lastSent: .distantPast))
@@ -207,19 +202,6 @@ final class GossipSyncManager {
        }
    }

-    private func sendPeriodicSync(for types: SyncTypeFlags) {
-        // Unicast sync to connected peers to allow RSR attribution
-        if let connectedPeers = delegate?.getConnectedPeers(), !connectedPeers.isEmpty {
-            SecureLogger.debug("Sending periodic sync to \(connectedPeers.count) connected peers", category: .sync)
-            for peerID in connectedPeers {
-                sendRequestSync(to: peerID, types: types)
-            }
-        } else {
-            // Fallback to broadcast (discovery phase)
-            sendRequestSync(for: types)
-        }
-    }
-
    private func sendRequestSync(for types: SyncTypeFlags) {
        let payload = buildGcsPayload(for: types)
        let pkt = BitchatPacket(
@@ -236,9 +218,6 @@ final class GossipSyncManager {
    }

    private func sendRequestSync(to peerID: PeerID, types: SyncTypeFlags) {
-        // Register the request for RSR validation
-        requestSyncManager.registerRequest(to: peerID)
-        
        let payload = buildGcsPayload(for: types)
        var recipient = Data()
        var temp = peerID.id
@@ -283,7 +262,6 @@ final class GossipSyncManager {
                if !mightContain(idBytes) {
                    var toSend = pkt
                    toSend.ttl = 0
-                    toSend.isRSR = true // Mark as solicited response
                    delegate?.sendPacket(to: peerID, packet: toSend)
                }
            }
@@ -296,7 +274,6 @@ final class GossipSyncManager {
                if !mightContain(idBytes) {
                    var toSend = pkt
                    toSend.ttl = 0
-                    toSend.isRSR = true // Mark as solicited response
                    delegate?.sendPacket(to: peerID, packet: toSend)
                }
            }
@@ -309,7 +286,6 @@ final class GossipSyncManager {
                if !mightContain(idBytes) {
                    var toSend = pkt
                    toSend.ttl = 0
-                    toSend.isRSR = true // Mark as solicited response
                    delegate?.sendPacket(to: peerID, packet: toSend)
                }
            }
@@ -322,7 +298,6 @@ final class GossipSyncManager {
                if !mightContain(idBytes) {
                    var toSend = pkt
                    toSend.ttl = 0
-                    toSend.isRSR = true // Mark as solicited response
                    delegate?.sendPacket(to: peerID, packet: toSend)
                }
            }
@@ -391,13 +366,11 @@ final class GossipSyncManager {
    private func performPeriodicMaintenance(now: Date = Date()) {
        cleanupExpiredMessages()
        cleanupStaleAnnouncementsIfNeeded(now: now)
-        requestSyncManager.cleanup() // Cleanup expired sync requests
-        
        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
-                sendPeriodicSync(for: syncSchedules[index].types)
+                sendRequestSync(for: syncSchedules[index].types)
            }
        }
    }
@@ -1,86 +0,0 @@
-//
-// RequestSyncManager.swift
-// bitchat
-//
-// This is free and unencumbered software released into the public domain.
-// For more information, see <https://unlicense.org>
-//
-
-import Foundation
-import BitLogger
-import BitFoundation
-
-/// Manages outgoing sync requests and validates incoming responses.
-///
-/// Allows attributing RSR (Request-Sync Response) packets to specific peers
-/// that we have actively requested sync from.
-final class RequestSyncManager {
-    
-    private let queue = DispatchQueue(label: "request.sync.manager", attributes: .concurrent)
-    private var pendingRequests: [PeerID: TimeInterval] = [:]
-    private let responseWindow: TimeInterval
-    private let now: () -> TimeInterval
-    
-    init(
-        responseWindow: TimeInterval = 30.0,
-        now: @escaping () -> TimeInterval = { Date().timeIntervalSince1970 }
-    ) {
-        self.responseWindow = responseWindow
-        self.now = now
-    }
-    
-    /// Register that we are sending a sync request to a peer.
-    /// - Parameter peerID: The peer we are requesting sync from
-    func registerRequest(to peerID: PeerID) {
-        let now = self.now()
-        queue.async(flags: .barrier) {
-            SecureLogger.debug("Registering sync request to \(peerID.id.prefix(8))…", category: .sync)
-            self.pendingRequests[peerID] = now
-        }
-    }
-    
-    /// Check if a packet from a peer is a valid response to a sync request.
-    ///
-    /// - Parameters:
-    ///   - peerID: The sender of the packet
-    ///   - isRSR: Whether the packet is marked as a Request-Sync Response
-    /// - Returns: true if we have a pending request for this peer and the window is open
-    func isValidResponse(from peerID: PeerID, isRSR: Bool) -> Bool {
-        guard isRSR else { return false }
-        
-        return queue.sync {
-            guard let requestTime = pendingRequests[peerID] else {
-                SecureLogger.warning("Received unsolicited RSR packet from \(peerID.id.prefix(8))…", category: .security)
-                return false
-            }
-            
-            let now = self.now()
-            if now - requestTime > responseWindow {
-                SecureLogger.warning("Received RSR packet from \(peerID.id.prefix(8))… outside of response window", category: .security)
-                // We don't remove here because we might receive multiple packets for one request
-                return false
-            }
-            
-            return true
-        }
-    }
-    
-    /// Periodic cleanup of expired requests
-    func cleanup() {
-        let now = self.now()
-        queue.async(flags: .barrier) {
-            let originalCount = self.pendingRequests.count
-            self.pendingRequests = self.pendingRequests.filter { _, timestamp in
-                now - timestamp <= self.responseWindow
-            }
-            let removed = originalCount - self.pendingRequests.count
-            if removed > 0 {
-                SecureLogger.debug("Cleaned up \(removed) expired sync requests", category: .sync)
-            }
-        }
-    }
-
-    var debugPendingRequestCount: Int {
-        queue.sync { pendingRequests.count }
-    }
-}
@@ -0,0 +1,22 @@
+//
+//  Data+SHA256.swift
+//  bitchat
+//
+//  Created by Islam on 26/09/2025.
+//
+
+import struct Foundation.Data
+import struct CryptoKit.SHA256
+
+extension Data {
+    /// Returns the hex representation of SHA256 hash
+    func sha256Fingerprint() -> String {
+        // Implementation matches existing fingerprint generation in NoiseEncryptionService
+        sha256Hash().hexEncodedString()
+    }
+    
+    /// Returns the SHA256 hash wrapped in Data
+    func sha256Hash() -> Data {
+        Data(SHA256.hash(data: self))
+    }
+}
@@ -21,7 +21,9 @@ struct InputValidator {
    /// 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? {
-        guard let trimmed = string.trimmedOrNilIfEmpty, trimmed.count <= maxLength else { return nil }
+        let trimmed = string.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmed.isEmpty else { return nil }
+        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.
@@ -50,13 +52,11 @@ struct InputValidator {
    // MessageType/NoisePayloadType enums; keeping validator free of stale lists.

    /// Validates timestamp is reasonable (not too far in past or future)
-    /// BCH-01-011: Reduced from ±1 hour to ±5 minutes to limit replay attack window
    static func validateTimestamp(_ timestamp: Date) -> Bool {
        let now = Date()
-        // 5 minutes = 300 seconds (industry standard for replay protection)
-        let fiveMinutesAgo = now.addingTimeInterval(-300)
-        let fiveMinutesFromNow = now.addingTimeInterval(300)
-        return timestamp >= fiveMinutesAgo && timestamp <= fiveMinutesFromNow
+        let oneHourAgo = now.addingTimeInterval(-3600)
+        let oneHourFromNow = now.addingTimeInterval(3600)
+        return timestamp >= oneHourAgo && timestamp <= oneHourFromNow
    }

 }
@@ -1,5 +1,4 @@
 import Foundation
-import BitFoundation

 /// Resolves a stable display name for peers, adding a short suffix when collisions exist.
 struct PeerDisplayNameResolver {
@@ -1,44 +0,0 @@
-//
-// SystemSettings.swift
-// bitchat
-//
-// This is free and unencumbered software released into the public domain.
-// For more information, see <https://unlicense.org>
-//
-
-#if os(iOS)
-import UIKit
-#elseif os(macOS)
-import AppKit
-#endif
-
-enum SystemSettings {
-    case bluetooth
-    case location
-    case microphone
-
-    #if os(macOS)
-    private static let baseURL = "x-apple.systempreferences:com.apple.preference.security"
-
-    private var macPrivacyAnchor: String {
-        switch self {
-        case .bluetooth: "Privacy_Bluetooth"
-        case .location: "Privacy_LocationServices"
-        case .microphone: "Privacy_Microphone"
-        }
-    }
-    #endif
-
-    func open() {
-        #if os(iOS)
-        if let url = URL(string: UIApplication.openSettingsURLString) {
-            UIApplication.shared.open(url)
-        }
-        #elseif os(macOS)
-        let urlString = "\(Self.baseURL)?\(macPrivacyAnchor)"
-        if let url = URL(string: urlString) {
-            NSWorkspace.shared.open(url)
-        }
-        #endif
-    }
-}
@@ -78,8 +78,6 @@
 ///

 import BitLogger
-import BitFoundation
-import Nostr
 import Foundation
 import SwiftUI
 import Combine
@@ -146,11 +144,10 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, CommandContextProv
    private let networkResetGraceSeconds: TimeInterval = TransportConfig.networkResetGraceSeconds // avoid refiring on short drops/reconnects
    @Published var nickname: String = "" {
        didSet {
-            // Trim whitespace whenever nickname is set; whitespace-only becomes ""
-            let trimmed = nickname.trimmedOrNilIfEmpty ?? ""
+            // Trim whitespace whenever nickname is set
+            let trimmed = nickname.trimmingCharacters(in: .whitespacesAndNewlines)
            if trimmed != nickname {
                nickname = trimmed
-                return
            }
            // Update mesh service nickname if it's initialized
            if !meshService.myPeerID.isEmpty {
@@ -282,6 +279,8 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, CommandContextProv
    var geoNicknames: [String: String] = [:] // pubkeyHex(lowercased) -> nickname
    // Show Tor status once per app launch
    var torStatusAnnounced = false
+    private var torProgressCancellable: AnyCancellable?
+    private var lastTorProgressAnnounced = -1
    // Track whether a Tor restart is pending so we only announce
    // "tor restarted" after an actual restart, not the first launch.
    var torRestartPending: Bool = false
@@ -324,6 +323,8 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, CommandContextProv
    )
    // Channel activity tracking for background nudges
    var lastPublicActivityAt: [String: Date] = [:]   // channelKey -> last activity time
+    private var lastPublicActivityNotifyAt: [String: Date] = [:]
+    private let channelInactivityThreshold: TimeInterval = TransportConfig.uiChannelInactivityThresholdSeconds
    // Geohash participant tracker
    let participantTracker = GeohashParticipantTracker(activityCutoff: -TransportConfig.uiRecentCutoffFiveMinutesSeconds)
    // Participants who indicated they teleported (by tag in their events)
@@ -447,7 +448,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, CommandContextProv
        self.deduplicationService = MessageDeduplicationService()

        // Wire up dependencies
-        self.commandProcessor.contextProvider = self
+        self.commandProcessor.chatViewModel = self
        self.participantTracker.configure(context: self)
        
        // Subscribe to privateChatManager changes to trigger UI updates
@@ -502,6 +503,8 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, CommandContextProv
            addGeohashOnlySystemMessage(
                String(localized: "system.tor.starting", comment: "System message when Tor is starting")
            )
+            // Suppress incremental Tor progress messages
+            torProgressCancellable = nil
        } else if !TorManager.shared.torEnforced && !torStatusAnnounced {
            torStatusAnnounced = true
            addGeohashOnlySystemMessage(
@@ -628,6 +631,8 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, CommandContextProv
            object: nil
        )
        
+        // Listen for delivery acknowledgments
+                
        // When app becomes active, send read receipts for visible messages
        #if os(macOS)
        NotificationCenter.default.addObserver(
@@ -750,7 +755,8 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, CommandContextProv
    
    private func loadNickname() {
        if let savedNickname = userDefaults.string(forKey: nicknameKey) {
-            nickname = savedNickname.trimmed
+            // Trim whitespace when loading
+            nickname = savedNickname.trimmingCharacters(in: .whitespacesAndNewlines)
        } else {
            nickname = "anon\(Int.random(in: 1000...9999))"
            saveNickname()
@@ -766,10 +772,20 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, CommandContextProv
    }
    
    func validateAndSaveNickname() {
-        nickname = nickname.trimmedOrNilIfEmpty ?? "anon\(Int.random(in: 1000...9999))"
+        // Trim whitespace from nickname
+        let trimmed = nickname.trimmingCharacters(in: .whitespacesAndNewlines)
+        
+        // Check if nickname is empty after trimming
+        if trimmed.isEmpty {
+            nickname = "anon\(Int.random(in: 1000...9999))"
+        } else {
+            nickname = trimmed
+        }
        saveNickname()
    }
-
+    
+    // MARK: - Favorites Management
+    
    // MARK: - Blocked Users Management (Delegated to PeerStateManager)
    
    
@@ -990,7 +1006,8 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, CommandContextProv
    @MainActor
    func sendMessage(_ content: String) {
        // Ignore messages that are empty or whitespace-only to prevent blank lines
-        guard let trimmed = content.trimmedOrNilIfEmpty else { return }
+        let trimmed = content.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !trimmed.isEmpty else { return }

        // Check for commands
        if content.hasPrefix("/") {
@@ -1451,6 +1468,56 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, CommandContextProv
        selectedPrivateChatFingerprint = nil
    }
    
+    // MARK: - Nostr Message Handling
+    
+    @MainActor
+    @objc private func handleNostrMessage(_ notification: Notification) {
+        guard let message = notification.userInfo?["message"] as? BitchatMessage else { return }
+        
+        // Store the Nostr pubkey if provided (for messages from unknown senders)
+        if let nostrPubkey = notification.userInfo?["nostrPubkey"] as? String,
+           let senderPeerID = message.senderPeerID {
+            // Store mapping for read receipts
+            nostrKeyMapping[senderPeerID] = nostrPubkey
+        }
+        
+        // Process the Nostr message through the same flow as Bluetooth messages
+        didReceiveMessage(message)
+    }
+    
+    @objc private func handleDeliveryAcknowledgment(_ notification: Notification) {
+        guard let messageId = notification.userInfo?["messageId"] as? String else { return }
+        
+        
+        
+        // Update the delivery status for the message
+        if let index = messages.firstIndex(where: { $0.id == messageId }) {
+            // Update delivery status to delivered
+            messages[index].deliveryStatus = DeliveryStatus.delivered(to: "nostr", at: Date())
+            
+            // Schedule UI update for delivery status
+            // UI will update automatically
+        }
+        
+        // Also update in private chats if it's a private message
+        for (peerID, chatMessages) in privateChats {
+            if let index = chatMessages.firstIndex(where: { $0.id == messageId }) {
+                privateChats[peerID]?[index].deliveryStatus = DeliveryStatus.delivered(to: "nostr", at: Date())
+                // UI will update automatically
+                break
+            }
+        }
+    }
+    
+    @objc private func handleNostrReadReceipt(_ notification: Notification) {
+        guard let receipt = notification.userInfo?["receipt"] as? ReadReceipt else { return }
+        
+        SecureLogger.info("📖 Handling read receipt for message \(receipt.originalMessageID) from Nostr", category: .session)
+        
+        // Process the read receipt through the same flow as Bluetooth read receipts
+        didReceiveReadReceipt(receipt)
+    }
+    
    @MainActor
    @objc private func handlePeerStatusUpdate(_ notification: Notification) {
        // Update private chat peer if needed when peer status changes
@@ -1801,15 +1868,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, CommandContextProv
            }
        }
    }
-
-    func getMessages(for peerID: PeerID?) -> [BitchatMessage] {
-        if let peerID {
-            return getPrivateChatMessages(for: peerID)
-        } else {
-            return messages
-        }
-    }
-
+    
    @MainActor
    func getPrivateChatMessages(for peerID: PeerID) -> [BitchatMessage] {
        var combined: [BitchatMessage] = []
@@ -1968,7 +2027,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, CommandContextProv
            try? await Task.sleep(nanoseconds: TransportConfig.uiAsyncShortSleepNs) // 0.1 seconds
            
            // Reinitialize Nostr relay manager with new identity
-            nostrRelayManager = NostrRelayManager(dependencies: .live())
+            nostrRelayManager = NostrRelayManager()
            setupNostrMessageHandling()
            nostrRelayManager?.connect()
        }
@@ -1996,42 +2055,13 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, CommandContextProv
            } catch {
                SecureLogger.error("Failed to clear media files during panic: \(error)", category: .session)
            }
-
-            // BCH-01-013: Clear iOS app switcher snapshots
-            // These are stored in Library/Caches/Snapshots/<bundle_id>/
-            #if os(iOS)
-            Self.clearAppSwitcherSnapshots()
-            #endif
        }

        // Force immediate UI update for panic mode
        // UI updates immediately - no flushing needed

    }
-
-    /// BCH-01-013: Clear iOS app switcher snapshots during panic mode
-    /// iOS stores preview screenshots in Library/Caches/Snapshots/<bundle_id>/
-    /// These could reveal sensitive information visible in the app at the time
-    #if os(iOS)
-    private nonisolated static func clearAppSwitcherSnapshots() {
-        do {
-            let cacheDir = try FileManager.default.url(for: .cachesDirectory, in: .userDomainMask, appropriateFor: nil, create: false)
-            let snapshotsDir = cacheDir.appendingPathComponent("Snapshots", isDirectory: true)
-
-            // Clear all snapshots (iOS stores them in subdirectories by bundle ID and scene)
-            if FileManager.default.fileExists(atPath: snapshotsDir.path) {
-                let contents = try FileManager.default.contentsOfDirectory(at: snapshotsDir, includingPropertiesForKeys: nil)
-                for item in contents {
-                    try FileManager.default.removeItem(at: item)
-                }
-                SecureLogger.info("🗑️ Cleared app switcher snapshots during panic clear", category: .session)
-            }
-        } catch {
-            SecureLogger.error("Failed to clear app switcher snapshots: \(error)", category: .session)
-        }
-    }
-    #endif
-
+    
    // MARK: - Autocomplete
    
    func updateAutocomplete(for text: String, cursorPosition: Int) {
@@ -3001,7 +3031,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, CommandContextProv
        Task { @MainActor in
            // Early validation
            guard !isMessageBlocked(message) else { return }
-            guard !message.content.trimmed.isEmpty || message.isPrivate else { return }
+            guard !message.content.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty || message.isPrivate else { return }
            
            // Route to appropriate handler
            if message.isPrivate {
@@ -3016,91 +3046,46 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, CommandContextProv
        }
    }

-    /// Find message index trying both short (16-hex) and long (64-hex) peer ID formats.
-    /// Returns the peer ID where the message was found and its index, or nil if not found.
-    private func findMessageIndex(messageID: String, peerID: PeerID) -> (peerID: PeerID, index: Int)? {
-        // Try direct lookup first
-        if let messages = privateChats[peerID],
-           let idx = messages.firstIndex(where: { $0.id == messageID }) {
-            return (peerID, idx)
-        }
-
-        // Try with full noise key if peerID is short (16 hex chars)
-        if peerID.bare.count == 16,
-           let peer = unifiedPeerService.getPeer(by: peerID),
-           !peer.noisePublicKey.isEmpty {
-            let longID = PeerID(hexData: peer.noisePublicKey)
-            if let messages = privateChats[longID],
-               let idx = messages.firstIndex(where: { $0.id == messageID }) {
-                return (longID, idx)
-            }
-        }
-
-        // Try with short form if peerID is long (64 hex = noise key)
-        if peerID.bare.count == 64 {
-            let shortID = peerID.toShort()
-            if let messages = privateChats[shortID],
-               let idx = messages.firstIndex(where: { $0.id == messageID }) {
-                return (shortID, idx)
-            }
-        }
-
-        return nil
-    }
-
    // Low-level BLE events
    func didReceiveNoisePayload(from peerID: PeerID, type: NoisePayloadType, payload: Data, timestamp: Date) {
        Task { @MainActor in
            switch type {
            case .privateMessage:
                guard let pm = PrivateMessagePacket.decode(from: payload) else { return }
-
-                // BCH-01-012: Check blocking before processing private message to prevent notification bypass
-                if isPeerBlocked(peerID) {
-                    SecureLogger.debug("🚫 Ignoring Noise payload from blocked peer: \(peerID)", category: .security)
-                    return
-                }
-
                let senderName = unifiedPeerService.getPeer(by: peerID)?.nickname ?? "Unknown"
-                let pmMentions = parseMentions(from: pm.content)
-                let msg = BitchatMessage(
-                    id: pm.messageID,
-                    sender: senderName,
-                    content: pm.content,
-                    timestamp: timestamp,
-                    isRelay: false,
-                    originalSender: nil,
-                    isPrivate: true,
-                    recipientNickname: nickname,
-                    senderPeerID: peerID,
-                    mentions: pmMentions.isEmpty ? nil : pmMentions
-                )
+            let pmMentions = parseMentions(from: pm.content)
+            let msg = BitchatMessage(
+                id: pm.messageID,
+                sender: senderName,
+                content: pm.content,
+                timestamp: timestamp,
+                isRelay: false,
+                originalSender: nil,
+                isPrivate: true,
+                recipientNickname: nickname,
+                senderPeerID: peerID,
+                mentions: pmMentions.isEmpty ? nil : pmMentions
+            )
                handlePrivateMessage(msg)
                // Send delivery ACK back over BLE
                meshService.sendDeliveryAck(for: pm.messageID, to: peerID)

            case .delivered:
                guard let messageID = String(data: payload, encoding: .utf8) else { return }
-                guard let name = unifiedPeerService.getPeer(by: peerID)?.nickname,
-                      let (foundPeerID, idx) = findMessageIndex(messageID: messageID, peerID: peerID) else { return }
-
-                // Don't downgrade from .read to .delivered
-                if case .read = privateChats[foundPeerID]?[idx].deliveryStatus { return }
-
-                privateChats[foundPeerID]?[idx].deliveryStatus = .delivered(to: name, at: Date())
-                objectWillChange.send()
+                if let name = unifiedPeerService.getPeer(by: peerID)?.nickname {
+                    if let messages = privateChats[peerID], let idx = messages.firstIndex(where: { $0.id == messageID }) {
+                        privateChats[peerID]?[idx].deliveryStatus = .delivered(to: name, at: Date())
+                        objectWillChange.send()
+                    }
+                }

            case .readReceipt:
                guard let messageID = String(data: payload, encoding: .utf8) else { return }
-                guard let name = unifiedPeerService.getPeer(by: peerID)?.nickname,
-                      let (foundPeerID, idx) = findMessageIndex(messageID: messageID, peerID: peerID) else { return }
-
-                // Explicitly unwrap and re-assign to ensure the @Published setter is called
-                if let messages = privateChats[foundPeerID], idx < messages.count {
-                    messages[idx].deliveryStatus = .read(by: name, at: Date())
-                    privateChats[foundPeerID] = messages
-                    privateChatManager.objectWillChange.send()
-                    objectWillChange.send()
+                if let name = unifiedPeerService.getPeer(by: peerID)?.nickname {
+                    if let messages = privateChats[peerID], let idx = messages.firstIndex(where: { $0.id == messageID }) {
+                        privateChats[peerID]?[idx].deliveryStatus = .read(by: name, at: Date())
+                        objectWillChange.send()
+                    }
                }
            case .verifyChallenge:
                // Parse and respond
@@ -3174,7 +3159,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, CommandContextProv

    func didReceivePublicMessage(from peerID: PeerID, nickname: String, content: String, timestamp: Date, messageID: String?) {
        Task { @MainActor in
-            let normalized = content.trimmed
+            let normalized = content.trimmingCharacters(in: .whitespacesAndNewlines)
            let publicMentions = parseMentions(from: normalized)
            let msg = BitchatMessage(
                id: messageID,
@@ -3347,25 +3332,18 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, CommandContextProv
                self.scheduleNetworkEmptyTimer()
            } else {
                self.invalidateNetworkEmptyTimer()
-                // Don't trim recentlySeenPeers here - let timers handle cleanup.
-                // Trimming immediately causes peers to be treated as "new" when they
-                // briefly drop and reconnect, triggering notification floods.
+                // Trim out peers we no longer observe before comparing for new arrivals
+                self.recentlySeenPeers.formIntersection(meshPeerSet)
                let newPeers = meshPeerSet.subtracting(self.recentlySeenPeers)
-
+                
                if !newPeers.isEmpty {
-                    // Rate limit: max one notification per 5 minutes
-                    let cooldown = TransportConfig.networkNotificationCooldownSeconds
-                    if Date().timeIntervalSince(self.lastNetworkNotificationTime) >= cooldown {
-                        // Only mark peers as seen when we actually notify about them
-                        // This ensures peers arriving during cooldown will be included in the next notification
-                        self.recentlySeenPeers.formUnion(newPeers)
-                        self.lastNetworkNotificationTime = Date()
-                        NotificationService.shared.sendNetworkAvailableNotification(peerCount: meshPeers.count)
-                        SecureLogger.info(
-                            "👥 Sent bitchatters nearby notification for \(meshPeers.count) mesh peers (new: \(newPeers.count))",
-                            category: .session
-                        )
-                    }
+                    self.lastNetworkNotificationTime = Date()
+                    self.recentlySeenPeers.formUnion(newPeers)
+                    NotificationService.shared.sendNetworkAvailableNotification(peerCount: meshPeers.count)
+                    SecureLogger.info(
+                        "👥 Sent bitchatters nearby notification for \(meshPeers.count) mesh peers (new: \(newPeers.count))",
+                        category: .session
+                    )
                    self.scheduleNetworkResetTimer()
                }
            }
@@ -3782,8 +3760,10 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, CommandContextProv
        // Removed background nudge notification for generic "new chats!"

        // Append via batching buffer (skip empty content) with simple dedup by ID
-        if !finalMessage.content.trimmed.isEmpty, !messages.contains(where: { $0.id == finalMessage.id }) {
-            publicMessagePipeline.enqueue(finalMessage)
+        if !finalMessage.content.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
+            if !messages.contains(where: { $0.id == finalMessage.id }) {
+                publicMessagePipeline.enqueue(finalMessage)
+            }
        }
    }
    
@@ -5,11 +5,9 @@
 // Geohash and Nostr logic for ChatViewModel
 //

-import Nostr
 import Foundation
 import Combine
 import BitLogger
-import BitFoundation
 import SwiftUI
 import Tor

@@ -58,9 +56,7 @@ extension ChatViewModel {
    }
    
    func subscribeNostrEvent(_ event: NostrEvent) {
-        guard event.isValidSignature() else { return }
-        guard (event.kind == NostrProtocol.EventKind.ephemeralEvent.rawValue || 
-               event.kind == NostrProtocol.EventKind.geohashPresence.rawValue),
+        guard event.kind == NostrProtocol.EventKind.ephemeralEvent.rawValue,
              !deduplicationService.hasProcessedNostrEvent(event.id)
        else {
            return
@@ -79,7 +75,7 @@ extension ChatViewModel {
        }
        
        if let nickTag = event.tags.first(where: { $0.first == "n" }), nickTag.count >= 2 {
-            let nick = nickTag[1].trimmed
+            let nick = nickTag[1].trimmingCharacters(in: .whitespacesAndNewlines)
            geoNicknames[event.pubkey.lowercased()] = nick
        }
        
@@ -90,11 +86,6 @@ extension ChatViewModel {
        // Update participants last-seen for this pubkey
        participantTracker.recordParticipant(pubkeyHex: event.pubkey)
        
-        // If presence heartbeat (Kind 20001), stop here - no content to display
-        if event.kind == NostrProtocol.EventKind.geohashPresence.rawValue {
-            return
-        }
-        
        // 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"
@@ -117,8 +108,8 @@ extension ChatViewModel {
        }
        
        let senderName = displayNameForNostrPubkey(event.pubkey)
-        let content = event.content.trimmed
-
+        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())
@@ -133,28 +124,20 @@ extension ChatViewModel {
            mentions: mentions.isEmpty ? nil : mentions
        )
        Task { @MainActor in
-            // BCH-01-012: Check blocking before any notifications
-            // handlePublicMessage has its own blocking check but returns silently,
-            // so we must also guard checkForMentions to prevent notification bypass
-            let isBlocked = identityManager.isNostrBlocked(pubkeyHexLowercased: event.pubkey.lowercased())
-
            handlePublicMessage(msg)
-
-            // Only check mentions and send haptic if sender is not blocked
-            if !isBlocked {
-                checkForMentions(msg)
-                sendHapticFeedback(for: msg)
-            }
+            checkForMentions(msg)
+            sendHapticFeedback(for: msg)
        }
    }
-
+    
    func subscribeGiftWrap(_ giftWrap: NostrEvent, id: NostrIdentity) {
-        guard giftWrap.isValidSignature() else { return }
        guard !deduplicationService.hasProcessedNostrEvent(giftWrap.id) else { return }
        deduplicationService.recordNostrEvent(giftWrap.id)
        
        guard let (content, senderPubkey, rumorTs) = try? NostrProtocol.decryptPrivateMessage(giftWrap: giftWrap, recipientIdentity: id),
-              let packet = Self.decodeEmbeddedBitChatPacket(from: content),
+              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 {
@@ -194,7 +177,7 @@ extension ChatViewModel {
        case .mesh:
            refreshVisibleMessages(from: .mesh)
            // Debug: log if any empty messages are present
-            let emptyMesh = messages.filter { $0.content.trimmed.isEmpty }.count
+            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)
            }
@@ -256,10 +239,8 @@ extension ChatViewModel {
    }
    
    func handleNostrEvent(_ event: NostrEvent) {
-        guard event.isValidSignature() else { return }
-        // Only handle ephemeral kind 20000 or presence kind 20001 with matching tag
-        guard (event.kind == NostrProtocol.EventKind.ephemeralEvent.rawValue ||
-               event.kind == NostrProtocol.EventKind.geohashPresence.rawValue) else { return }
+        // Only handle ephemeral kind 20000 with matching tag
+        guard event.kind == NostrProtocol.EventKind.ephemeralEvent.rawValue else { return }
        
        // Deduplicate
        if deduplicationService.hasProcessedNostrEvent(event.id) { return }
@@ -269,11 +250,6 @@ extension ChatViewModel {
        let tagSummary = event.tags.map { "[" + $0.joined(separator: ",") + "]" }.joined(separator: ",")
        SecureLogger.debug("GeoTeleport: recv pub=\(event.pubkey.prefix(8))… tags=\(tagSummary)", category: .session)
        
-        // If this pubkey is blocked, skip mapping, participants, and timeline
-        if identityManager.isNostrBlocked(pubkeyHexLowercased: event.pubkey) {
-            return
-        }
-        
        // 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"
@@ -297,9 +273,6 @@ extension ChatViewModel {
            }
        }
        
-        // Update participants last-seen for this pubkey
-        participantTracker.recordParticipant(pubkeyHex: event.pubkey)
-
        // Skip only very recent self-echo from relay; include older self events for hydration
        if isSelf {
            let eventTime = Date(timeIntervalSince1970: TimeInterval(event.created_at))
@@ -310,26 +283,28 @@ extension ChatViewModel {
        
        // Cache nickname from tag if present
        if let nickTag = event.tags.first(where: { $0.first == "n" }), nickTag.count >= 2 {
-            geoNicknames[event.pubkey.lowercased()] = nickTag[1].trimmed
+            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
        
-        // If presence heartbeat (Kind 20001), stop here - no content to display
-        if event.kind == NostrProtocol.EventKind.geohashPresence.rawValue {
-            return
-        }
+        // 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.trimmed.isEmpty {
+        if let teleTag = event.tags.first(where: { $0.first == "t" }), teleTag.count >= 2, (teleTag[1] == "teleport"),
+           content.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty {
            return
        }
        
@@ -371,7 +346,6 @@ extension ChatViewModel {
    }
    
    func handleGiftWrap(_ giftWrap: NostrEvent, id: NostrIdentity) {
-        guard giftWrap.isValidSignature() else { return }
        if deduplicationService.hasProcessedNostrEvent(giftWrap.id) {
            return
        }
@@ -385,7 +359,9 @@ extension ChatViewModel {
        
        SecureLogger.debug("GeoDM: decrypted gift-wrap id=\(giftWrap.id.prefix(16))... from=\(senderPubkey.prefix(8))...", category: .session)
        
-        guard let packet = Self.decodeEmbeddedBitChatPacket(from: content),
+        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 {
@@ -488,9 +464,7 @@ extension ChatViewModel {
    }
    
    func subscribeNostrEvent(_ event: NostrEvent, gh: String) {
-        guard event.isValidSignature() else { return }
-        guard (event.kind == NostrProtocol.EventKind.ephemeralEvent.rawValue ||
-               event.kind == NostrProtocol.EventKind.geohashPresence.rawValue) else { return }
+        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)
@@ -499,8 +473,9 @@ extension ChatViewModel {
        participantTracker.recordParticipant(pubkeyHex: event.pubkey, geohash: gh)
        
        // Notify only on rising-edge: previously zero people, now someone sends a chat
-        guard let content = event.content.trimmedOrNilIfEmpty else { return }
-
+        let content = event.content.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !content.isEmpty else { return }
+        
        // Respect geohash blocks
        if identityManager.isNostrBlocked(pubkeyHexLowercased: event.pubkey.lowercased()) { return }
        
@@ -605,7 +580,6 @@ extension ChatViewModel {
    }
    
    func processNostrMessage(_ giftWrap: NostrEvent) async {
-        guard giftWrap.isValidSignature() else { return }
        guard let currentIdentity = try? idBridge.getCurrentNostrIdentity() else { return }
        
        do {
@@ -623,7 +597,8 @@ extension ChatViewModel {
            
            // Check if it's a BitChat packet embedded in the content (bitchat1:...)
            if content.hasPrefix("bitchat1:") {
-                guard let packet = Self.decodeEmbeddedBitChatPacket(from: content) else {
+                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
                }
@@ -634,23 +609,24 @@ extension ChatViewModel {
                // 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,
-                   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
+                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
+                            }
                        }
                    }
                }
@@ -803,19 +779,6 @@ extension ChatViewModel {
        messageRouter.sendFavoriteNotification(to: peerID, isFavorite: isFavorite)
    }

-    private static func decodeEmbeddedBitChatPacket(from content: String) -> BitchatPacket? {
-        guard content.hasPrefix("bitchat1:") else { return nil }
-        let encoded = String(content.dropFirst("bitchat1:".count))
-        let maxBytes = FileTransferLimits.maxFramedFileBytes
-        // Base64url length upper bound for maxBytes (padded length; unpadded is <= this).
-        let maxEncoded = ((maxBytes + 2) / 3) * 4
-        guard encoded.count <= maxEncoded else { return nil }
-        guard let packetData = Self.base64URLDecode(encoded),
-              packetData.count <= maxBytes
-        else { return nil }
-        return BitchatPacket.from(packetData)
-    }
-
    // MARK: - Geohash Nickname Resolution (for /block in geohash)

    func nostrPubkeyForDisplayName(_ name: String) -> String? {
@@ -5,11 +5,9 @@
 // Private chat and media transfer logic for ChatViewModel
 //

-import Nostr
 import Foundation
 import Combine
 import BitLogger
-import BitFoundation
 import SwiftUI

 extension ChatViewModel {
@@ -321,7 +319,7 @@ extension ChatViewModel {
        }

        let targetPeer = selectedPrivateChatPeer
-        let message = enqueueMediaMessage(content: "\(MimeType.Category.audio.messagePrefix)\(url.lastPathComponent)", targetPeer: targetPeer)
+        let message = enqueueMediaMessage(content: "[voice] \(url.lastPathComponent)", targetPeer: targetPeer)
        let messageID = message.id
        let transferId = makeTransferID(messageID: messageID)

@@ -366,36 +364,6 @@ extension ChatViewModel {
        }
    }

-    #if os(iOS)
-    func processThenSendImage(_ image: UIImage?) {
-        guard let image else { return }
-        Task.detached {
-            do {
-                let processedURL = try ImageUtils.processImage(image)
-                await MainActor.run {
-                    self.sendImage(from: processedURL)
-                }
-            } catch {
-                SecureLogger.error("Image processing failed: \(error)", category: .session)
-            }
-        }
-    }
-    #elseif os(macOS)
-    func processThenSendImage(from url: URL?) {
-        guard let url else { return }
-        Task.detached {
-            do {
-                let processedURL = try ImageUtils.processImage(at: url)
-                await MainActor.run {
-                    self.sendImage(from: processedURL)
-                }
-            } catch {
-                SecureLogger.error("Image processing failed: \(error)", category: .session)
-            }
-        }
-    }
-    #endif
-
    @MainActor
    func sendImage(from sourceURL: URL, cleanup: (() -> Void)? = nil) {
        guard canSendMediaInCurrentContext else {
@@ -430,7 +398,7 @@ extension ChatViewModel {
                )
                guard packet.encode() != nil else { throw MediaSendError.encodingFailed }
                await MainActor.run {
-                    let message = self.enqueueMediaMessage(content: "\(MimeType.Category.image.messagePrefix)\(outputURL.lastPathComponent)", targetPeer: targetPeer)
+                    let message = self.enqueueMediaMessage(content: "[image] \(outputURL.lastPathComponent)", targetPeer: targetPeer)
                    let messageID = message.id
                    let transferId = self.makeTransferID(messageID: messageID)
                    self.registerTransfer(transferId: transferId, messageID: messageID)
@@ -549,19 +517,20 @@ extension ChatViewModel {

    func cleanupLocalFile(forMessage message: BitchatMessage) {
        // Check both outgoing and incoming directories for thorough cleanup
-        let categories: [MimeType.Category] = [.audio, .image, .file]
-        guard let category = categories.first(where: { message.content.hasPrefix($0.messagePrefix) }),
-              let rawFilename = String(message.content.dropFirst(category.messagePrefix.count)).trimmedOrNilIfEmpty,
-              let base = try? applicationFilesDirectory(),
-              // Security: Extract only the last path component to prevent directory traversal
-              let safeFilename = (rawFilename as NSString).lastPathComponent.nilIfEmpty,
-              safeFilename != "." && safeFilename != ".."
-        else {
-            return
-        }
+        let prefixes = ["[voice] ", "[image] ", "[file] "]
+        let subdirs = ["voicenotes/outgoing", "voicenotes/incoming",
+                       "images/outgoing", "images/incoming",
+                       "files/outgoing", "files/incoming"]
+
+        guard let prefix = prefixes.first(where: { message.content.hasPrefix($0) }) else { return }
+        let rawFilename = String(message.content.dropFirst(prefix.count)).trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !rawFilename.isEmpty, let base = try? applicationFilesDirectory() else { return }
+
+        // Security: Extract only the last path component to prevent directory traversal
+        let safeFilename = (rawFilename as NSString).lastPathComponent
+        guard !safeFilename.isEmpty && safeFilename != "." && safeFilename != ".." else { return }

        // Try all possible locations (outgoing and incoming)
-        let subdirs = categories.flatMap { ["\($0.mediaDir)/outgoing", "\($0.mediaDir)/incoming"] }
        for subdir in subdirs {
            let target = base.appendingPathComponent(subdir, isDirectory: true).appendingPathComponent(safeFilename)

@@ -771,11 +740,15 @@ extension ChatViewModel {
        
        if isViewing {
            // Mark read immediately if viewing
-            // Use the incoming peerID directly - it has the established Noise session.
-            // Don't use PeerID(hexData: noiseKey) as that creates a 64-hex ID without a session.
-            // Use meshService directly (not messageRouter) so it queues if peer disconnects.
+            // Use router to send read receipt
            let receipt = ReadReceipt(originalMessageID: message.id, readerID: meshService.myPeerID, readerNickname: nickname)
-            meshService.sendReadReceipt(receipt, to: peerID)
+            if let key = noiseKey {
+                 // Send via router to stable key if available (preferred for persistence/Nostr fallback)
+                 messageRouter.sendReadReceipt(receipt, to: PeerID(hexData: key))
+            } else {
+                 // Fallback to mesh direct
+                 meshService.sendReadReceipt(receipt, to: peerID)
+            }
            sentReadReceipts.insert(message.id)
        } else {
            // Notify
@@ -24,7 +24,7 @@ extension ChatViewModel {
            }
        }
    }
-
+    
    @objc func handleTorWillRestart() {
        Task { @MainActor in
            self.torRestartPending = true
@@ -1,142 +0,0 @@
-//
-// VoiceRecordingViewModel.swift
-// bitchat
-//
-// This is free and unencumbered software released into the public domain.
-// For more information, see <https://unlicense.org>
-//
-
-import BitLogger
-import Foundation
-
-@MainActor
-final class VoiceRecordingViewModel: ObservableObject {
-    enum State: Equatable {
-        case idle
-        case requestingPermission
-        case permissionDenied
-        case preparing
-        case recording(startDate: Date)
-        case error(message: String)
-
-        var isActive: Bool {
-            switch self {
-            case .preparing, .recording: true
-            case .idle, .requestingPermission, .permissionDenied, .error: false
-            }
-        }
-
-        var alertMessage: String {
-            switch self {
-            case .error(let message): message
-            case .permissionDenied: "Microphone access is required to record voice notes."
-            case .idle, .requestingPermission, .preparing, .recording: ""
-            }
-        }
-
-        fileprivate func duration(for date: Date) -> TimeInterval {
-            switch self {
-            case .idle, .requestingPermission, .preparing, .permissionDenied, .error: 0
-            case .recording(let startDate): date.timeIntervalSince(startDate)
-            }
-        }
-    }
-
-    var showAlert: Bool {
-        get {
-            switch state {
-            case .permissionDenied, .error:   true
-            case .idle, .requestingPermission, .preparing, .recording: false
-            }
-        }
-        set {
-            if !newValue { state = .idle }
-        }
-    }
-
-    @Published private(set) var state = State.idle
-
-    func formattedDuration(for date: Date) -> String {
-        let clamped = max(0, state.duration(for: date))
-        let totalMilliseconds = Int(clamped * 1000)
-        let minutes = totalMilliseconds / 60_000
-        let seconds = (totalMilliseconds % 60_000) / 1_000
-        let centiseconds = (totalMilliseconds % 1_000) / 10
-        return String(format: "%02d:%02d.%02d", minutes, seconds, centiseconds)
-    }
-
-    func start(shouldShow: Bool) {
-        guard shouldShow, state == .idle else { return }
-        state = .requestingPermission
-        Task {
-            let granted = await VoiceRecorder.shared.requestPermission()
-            guard state == .requestingPermission else { return }
-            guard granted else {
-                state = .permissionDenied
-                return
-            }
-            state = .preparing
-            do {
-                try await VoiceRecorder.shared.startRecording()
-                guard state == .preparing else {
-                    cancel()
-                    return
-                }
-                state = .recording(startDate: Date())
-            } catch {
-                SecureLogger.error("Voice recording failed to start: \(error)", category: .session)
-                await VoiceRecorder.shared.cancelRecording()
-                guard state == .preparing else { return }
-                state = .error(message: "Could not start recording.")
-            }
-        }
-    }
-
-    func finish(completion: ((URL) -> Void)?) {
-        let previousState = state
-
-        switch previousState {
-        case .permissionDenied, .error:
-            return
-        case .idle, .requestingPermission, .preparing, .recording:
-            break
-        }
-
-        state = .idle
-
-        guard case .recording(let startDate) = previousState, let completion else {
-            Task { await VoiceRecorder.shared.cancelRecording() }
-            return
-        }
-
-        Task {
-            let finalDuration = Date().timeIntervalSince(startDate)
-            if let url = await VoiceRecorder.shared.stopRecording(),
-               isValidRecording(at: url, duration: finalDuration) {
-                completion(url)
-            } else {
-                guard state == .idle else { return }
-                state = .error(
-                    message: finalDuration < VoiceRecorder.minRecordingDuration
-                    ? "Recording is too short."
-                    : "Recording failed to save."
-                )
-            }
-        }
-    }
-
-    func cancel() {
-        finish(completion: nil)
-    }
-
-    private func isValidRecording(at url: URL, duration: TimeInterval) -> Bool {
-        if let attributes = try? FileManager.default.attributesOfItem(atPath: url.path),
-           let fileSize = attributes[.size] as? NSNumber,
-           fileSize.intValue > 0,
-           duration >= VoiceRecorder.minRecordingDuration {
-            return true
-        }
-        try? FileManager.default.removeItem(at: url)
-        return false
-    }
-}
@@ -86,6 +86,10 @@ struct AppInfoView: View {
            ]
        }

+        enum Warning {
+            static let title: LocalizedStringKey = "app_info.warning.title"
+            static let message: LocalizedStringKey = "app_info.warning.message"
+        }
    }
    
    var body: some View {
@@ -188,6 +192,24 @@ struct AppInfoView: View {

                FeatureRow(info: Strings.Privacy.panic)
            }
+
+            // Warning
+            VStack(alignment: .leading, spacing: 6) {
+                SectionHeader(Strings.Warning.title)
+                    .foregroundColor(Color.red)
+                
+                Text(Strings.Warning.message)
+                    .font(.bitchatSystem(size: 14, design: .monospaced))
+                    .foregroundColor(Color.red)
+                    .fixedSize(horizontal: false, vertical: true)
+            }
+            .padding(.top, 6)
+            .padding(.bottom, 16)
+            .padding(.horizontal)
+            .background(Color.red.opacity(0.1))
+            .cornerRadius(8)
+            
+            .padding(.top)
        }
        .padding()
    }
@@ -5,7 +5,6 @@
 //  Created by Islam on 29/10/2025.
 //

-import Nostr
 import SwiftUI

 struct CommandSuggestionsView: View {
@@ -77,7 +76,7 @@ struct CommandSuggestionsView: View {
    let keychain = KeychainManager()
    let viewModel = ChatViewModel(
        keychain: keychain,
-        idBridge: NostrIdentityBridge(keychain: keychain),
+        idBridge: NostrIdentityBridge(),
        identityManager: SecureIdentityStateManager(keychain)
    )
    
@@ -15,22 +15,10 @@ struct PaymentChipView: View {
    enum PaymentType {
        case cashu(String)
        case lightning(String)
-
-        private static let cashuAllowedCharacters = CharacterSet.alphanumerics.union(CharacterSet(charactersIn: "-_"))
-
-        private static func cashuURL(from link: String) -> URL? {
-            if let url = URL(string: link), url.scheme != nil {
-                return url
-            }
-            let enc = link.addingPercentEncoding(withAllowedCharacters: cashuAllowedCharacters) ?? link
-            return URL(string: "cashu:\(enc)")
-        }
-
+        
        var url: URL? {
            switch self {
-            case .cashu(let link):
-                return Self.cashuURL(from: link)
-            case .lightning(let link):
+            case .cashu(let link), .lightning(let link):
                return URL(string: link)
            }
        }
@@ -6,7 +6,6 @@
 // For more information, see <https://unlicense.org>
 //

-import Nostr
 import SwiftUI

 struct TextMessageView: View {
@@ -14,7 +13,7 @@ struct TextMessageView: View {
    @EnvironmentObject private var viewModel: ChatViewModel
    
    let message: BitchatMessage
-    @State private var expandedMessageIDs: Set<String> = []
+    @Binding var expandedMessageIDs: Set<String>
    
    var body: some View {
        VStack(alignment: .leading, spacing: 0) {
@@ -67,12 +66,14 @@ struct TextMessageView: View {
    }
 }

+@available(macOS 14, iOS 17, *)
 #Preview {
+    @Previewable @State var ids: Set<String> = []
    let keychain = PreviewKeychainManager()
    
    Group {
        List {
-            TextMessageView(message: .preview)
+            TextMessageView(message: .preview, expandedMessageIDs: $ids)
                .listRowSeparator(.hidden)
                .listRowInsets(EdgeInsets())
                .listRowBackground(EmptyView())
@@ -80,7 +81,7 @@ struct TextMessageView: View {
        .environment(\.colorScheme, .light)
        
        List {
-            TextMessageView(message: .preview)
+            TextMessageView(message: .preview, expandedMessageIDs: $ids)
                .listRowSeparator(.hidden)
                .listRowInsets(EdgeInsets())
                .listRowBackground(EmptyView())
@@ -90,7 +91,7 @@ struct TextMessageView: View {
    .environmentObject(
        ChatViewModel(
            keychain: keychain,
-            idBridge: NostrIdentityBridge(keychain: keychain),
+            idBridge: NostrIdentityBridge(),
            identityManager: SecureIdentityStateManager(keychain)
        )
    )
@@ -7,7 +7,6 @@
 //

 import SwiftUI
-import BitFoundation

 struct FingerprintView: View {
    @ObservedObject var viewModel: ChatViewModel
@@ -1,79 +0,0 @@
-//
-// ImagePickerView.swift
-// bitchat
-//
-// This is free and unencumbered software released into the public domain.
-// For more information, see <https://unlicense.org>
-//
-
-#if os(iOS)
-
-import SwiftUI
-
-/// Camera or Photo Library
-struct ImagePickerView: UIViewControllerRepresentable {
-    let sourceType: UIImagePickerController.SourceType
-    let completion: (UIImage?) -> Void
-
-    func makeUIViewController(context: Context) -> UIImagePickerController {
-        let picker = UIImagePickerController()
-        picker.sourceType = sourceType
-        picker.delegate = context.coordinator
-        picker.allowsEditing = false
-
-        // Use standard full screen - iOS handles safe areas automatically
-        picker.modalPresentationStyle = .fullScreen
-
-        // Force dark mode to make safe area bars black instead of white
-        picker.overrideUserInterfaceStyle = .dark
-
-        return picker
-    }
-
-    func updateUIViewController(_ uiViewController: UIImagePickerController, context: Context) {}
-
-    func makeCoordinator() -> Coordinator {
-        Coordinator(completion: completion)
-    }
-
-    class Coordinator: NSObject, UIImagePickerControllerDelegate, UINavigationControllerDelegate {
-        let completion: (UIImage?) -> Void
-
-        init(completion: @escaping (UIImage?) -> Void) {
-            self.completion = completion
-        }
-
-        func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey: Any]) {
-            let image = info[.originalImage] as? UIImage
-            completion(image)
-        }
-
-        func imagePickerControllerDidCancel(_ picker: UIImagePickerController) {
-            completion(nil)
-        }
-    }
-}
-
-@available(iOS 17, *)
-#Preview {
-    @Previewable @State var isPresented = true
-    @Previewable @State var selectedImage: UIImage?
-    VStack {
-        if let selectedImage {
-            Image(uiImage: selectedImage)
-                .resizable()
-                .scaledToFit()
-        } else {
-            Text("No image selected")
-        }
-        Button("Show") { isPresented = true }
-    }
-    .sheet(isPresented: $isPresented) {
-        ImagePickerView(sourceType: .photoLibrary) { image in
-            selectedImage = image
-            isPresented = false
-        }
-    }
-}
-
-#endif
@@ -1,147 +0,0 @@
-//
-// ImagePreviewView.swift
-// bitchat
-//
-// This is free and unencumbered software released into the public domain.
-// For more information, see <https://unlicense.org>
-//
-
-import SwiftUI
-#if os(macOS)
-import BitLogger
-#endif
-
-struct ImagePreviewView: View {
-    let url: URL
-
-    @Environment(\.dismiss) private var dismiss
-    #if os(iOS)
-    @State private var showExporter = false
-    @State private var platformImage: UIImage?
-    #else
-    @State private var platformImage: NSImage?
-    #endif
-
-    var body: some View {
-        ZStack {
-            Color.black.ignoresSafeArea()
-            VStack {
-                Spacer()
-                if let image = platformImage {
-                    #if os(iOS)
-                    Image(uiImage: image)
-                        .resizable()
-                        .aspectRatio(contentMode: .fit)
-                        .padding()
-                    #else
-                    Image(nsImage: image)
-                        .resizable()
-                        .aspectRatio(contentMode: .fit)
-                        .padding()
-                    #endif
-                } else {
-                    ProgressView()
-                        .progressViewStyle(.circular)
-                        .tint(.white)
-                }
-                Spacer()
-                HStack {
-                    Button(action: { dismiss() }) {
-                        Text("close", comment: "Button to dismiss fullscreen media viewer")
-                            .font(.bitchatSystem(size: 15, weight: .semibold))
-                            .foregroundColor(.white)
-                            .padding(.horizontal, 16)
-                            .padding(.vertical, 8)
-                            .background(RoundedRectangle(cornerRadius: 12).stroke(Color.white.opacity(0.5), lineWidth: 1))
-                    }
-                    Spacer()
-                    Button(action: saveCopy) {
-                        Text("save", comment: "Button to save media to device")
-                            .font(.bitchatSystem(size: 15, weight: .semibold))
-                            .foregroundColor(.white)
-                            .padding(.horizontal, 16)
-                            .padding(.vertical, 8)
-                            .background(RoundedRectangle(cornerRadius: 12).fill(Color.blue.opacity(0.6)))
-                    }
-                }
-                .padding([.horizontal, .bottom], 24)
-            }
-        }
-        .onAppear(perform: loadImage)
-        #if os(iOS)
-        .sheet(isPresented: $showExporter) {
-            FileExportWrapper(url: url)
-        }
-        #endif
-    }
-
-    private func loadImage() {
-        DispatchQueue.global(qos: .userInitiated).async {
-            #if os(iOS)
-            guard let image = UIImage(contentsOfFile: url.path) else { return }
-            #else
-            guard let image = NSImage(contentsOf: url) else { return }
-            #endif
-            DispatchQueue.main.async {
-                self.platformImage = image
-            }
-        }
-    }
-
-    private func saveCopy() {
-        #if os(iOS)
-        showExporter = true
-        #else
-        Task { @MainActor in
-            let panel = NSSavePanel()
-            panel.canCreateDirectories = true
-            panel.nameFieldStringValue = url.lastPathComponent
-            panel.prompt = "save"
-            if panel.runModal() == .OK, let destination = panel.url {
-                do {
-                    if FileManager.default.fileExists(atPath: destination.path) {
-                        try FileManager.default.removeItem(at: destination)
-                    }
-                    try FileManager.default.copyItem(at: url, to: destination)
-                } catch {
-                    SecureLogger.error("Failed to save image preview copy: \(error)", category: .session)
-                }
-            }
-        }
-        #endif
-    }
-
-    #if os(iOS)
-    private struct FileExportWrapper: UIViewControllerRepresentable {
-        let url: URL
-
-        func makeUIViewController(context: Context) -> UIDocumentPickerViewController {
-            let controller = UIDocumentPickerViewController(forExporting: [url])
-            controller.shouldShowFileExtensions = true
-            return controller
-        }
-
-        func updateUIViewController(_ uiViewController: UIDocumentPickerViewController, context: Context) {}
-    }
-    #endif
-}
-
-#Preview {
-    let tempURL = FileManager.default.temporaryDirectory.appendingPathComponent("dummy.jpg")
-    if !FileManager.default.fileExists(atPath: tempURL.path(percentEncoded: false)) {
-        #if os(iOS)
-        let image = UIImage(named: "dummy")
-        let data = image?.jpegData(compressionQuality: 0.8)
-        let _ = try? data?.write(to: tempURL)
-        #elseif os(macOS)
-        let image = NSImage(named: "dummy")
-        var rect = NSRect(origin: .zero, size: image?.size ?? .zero)
-        if let cgImage = image?.cgImage(forProposedRect: &rect, context: nil, hints: nil) {
-            let rep = NSBitmapImageRep(cgImage: cgImage)
-            let jpegData = rep.representation(using: .jpeg, properties: [.compressionFactor: 0.8])
-            let _ = try? jpegData?.write(to: tempURL)
-        }
-        #endif
-    }
-    ImagePreviewView(url: tempURL)
-}
@@ -1,71 +0,0 @@
-//
-// MacImagePickerView.swift
-// bitchat
-//
-// This is free and unencumbered software released into the public domain.
-// For more information, see <https://unlicense.org>
-//
-
-#if os(macOS)
-
-import SwiftUI
-
-struct MacImagePickerView: View {
-    let completion: (URL?) -> Void
-    @Environment(\.dismiss) private var dismiss
-
-    var body: some View {
-        VStack(spacing: 16) {
-            Text("Choose an image")
-                .font(.headline)
-
-            Button("Select Image") {
-                let panel = NSOpenPanel()
-                panel.allowsMultipleSelection = false
-                panel.canChooseDirectories = false
-                panel.canChooseFiles = true
-                panel.allowedContentTypes = [.image, .png, .jpeg, .heic]
-                panel.message = "Choose an image to send"
-
-                if panel.runModal() == .OK {
-                    completion(panel.url)
-                } else {
-                    dismiss()
-                }
-            }
-            .buttonStyle(.borderedProminent)
-
-            Button("Cancel") {
-                completion(nil)
-            }
-            .buttonStyle(.bordered)
-        }
-        .padding(40)
-        .frame(minWidth: 300, minHeight: 150)
-    }
-}
-
-@available(OSX 14, *)
-#Preview {
-    @Previewable @State var isPresented = true
-    @Previewable @State var selectedImage: NSImage?
-
-    VStack {
-        if let selectedImage {
-            Image(nsImage: selectedImage)
-                .resizable()
-                .scaledToFit()
-        } else {
-            Text("No image selected")
-        }
-        Button("Show") { isPresented = true }
-    }
-    .sheet(isPresented: $isPresented) {
-        MacImagePickerView { url in
-            selectedImage = url.map(NSImage.init)
-            isPresented = false
-        }
-    }
-}
-
-#endif
@@ -40,31 +40,10 @@ struct LocationChannelsSheet: View {
        }

        static func levelTitle(for level: GeohashChannelLevel, count: Int) -> String {
-            // High-precision uncertainty: if count is 0 for high-precision levels,
-            // show "?" because presence broadcasting is disabled for privacy.
-            let isHighPrecision = (level == .neighborhood || level == .block || level == .building)
-            if isHighPrecision && count == 0 {
-                return String(
-                    format: String(localized: "location_channels.row_title_unknown", defaultValue: "%@ [? people]"),
-                    locale: .current,
-                    level.displayName
-                )
-            }
            return rowTitle(label: level.displayName, count: count)
        }

        static func bookmarkTitle(geohash: String, count: Int) -> String {
-            // Check precision for bookmarks too
-            let len = geohash.count
-            // Neighborhood=6, Block=7, Building=8+
-            let isHighPrecision = (len >= 6)
-            if isHighPrecision && count == 0 {
-                return String(
-                    format: String(localized: "location_channels.row_title_unknown", defaultValue: "%@ [? people]"),
-                    locale: .current,
-                    "#\(geohash)"
-                )
-            }
            return rowTitle(label: "#\(geohash)", count: count)
        }

@@ -125,7 +104,7 @@ struct LocationChannelsSheet: View {
                            Text(Strings.permissionDenied)
                                .font(.bitchatSystem(size: 12, design: .monospaced))
                                .foregroundColor(.secondary)
-                            Button(Strings.openSettings, action: SystemSettings.location.open)
+                            Button(Strings.openSettings) { openSystemLocationSettings() }
                            .buttonStyle(.plain)
                        }
                    case LocationChannelManager.PermissionState.authorized:
@@ -246,7 +225,9 @@ struct LocationChannelsSheet: View {
                    sectionDivider
                    torToggleSection
                        .padding(.top, 12)
-                    Button(action: SystemSettings.location.open) {
+                    Button(action: {
+                        openSystemLocationSettings()
+                    }) {
                        Text(Strings.removeAccess)
                            .font(.bitchatSystem(size: 12, design: .monospaced))
                            .foregroundColor(Color(red: 0.75, green: 0.1, blue: 0.1))
@@ -302,7 +283,7 @@ struct LocationChannelsSheet: View {
                        }
                    }
                let normalized = customGeohash
-                    .trimmed
+                    .trimmingCharacters(in: .whitespacesAndNewlines)
                    .lowercased()
                    .replacingOccurrences(of: "#", with: "")
                let isValid = validateGeohash(normalized)
@@ -449,7 +430,7 @@ struct LocationChannelsSheet: View {
    // Split a title like "#mesh [3 people]" into base and suffix "[3 people]"
    private func splitTitleAndCount(_ s: String) -> (base: String, countSuffix: String?) {
        guard let idx = s.lastIndex(of: "[") else { return (s, nil) }
-        let prefix = String(s[..<idx]).trimmed
+        let prefix = String(s[..<idx]).trimmingCharacters(in: .whitespaces)
        let suffix = String(s[idx...])
        return (prefix, suffix)
    }
@@ -620,3 +601,18 @@ extension LocationChannelsSheet {
        }
    }
 }
+
+// MARK: - Open Settings helper
+private func openSystemLocationSettings() {
+    #if os(iOS)
+    if let url = URL(string: UIApplication.openSettingsURLString) {
+        UIApplication.shared.open(url)
+    }
+    #else
+    if let url = URL(string: "x-apple.systempreferences:com.apple.preference.security?Privacy_LocationServices") {
+        NSWorkspace.shared.open(url)
+    } else if let url = URL(string: "x-apple.systempreferences:com.apple.preference.security") {
+        NSWorkspace.shared.open(url)
+    }
+    #endif
+}
@@ -12,15 +12,11 @@ struct LocationNotesView: View {
    @Environment(\.dismiss) private var dismiss
    @State private var draft: String = ""

-    init(
-        geohash: String,
-        onNotesCountChanged: ((Int) -> Void)? = nil,
-        manager: LocationNotesManager? = nil
-    ) {
+    init(geohash: String, onNotesCountChanged: ((Int) -> Void)? = nil) {
        let gh = geohash.lowercased()
        self.geohash = gh
        self.onNotesCountChanged = onNotesCountChanged
-        _manager = StateObject(wrappedValue: manager ?? LocationNotesManager(geohash: gh))
+        _manager = StateObject(wrappedValue: LocationNotesManager(geohash: gh))
    }

    private var backgroundColor: Color { colorScheme == .dark ? .black : .white }
@@ -264,13 +260,14 @@ struct LocationNotesView: View {
    }

    private func send() {
-        guard let content = draft.trimmedOrNilIfEmpty else { return }
+        let content = draft.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !content.isEmpty else { return }
        manager.send(content: content, nickname: viewModel.nickname)
        draft = ""
    }

    private var sendButtonEnabled: Bool {
-        !draft.trimmed.isEmpty && manager.state != .noRelays
+        !draft.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty && manager.state != .noRelays
    }

    // MARK: - Timestamp Formatting
@@ -1,87 +0,0 @@
-//
-//  MediaMessageView.swift
-//  bitchat
-//
-//  Created by Islam on 30/03/2026.
-//
-
-import SwiftUI
-
-struct MediaMessageView: View {
-    @Environment(\.colorScheme) private var colorScheme
-
-    @EnvironmentObject var viewModel: ChatViewModel
-    let message: BitchatMessage
-    let media: BitchatMessage.Media
-
-    @Binding var imagePreviewURL: URL?
-
-    var body: some View {
-        let state = mediaSendState(for: message)
-        let isFromMe = message.sender == viewModel.nickname || message.senderPeerID == viewModel.meshService.myPeerID
-        let cancelAction: (() -> Void)? = state.canCancel ? { viewModel.cancelMediaSend(messageID: message.id) } : nil
-
-        VStack(alignment: .leading, spacing: 2) {
-            HStack(alignment: .center, spacing: 4) {
-                Text(viewModel.formatMessageHeader(message, colorScheme: colorScheme))
-                    .fixedSize(horizontal: false, vertical: true)
-                    .frame(maxWidth: .infinity, alignment: .leading)
-                if message.isPrivate && message.sender == viewModel.nickname,
-                   let status = message.deliveryStatus {
-                    DeliveryStatusView(status: status)
-                        .padding(.leading, 4)
-                }
-            }
-
-            Group {
-                switch media {
-                case .voice(let url):
-                    VoiceNoteView(
-                        url: url,
-                        isSending: state.isSending,
-                        sendProgress: state.progress,
-                        onCancel: cancelAction
-                    )
-                case .image(let url):
-                    BlockRevealImageView(
-                        url: url,
-                        revealProgress: state.progress,
-                        isSending: state.isSending,
-                        onCancel: cancelAction,
-                        initiallyBlurred: !isFromMe,
-                        onOpen: {
-                            if !state.isSending {
-                                imagePreviewURL = url
-                            }
-                        },
-                        onDelete: !isFromMe ? { viewModel.deleteMediaMessage(messageID: message.id) } : nil
-                    )
-                    .frame(maxWidth: 280)
-                }
-            }
-        }
-        .padding(.vertical, 4)
-    }
-
-    private func mediaSendState(for message: BitchatMessage) -> (isSending: Bool, progress: Double?, canCancel: Bool) {
-        var isSending = false
-        var progress: Double?
-        if let status = message.deliveryStatus {
-            switch status {
-            case .sending:
-                isSending = true
-                progress = 0
-            case .partiallyDelivered(let reached, let total):
-                if total > 0 {
-                    isSending = true
-                    progress = Double(reached) / Double(total)
-                }
-            case .sent, .read, .delivered, .failed:
-                break
-            }
-        }
-        let canCancel = isSending && message.sender == viewModel.nickname
-        let clamped = progress.map { max(0, min(1, $0)) }
-        return (isSending, isSending ? clamped : nil, canCancel)
-    }
-}
@@ -34,10 +34,24 @@ struct VoiceNoteView: View {
        colorScheme == .dark ? Color.green.opacity(0.3) : Color.green.opacity(0.2)
    }

+    private var durationText: String {
+        let duration = playback.duration
+        guard duration.isFinite, duration > 0 else { return "--:--" }
+        let minutes = Int(duration) / 60
+        let seconds = Int(duration) % 60
+        return String(format: "%02d:%02d", minutes, seconds)
+    }
+
+    private var currentText: String {
+        let current = playback.currentTime
+        guard current.isFinite, current > 0 else { return "00:00" }
+        let minutes = Int(current) / 60
+        let seconds = Int(current) % 60
+        return String(format: "%02d:%02d", minutes, seconds)
+    }
+
    private var playbackLabel: String {
-        guard playback.duration.isFinite else { return "--:--" }
-        let seconds = playback.isPlaying ? playback.remainingSeconds : playback.roundedDuration
-        return String(format: "%02d:%02d", seconds / 60, seconds % 60)
+        playback.isPlaying ? currentText + "/" + durationText : durationText
    }

    var body: some View {
@@ -1,5 +1,4 @@
 import SwiftUI
-import BitFoundation

 struct MeshPeerList: View {
    @ObservedObject var viewModel: ChatViewModel
@@ -1,449 +0,0 @@
-//
-//  MessageListView.swift
-//  bitchat
-//
-//  Created by Islam on 30/03/2026.
-//
-
-import BitFoundation
-import SwiftUI
-
-private struct MessageDisplayItem: Identifiable {
-    let id: String
-    let message: BitchatMessage
-}
-
-struct MessageListView: View {
-    @EnvironmentObject private var viewModel: ChatViewModel
-    @ObservedObject private var locationManager = LocationChannelManager.shared
-
-    @Environment(\.colorScheme) private var colorScheme
-
-    let privatePeer: PeerID?
-    @Binding var isAtBottom: Bool
-    @Binding var messageText: String
-    @Binding var selectedMessageSender: String?
-    @Binding var selectedMessageSenderID: PeerID?
-    @Binding var imagePreviewURL: URL?
-    @Binding var windowCountPublic: Int
-    @Binding var windowCountPrivate: [PeerID: Int]
-    @Binding var showSidebar: Bool
-
-    var isTextFieldFocused: FocusState<Bool>.Binding
-
-    @State private var showMessageActions = false
-    @State private var lastScrollTime: Date = .distantPast
-    @State private var scrollThrottleTimer: Timer?
-
-    var body: some View {
-        let currentWindowCount: Int = {
-            if let peer = privatePeer {
-                return windowCountPrivate[peer] ?? TransportConfig.uiWindowInitialCountPrivate
-            }
-            return windowCountPublic
-        }()
-
-        let messages = viewModel.getMessages(for: privatePeer)
-        let windowedMessages = Array(messages.suffix(currentWindowCount))
-
-        let contextKey: String = {
-            if let peer = privatePeer {
-                "dm:\(peer)"
-            } else {
-                locationManager.selectedChannel.contextKey
-            }
-        }()
-
-        let messageItems: [MessageDisplayItem] = windowedMessages.compactMap { message in
-            guard !message.content.trimmed.isEmpty else { return nil }
-            return MessageDisplayItem(id: "\(contextKey)|\(message.id)", message: message)
-        }
-
-        ScrollViewReader { proxy in
-            ScrollView {
-                LazyVStack(alignment: .leading, spacing: 0) {
-                    ForEach(messageItems) { item in
-                        let message = item.message
-                        messageRow(for: message)
-                            .onAppear {
-                                if message.id == windowedMessages.last?.id {
-                                    isAtBottom = true
-                                }
-                                if message.id == windowedMessages.first?.id,
-                                   messages.count > windowedMessages.count {
-                                    expandWindow(
-                                        ifNeededFor: message,
-                                        allMessages: messages,
-                                        privatePeer: privatePeer,
-                                        proxy: proxy
-                                    )
-                                }
-                            }
-                            .onDisappear {
-                                if message.id == windowedMessages.last?.id {
-                                    isAtBottom = false
-                                }
-                            }
-                            .contentShape(Rectangle())
-                            .onTapGesture {
-                                if message.sender != "system" {
-                                    messageText = "@\(message.sender) "
-                                    isTextFieldFocused.wrappedValue = true
-                                }
-                            }
-                            .contextMenu {
-                                Button("content.message.copy") {
-                                    #if os(iOS)
-                                    UIPasteboard.general.string = message.content
-                                    #else
-                                    let pb = NSPasteboard.general
-                                    pb.clearContents()
-                                    pb.setString(message.content, forType: .string)
-                                    #endif
-                                }
-                            }
-                            .padding(.horizontal, 12)
-                            .padding(.vertical, 1)
-                    }
-                }
-                .transaction { tx in if viewModel.isBatchingPublic { tx.disablesAnimations = true } }
-                .padding(.vertical, 2)
-            }
-            .onOpenURL(perform: handleOpenURL)
-            .onTapGesture(count: 3) {
-                viewModel.sendMessage("/clear")
-            }
-            .onAppear {
-                scrollToBottom(on: proxy)
-            }
-            .onChange(of: privatePeer) { _ in
-                scrollToBottom(on: proxy)
-            }
-            .onChange(of: viewModel.messages.count) { _ in
-                onMessagesChange(proxy: proxy)
-            }
-            .onChange(of: viewModel.privateChats) { _ in
-                onPrivateChatsChange(proxy: proxy)
-            }
-            .onChange(of: locationManager.selectedChannel) { newChannel in
-                onSelectedChannelChange(newChannel, proxy: proxy)
-            }
-            .confirmationDialog(
-                selectedMessageSender.map { "@\($0)" } ?? String(localized: "content.actions.title", comment: "Fallback title for the message action sheet"),
-                isPresented: $showMessageActions,
-                titleVisibility: .visible
-            ) {
-                Button("content.actions.mention") {
-                    if let sender = selectedMessageSender {
-                        // Pre-fill the input with an @mention and focus the field
-                        messageText = "@\(sender) "
-                        isTextFieldFocused.wrappedValue = true
-                    }
-                }
-
-                Button("content.actions.direct_message") {
-                    if let peerID = selectedMessageSenderID {
-                        if peerID.isGeoChat {
-                            if let full = viewModel.fullNostrHex(forSenderPeerID: peerID) {
-                                viewModel.startGeohashDM(withPubkeyHex: full)
-                            }
-                        } else {
-                            viewModel.startPrivateChat(with: peerID)
-                        }
-                        withAnimation(.easeInOut(duration: TransportConfig.uiAnimationMediumSeconds)) {
-                            showSidebar = true
-                        }
-                    }
-                }
-
-                Button("content.actions.hug") {
-                    if let sender = selectedMessageSender {
-                        viewModel.sendMessage("/hug @\(sender)")
-                    }
-                }
-
-                Button("content.actions.slap") {
-                    if let sender = selectedMessageSender {
-                        viewModel.sendMessage("/slap @\(sender)")
-                    }
-                }
-
-                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),
-                       let sender = selectedMessageSender {
-                        viewModel.blockGeohashUser(pubkeyHexLowercased: full, displayName: sender)
-                    } else if let sender = selectedMessageSender {
-                        viewModel.sendMessage("/block \(sender)")
-                    }
-                }
-
-                Button("common.cancel", role: .cancel) {}
-            }
-            .onAppear {
-                // Also check when view appears
-                if let peerID = privatePeer {
-                    // Try multiple times to ensure read receipts are sent
-                    viewModel.markPrivateMessagesAsRead(from: peerID)
-
-                    DispatchQueue.main.asyncAfter(deadline: .now() + TransportConfig.uiReadReceiptRetryShortSeconds) {
-                        viewModel.markPrivateMessagesAsRead(from: peerID)
-                    }
-
-                    DispatchQueue.main.asyncAfter(deadline: .now() + TransportConfig.uiReadReceiptRetryLongSeconds) {
-                        viewModel.markPrivateMessagesAsRead(from: peerID)
-                    }
-                }
-            }
-            .onDisappear {
-                scrollThrottleTimer?.invalidate()
-            }
-        }
-        .environment(\.openURL, OpenURLAction { url in
-            // Intercept custom cashu: links created in attributed text
-            if let scheme = url.scheme?.lowercased(), scheme == "cashu" || scheme == "lightning" {
-                #if os(iOS)
-                UIApplication.shared.open(url)
-                return .handled
-                #else
-                // On non-iOS platforms, let the system handle or ignore
-                return .systemAction
-                #endif
-            }
-            return .systemAction
-        })
-    }
-}
-
-private extension MessageListView {
-    @ViewBuilder
-    func messageRow(for message: BitchatMessage) -> some View {
-        Group {
-            if message.sender == "system" {
-                systemMessageRow(message)
-            } else if let media = message.mediaAttachment(for: viewModel.nickname) {
-                MediaMessageView(message: message, media: media, imagePreviewURL: $imagePreviewURL)
-            } else {
-                TextMessageView(message: message)
-            }
-        }
-    }
-
-    @ViewBuilder
-    func systemMessageRow(_ message: BitchatMessage) -> some View {
-        Text(viewModel.formatMessageAsText(message, colorScheme: colorScheme))
-            .fixedSize(horizontal: false, vertical: true)
-            .frame(maxWidth: .infinity, alignment: .leading)
-    }
-
-    func expandWindow(ifNeededFor message: BitchatMessage,
-                      allMessages: [BitchatMessage],
-                      privatePeer: PeerID?,
-                      proxy: ScrollViewProxy) {
-        let step = TransportConfig.uiWindowStepCount
-        let contextKey: String = {
-            if let peer = privatePeer {
-                "dm:\(peer)"
-            } else {
-                locationManager.selectedChannel.contextKey
-            }
-        }()
-        let preserveID = "\(contextKey)|\(message.id)"
-
-        if let peer = privatePeer {
-            let current = windowCountPrivate[peer] ?? TransportConfig.uiWindowInitialCountPrivate
-            let newCount = min(allMessages.count, current + step)
-            guard newCount != current else { return }
-            windowCountPrivate[peer] = newCount
-            DispatchQueue.main.async {
-                proxy.scrollTo(preserveID, anchor: .top)
-            }
-        } else {
-            let current = windowCountPublic
-            let newCount = min(allMessages.count, current + step)
-            guard newCount != current else { return }
-            windowCountPublic = newCount
-            DispatchQueue.main.async {
-                proxy.scrollTo(preserveID, anchor: .top)
-            }
-        }
-    }
-
-    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
-
-            if peerID.isGeoDM || peerID.isGeoChat {
-                selectedMessageSender = viewModel.geohashDisplayName(for: peerID)
-            } else if let name = viewModel.meshService.peerNickname(peerID: peerID) {
-                selectedMessageSender = name
-            } else {
-                selectedMessageSender = viewModel.messages.last(where: { $0.senderPeerID == peerID && $0.sender != "system" })?.sender
-            }
-
-            if viewModel.isSelfSender(peerID: peerID, displayName: selectedMessageSender) {
-                selectedMessageSender = nil
-                selectedMessageSenderID = nil
-            } else {
-                showMessageActions = true
-            }
-
-        case "geohash":
-            let gh = url.path.trimmingCharacters(in: CharacterSet(charactersIn: "/")).lowercased()
-            let allowed = Set("0123456789bcdefghjkmnpqrstuvwxyz")
-            guard (2...12).contains(gh.count), gh.allSatisfy({ allowed.contains($0) }) else { return }
-
-            func levelForLength(_ len: Int) -> GeohashChannelLevel {
-                switch len {
-                case 0...2: return .region
-                case 3...4: return .province
-                case 5: return .city
-                case 6: return .neighborhood
-                case 7: return .block
-                default: return .block
-                }
-            }
-
-            let level = levelForLength(gh.count)
-            let channel = GeohashChannel(level: level, geohash: gh)
-
-            let inRegional = LocationChannelManager.shared.availableChannels.contains { $0.geohash == gh }
-            if !inRegional && !LocationChannelManager.shared.availableChannels.isEmpty {
-                LocationChannelManager.shared.markTeleported(for: gh, true)
-            }
-            LocationChannelManager.shared.select(ChannelID.location(channel))
-
-        default:
-            return
-        }
-    }
-
-    func scrollToBottom(on proxy: ScrollViewProxy) {
-        isAtBottom = true
-        if let targetPeerID {
-            proxy.scrollTo(targetPeerID, anchor: .bottom)
-        }
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.05) {
-            if let secondTarget = self.targetPeerID {
-                proxy.scrollTo(secondTarget, anchor: .bottom)
-            }
-        }
-    }
-
-    var targetPeerID: String? {
-        if let peer = privatePeer,
-           let last = viewModel.getPrivateChatMessages(for: peer).suffix(300).last?.id {
-            return "dm:\(peer)|\(last)"
-        }
-        if let last = viewModel.messages.suffix(300).last?.id {
-            return "\(locationManager.selectedChannel.contextKey)|\(last)"
-        }
-        return nil
-    }
-
-    func onMessagesChange(proxy: ScrollViewProxy) {
-        guard privatePeer == nil, let lastMsg = viewModel.messages.last else { return }
-
-        // If the newest message is from me, always scroll to bottom
-        let isFromSelf = (lastMsg.sender == viewModel.nickname) || lastMsg.sender.hasPrefix(viewModel.nickname + "#")
-        if !isFromSelf && !isAtBottom { // Only autoscroll when user is at/near bottom
-            return
-        } else { // Ensure we consider ourselves at bottom for subsequent messages
-            isAtBottom = true
-        }
-
-        func scrollIfNeeded(date: Date) {
-            lastScrollTime = date
-            let contextKey = locationManager.selectedChannel.contextKey
-            if let target = viewModel.messages.suffix(windowCountPublic).last.map({ "\(contextKey)|\($0.id)" }) {
-                proxy.scrollTo(target, anchor: .bottom)
-            }
-        }
-
-        // Throttle scroll animations to prevent excessive UI updates
-        let now = Date()
-        if now.timeIntervalSince(lastScrollTime) > TransportConfig.uiScrollThrottleSeconds {
-            // Immediate scroll if enough time has passed
-            scrollIfNeeded(date: now)
-        } else {
-            // Schedule a delayed scroll
-            scrollThrottleTimer?.invalidate()
-            scrollThrottleTimer = Timer.scheduledTimer(withTimeInterval: TransportConfig.uiScrollThrottleSeconds, repeats: false) { _ in
-                Task { @MainActor in
-                    scrollIfNeeded(date: Date())
-                }
-            }
-        }
-    }
-
-    func onPrivateChatsChange(proxy: ScrollViewProxy) {
-        guard let peerID = privatePeer, let messages = viewModel.privateChats[peerID], let lastMsg = messages.last else {
-            return
-        }
-
-        // If the newest private message is from me, always scroll
-        let isFromSelf = (lastMsg.sender == viewModel.nickname) || lastMsg.sender.hasPrefix(viewModel.nickname + "#")
-        if !isFromSelf && !isAtBottom { // Only autoscroll when user is at/near bottom
-            return
-        } else {
-            isAtBottom = true
-        }
-
-        func scrollIfNeeded(date: Date) {
-            lastScrollTime = date
-            let contextKey = "dm:\(peerID)"
-            let count = windowCountPrivate[peerID] ?? 300
-            if let target = messages.suffix(count).last.map({ "\(contextKey)|\($0.id)" }){
-                proxy.scrollTo(target, anchor: .bottom)
-            }
-        }
-
-        // Same throttling for private chats
-        let now = Date()
-        if now.timeIntervalSince(lastScrollTime) > TransportConfig.uiScrollThrottleSeconds {
-            scrollIfNeeded(date: now)
-        } else {
-            scrollThrottleTimer?.invalidate()
-            scrollThrottleTimer = Timer.scheduledTimer(withTimeInterval: TransportConfig.uiScrollThrottleSeconds, repeats: false) { _ in
-                Task { @MainActor in
-                    scrollIfNeeded(date: Date())
-                }
-            }
-        }
-    }
-
-    func onSelectedChannelChange(_ channel: ChannelID, proxy: ScrollViewProxy) {
-        // When switching to a new geohash channel, scroll to the bottom
-        guard privatePeer == nil else { return }
-        switch channel {
-        case .mesh:
-            break
-        case .location(let ch):
-            // Reset window size
-            isAtBottom = true
-            windowCountPublic = TransportConfig.uiWindowInitialCountPublic
-            let contextKey = "geo:\(ch.geohash)"
-            if let target = viewModel.messages.suffix(windowCountPublic).last?.id.map({ "\(contextKey)|\($0)" }) {
-                proxy.scrollTo(target, anchor: .bottom)
-            }
-        }
-    }
-}
-
-private extension ChannelID {
-    var contextKey: String {
-        switch self {
-        case .mesh:             "mesh"
-        case .location(let ch): "geo:\(ch.geohash)"
-        }
-    }
-}
-
-//#Preview {
-//    MessageListView()
-//}
@@ -5,6 +5,21 @@

 import Foundation

+private enum RegexCache {
+    static let cashu: NSRegularExpression = {
+        try! NSRegularExpression(pattern: "\\bcashu[AB][A-Za-z0-9._-]{40,}\\b", options: [])
+    }()
+    static let lightningScheme: NSRegularExpression = {
+        try! NSRegularExpression(pattern: "(?i)\\blightning:[^\\s]+", 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: [])
+    }()
+}
+
 extension String {
    // Detect if there is an extremely long token (no whitespace/newlines) that could break layout
    func hasVeryLongToken(threshold: Int) -> Bool {
@@ -23,7 +38,7 @@ extension String {

    // Extract up to `max` Cashu tokens (cashuA/cashuB). Allow dot '.' and shorter lengths.
    func extractCashuLinks(max: Int = 3) -> [String] {
-        let regex = MessageFormattingEngine.Patterns.cashu
+        let regex = RegexCache.cashu
        let ns = self as NSString
        let range = NSRange(location: 0, length: ns.length)
        var found: [String] = []
@@ -44,19 +59,19 @@ extension String {
        let ns = self as NSString
        let full = NSRange(location: 0, length: ns.length)
        // lightning: scheme
-        for m in MessageFormattingEngine.Patterns.lightningScheme.matches(in: self, range: full) {
+        for m in RegexCache.lightningScheme.matches(in: self, range: full) {
            let s = ns.substring(with: m.range(at: 0))
            results.append(s)
            if results.count >= max { return results }
        }
        // BOLT11
-        for m in MessageFormattingEngine.Patterns.bolt11.matches(in: self, range: full) {
+        for m in RegexCache.bolt11.matches(in: self, range: full) {
            let s = ns.substring(with: m.range(at: 0))
            results.append("lightning:\(s)")
            if results.count >= max { return results }
        }
        // LNURL bech32
-        for m in MessageFormattingEngine.Patterns.lnurl.matches(in: self, range: full) {
+        for m in RegexCache.lnurl.matches(in: self, range: full) {
            let s = ns.substring(with: m.range(at: 0))
            results.append("lightning:\(s)")
            if results.count >= max { return results }
@@ -1,4 +1,3 @@
-import Nostr
 import SwiftUI
 import CoreImage
 import CoreImage.CIFilterBuiltins
@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "filename" : "dummy.jpg",
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
@@ -41,19 +41,6 @@ final class PreviewKeychainManager: KeychainManagerProtocol {
        storage["identity_noiseStaticKey"] != nil
    }

-    // BCH-01-009: New methods with proper error classification
-    func getIdentityKeyWithResult(forKey key: String) -> KeychainReadResult {
-        if let data = storage[key] {
-            return .success(data)
-        }
-        return .itemNotFound
-    }
-
-    func saveIdentityKeyWithResult(_ keyData: Data, forKey key: String) -> KeychainSaveResult {
-        storage[key] = keyData
-        return .success
-    }
-
    // MARK: - Generic Data Storage (consolidated from KeychainHelper)

    func save(key: String, data: Data, service: String, accessible: CFString?) {
@@ -6,7 +6,7 @@
 	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>$(APP_GROUP_ID)</string>
+		<string>group.chat.bitchat</string>
 	</array>
 	<key>com.apple.security.device.bluetooth</key>
 	<true/>
@@ -6,7 +6,7 @@
 	<true/>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>$(APP_GROUP_ID)</string>
+		<string>group.chat.bitchat</string>
 	</array>
 	<key>com.apple.security.device.bluetooth</key>
 	<true/>
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>AppGroupID</key>
-	<string>$(APP_GROUP_ID)</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -13,7 +13,7 @@ import UniformTypeIdentifiers
 /// Avoids deprecated Social framework and SLComposeServiceViewController.
 final class ShareViewController: UIViewController {
    // Bundle.main.bundleIdentifier would get the extension's bundleID
-    private static let groupID = Bundle.main.object(forInfoDictionaryKey: "AppGroupID") as? String ?? "group.chat.bitchat"
+    private static let groupID = "group.chat.bitchat"

    private enum Strings {
        static let nothingToShare = String(localized: "share.status.nothing_to_share", comment: "Shown when the share extension receives no content")
--- a/Show More
+++ b/Show More