Route georelay updates through review

.github/workflows/fetch_georelays.yml

@@ -1,42 +1,228 @@
-name: Fetch GeoRelays Data
+name: Propose GeoRelay Data Update
 
 on:
   schedule:
-    - cron: '0 6 * * 0'
+    - cron: "0 6 * * 0"
   workflow_dispatch:
 
+# Default to read-only. The publishing job receives only the scopes required
+# to push its branch and publish either a PR or a tracking issue.
+permissions:
+  contents: read
+
+concurrency:
+  group: georelay-data-update
+  cancel-in-progress: false
+
+env:
+  SOURCE_REPOSITORY: https://github.com/permissionlesstech/georelays.git
+  UPDATE_BRANCH: automation/georelay-data
+  TRACKING_ISSUE_TITLE: GeoRelay update awaiting pull request
+
+jobs:
+  propose-relay-data:
+    name: Validate and propose relay data
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
     permissions:
       contents: write
       pull-requests: write
-
-jobs:
-  update-relay-data:
-    runs-on: ubuntu-latest
+      issues: write
 
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
+      - name: Checkout reviewed base
+        # Pinned actions/checkout v5 so a mutable action tag cannot change the
+        # code that receives this job's write-capable token.
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd
         with:
-          token: ${{ secrets.GITHUB_TOKEN }}
+          ref: main
           fetch-depth: 0
+          # Do not expose the write token to fetch/validation subprocesses.
+          persist-credentials: false
 
-      - name: Fetch GeoRelays
+      - name: Test GeoRelay validator
         run: |
-          wget -q https://raw.githubusercontent.com/permissionlesstech/georelays/refs/heads/main/nostr_relays.csv
-          mv nostr_relays.csv ./relays/online_relays_gps.csv
+          set -euo pipefail
+          python3 -m unittest discover -s scripts/tests -p "test_*.py" -v
 
-      - name: Check for changes
-        id: git-check
+      - name: Fetch candidate over pinned HTTPS policy
+        id: upstream
         run: |
-          git diff --exit-code || echo "changes=true" >> $GITHUB_OUTPUT
+          set -euo pipefail
+          source_commit=$(git ls-remote --refs "$SOURCE_REPOSITORY" refs/heads/main | awk 'NR == 1 { print $1 }')
+          if [[ ! "$source_commit" =~ ^[0-9a-f]{40}$ ]]; then
+            echo "::error::Could not resolve an immutable upstream commit"
+            exit 1
+          fi
+          source_url="https://raw.githubusercontent.com/permissionlesstech/georelays/$source_commit/nostr_relays.csv"
+          effective_url=$(curl --fail --show-error --silent --location --proto "=https" --proto-redir "=https" --tlsv1.2 --max-time 60 --retry 3 --retry-all-errors --output "$RUNNER_TEMP/georelays-candidate.csv" --write-out "%{url_effective}" "$source_url")
+          if [[ "$effective_url" != "$source_url" ]]; then
+            echo "::error::Unexpected GeoRelay redirect target: $effective_url"
+            exit 1
+          fi
+          echo "source_commit=$source_commit" >> "$GITHUB_OUTPUT"
+          echo "source_url=$source_url" >> "$GITHUB_OUTPUT"
 
-      - name: Commit and push changes
-        if: steps.git-check.outputs.changes == 'true'
+      - name: Validate candidate against reviewed baseline
+        id: validation
         run: |
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
-          git add relays/online_relays_gps.csv
-          git commit -m "Automated update of relay data - $(date -u)"
-          git push
+          set -euo pipefail
+          python3 scripts/validate_georelays.py --input "$RUNNER_TEMP/georelays-candidate.csv" --baseline relays/online_relays_gps.csv --output relays/online_relays_gps.csv --github-output "$GITHUB_OUTPUT"
+
+      - name: Check for a reviewed-file change
+        id: changes
+        run: |
+          set -euo pipefail
+          if git diff --quiet -- relays/online_relays_gps.csv; then
+            echo "changed=false" >> "$GITHUB_OUTPUT"
+            echo "Upstream GeoRelay data already matches main." >> "$GITHUB_STEP_SUMMARY"
+          else
+            echo "changed=true" >> "$GITHUB_OUTPUT"
+            git diff --stat -- relays/online_relays_gps.csv
+          fi
+
+      - name: Push automation branch and publish review request
+        if: steps.changes.outputs.changed == 'true'
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GH_TOKEN: ${{ github.token }}
+          SOURCE_COMMIT: ${{ steps.upstream.outputs.source_commit }}
+          SOURCE_URL: ${{ steps.upstream.outputs.source_url }}
+          DATA_ROWS: ${{ steps.validation.outputs.data_rows }}
+          UNIQUE_RELAYS: ${{ steps.validation.outputs.unique_relays }}
+          DATA_SHA256: ${{ steps.validation.outputs.sha256 }}
+        run: |
+          set -euo pipefail
+
+          # Scope credential exposure to this final publishing step.
+          gh auth setup-git
+          git config user.name "github-actions[bot]"
+          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+          git switch -C "$UPDATE_BRANCH"
+          git add -- relays/online_relays_gps.csv
+          git diff --cached --quiet && {
+            echo "::error::Expected a staged GeoRelay data change"
+            exit 1
+          }
+          git commit -m "Update reviewed georelay directory" -m "Upstream-commit: $SOURCE_COMMIT"
+
+          remote_ref="refs/remotes/origin/$UPDATE_BRANCH"
+          if git fetch --no-tags origin "+refs/heads/$UPDATE_BRANCH:$remote_ref" 2>/dev/null; then
+            remote_sha=$(git rev-parse "$remote_ref")
+            git push --force-with-lease="refs/heads/$UPDATE_BRANCH:$remote_sha" origin "HEAD:refs/heads/$UPDATE_BRANCH"
+          else
+            git push origin "HEAD:refs/heads/$UPDATE_BRANCH"
+          fi
+
+          body_file="$RUNNER_TEMP/georelay-pr-body.md"
+          {
+            echo "## Automated GeoRelay data proposal"
+            echo
+            echo "- Source: $SOURCE_URL"
+            echo "- Upstream commit: $SOURCE_COMMIT"
+            echo "- Data rows: $DATA_ROWS"
+            echo "- Unique normalized relays: $UNIQUE_RELAYS"
+            echo "- SHA-256: $DATA_SHA256"
+            echo
+            echo "The candidate passed strict UTF-8, schema, size, row-count, secure-host, coordinate, duplicate-conflict, and baseline-delta validation."
+            echo
+            echo "This PR is intentionally not auto-merged. Review the relay additions/removals before merging."
+          } > "$body_file"
+
+          existing_pr=$(gh pr list --repo "$GITHUB_REPOSITORY" --state open --base main --head "$UPDATE_BRANCH" --json number --jq '.[0].number // empty')
+          pr_error="$RUNNER_TEMP/georelay-pr-error.txt"
+          pr_url=""
+          if [[ -n "$existing_pr" ]]; then
+            if gh pr edit "$existing_pr" --repo "$GITHUB_REPOSITORY" --title "Update reviewed GeoRelay directory" --body-file "$body_file" 2> "$pr_error"; then
+              pr_url=$(gh pr view "$existing_pr" --repo "$GITHUB_REPOSITORY" --json url --jq .url)
+            fi
+          else
+            if created_pr_url=$(gh pr create --repo "$GITHUB_REPOSITORY" --base main --head "$UPDATE_BRANCH" --title "Update reviewed GeoRelay directory" --body-file "$body_file" 2> "$pr_error"); then
+              pr_url="$created_pr_url"
+            fi
+          fi
+
+          tracking_issue_numbers=$(gh issue list --repo "$GITHUB_REPOSITORY" --state open --search "\"$TRACKING_ISSUE_TITLE\" in:title" --limit 100 --json number,title --jq ".[] | select(.title == \"$TRACKING_ISSUE_TITLE\") | .number")
+          tracking_issues=()
+          if [[ -n "$tracking_issue_numbers" ]]; then
+            mapfile -t tracking_issues <<< "$tracking_issue_numbers"
+          fi
+
+          if [[ -n "$pr_url" ]]; then
+            for issue_number in "${tracking_issues[@]}"; do
+              gh issue close "$issue_number" --repo "$GITHUB_REPOSITORY" --comment "A pull request is now available at $pr_url; closing this fallback tracking issue."
+            done
+            echo "Published GeoRelay review PR: $pr_url" >> "$GITHUB_STEP_SUMMARY"
+            exit 0
+          fi
+
+          echo "::warning::GITHUB_TOKEN could not create or update the GeoRelay pull request; publishing the issues-write fallback."
+          if [[ -s "$pr_error" ]]; then
+            cat "$pr_error" >&2
+          fi
+
+          compare_url="https://github.com/${GITHUB_REPOSITORY}/compare/main...${UPDATE_BRANCH}?expand=1"
+          issue_body_file="$RUNNER_TEMP/georelay-tracking-issue-body.md"
+          {
+            echo "## Validated GeoRelay update awaiting review"
+            echo
+            echo "The automation branch was updated, but this workflow token could not create or update the pull request. Use the compare link below to create it manually."
+            echo
+            echo "- Compare and create PR: $compare_url"
+            echo "- Automation branch: $UPDATE_BRANCH"
+            echo "- Source: $SOURCE_URL"
+            echo "- Upstream commit: $SOURCE_COMMIT"
+            echo "- Data rows: $DATA_ROWS"
+            echo "- Unique normalized relays: $UNIQUE_RELAYS"
+            echo "- SHA-256: $DATA_SHA256"
+            echo
+            echo "The snapshot passed the repository's strict validator before the branch was pushed."
+          } > "$issue_body_file"
+
+          if (( ${#tracking_issues[@]} > 0 )); then
+            primary_issue="${tracking_issues[0]}"
+            gh issue edit "$primary_issue" --repo "$GITHUB_REPOSITORY" --title "$TRACKING_ISSUE_TITLE" --body-file "$issue_body_file"
+            issue_url=$(gh issue view "$primary_issue" --repo "$GITHUB_REPOSITORY" --json url --jq .url)
+            for duplicate_issue in "${tracking_issues[@]:1}"; do
+              gh issue close "$duplicate_issue" --repo "$GITHUB_REPOSITORY" --comment "Closing duplicate GeoRelay automation tracking issue; #$primary_issue is canonical."
+            done
+          else
+            issue_url=$(gh issue create --repo "$GITHUB_REPOSITORY" --title "$TRACKING_ISSUE_TITLE" --body-file "$issue_body_file")
+          fi
+
+          # Do not claim success until the fallback issue was confirmed.
+          [[ -n "$issue_url" ]]
+          echo "Published GeoRelay tracking issue fallback: $issue_url" >> "$GITHUB_STEP_SUMMARY"
+
+      - name: Clean obsolete automation review state
+        if: steps.changes.outputs.changed == 'false'
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          set -euo pipefail
+          gh auth setup-git
+
+          existing_pr=$(gh pr list --repo "$GITHUB_REPOSITORY" --state open --base main --head "$UPDATE_BRANCH" --json number --jq '.[0].number // empty')
+          if [[ -n "$existing_pr" ]]; then
+            gh pr close "$existing_pr" --repo "$GITHUB_REPOSITORY" --comment "Upstream now matches the reviewed file on main; closing this obsolete automation proposal."
+            echo "Closed obsolete PR #$existing_pr." >> "$GITHUB_STEP_SUMMARY"
+          fi
+
+          tracking_issue_numbers=$(gh issue list --repo "$GITHUB_REPOSITORY" --state open --search "\"$TRACKING_ISSUE_TITLE\" in:title" --limit 100 --json number,title --jq ".[] | select(.title == \"$TRACKING_ISSUE_TITLE\") | .number")
+          if [[ -n "$tracking_issue_numbers" ]]; then
+            while IFS= read -r issue_number; do
+              gh issue close "$issue_number" --repo "$GITHUB_REPOSITORY" --comment "Upstream now matches the reviewed file on main; closing this obsolete automation tracker."
+              echo "Closed obsolete tracking issue #$issue_number." >> "$GITHUB_STEP_SUMMARY"
+            done <<< "$tracking_issue_numbers"
+          fi
+
+          if git ls-remote --exit-code --heads origin "refs/heads/$UPDATE_BRANCH" > /dev/null; then
+            git push origin --delete "$UPDATE_BRANCH"
+            echo "Deleted obsolete automation branch $UPDATE_BRANCH." >> "$GITHUB_STEP_SUMMARY"
+          else
+            ls_remote_status=$?
+            if (( ls_remote_status != 2 )); then
+              echo "::error::Could not inspect the obsolete automation branch"
+              exit "$ls_remote_status"
+            fi
+          fi

PRIVACY_POLICY.md

@@ -17,8 +17,8 @@ bitchat is designed for private, account-free communication. This policy describ
 
 1. **Identity and cryptographic keys**
    - Noise, signing, group, prekey, and optional Nostr identity material is generated locally.
-   - Secret keys are stored in the system keychain as device-only items. Public keys are shared when required for messaging, verification, groups, or Nostr events.
-   - Keys remain until they are rotated, removed by the relevant feature, or erased with panic wipe. Because operating-system keychains can outlive an uninstall, bitchat records a non-secret install marker and deletes surviving app keys before use after a later reinstall.
+   - Secret keys are stored in the system keychain. Public keys are shared when required for messaging, verification, groups, or Nostr events.
+   - Keys remain until they are rotated, removed by the relevant feature, erased with panic wipe, or removed with the app.
 
 2. **Nickname, preferences, and relationships**
    - Your nickname, settings, favorites, petnames, read-receipt identifiers, and bounded operational metadata are stored locally.
@@ -121,7 +121,7 @@ No cryptographic system can protect content after a recipient reads, copies, scr
 
 ## Your Controls
 
-- **Panic wipe:** Triple-tap the logo to synchronously cancel in-flight media work and clear local keys, sessions, preferences, groups, queues, carried mail, public archives, board data, and media managed by the app.
+- **Panic wipe:** Triple-tap the logo to clear local keys, sessions, preferences, groups, queues, carried mail, public archives, board data, and media managed by the app.
 - **Feature controls:** Location channels, mesh bridge, internet gateway, and related internet behaviors can be disabled in the app. Some already-published relay data cannot be recalled.
 - **System permissions:** Bluetooth, location, microphone, camera, and photo-library access can be revoked in system settings.
 - **No account:** The project operates no account record for you to request or export.

bitchat.xcodeproj/project.pbxproj

@@ -337,7 +337,6 @@
 				es,
 				ar,
 				de,
-				fa,
 				fr,
 				he,
 				id,

bitchat/App/AppChromeModel.swift

@@ -21,9 +21,6 @@ final class AppChromeModel: ObservableObject {
 
     private let chatViewModel: ChatViewModel
     private var cancellables = Set<AnyCancellable>()
-    /// The composer owns capture state above ChatViewModel. ContentView
-    /// installs this hook so both panic entry points synchronously stop it.
-    private var prepareForPanic: (@MainActor () -> Void)?
 
     /// Bulletin-board coordinator, created on first use of the board sheet.
     private(set) lazy var boardManager = BoardManager(transport: chatViewModel.meshService)
@@ -100,12 +97,7 @@ final class AppChromeModel: ObservableObject {
         showScreenshotPrivacyWarning = true
     }
 
-    func setPanicPreparation(_ preparation: (@MainActor () -> Void)?) {
-        prepareForPanic = preparation
-    }
-
     func panicClearAllData() {
-        prepareForPanic?()
         chatViewModel.panicClearAllData()
     }
 

bitchat/App/AppRuntime.swift

@@ -107,15 +107,12 @@ final class AppRuntime: ObservableObject {
             )
         )
 
-        if chatViewModel.networkActivationAllowed {
         GeoRelayDirectory.shared.prefetchIfNeeded()
-        }
         bindRuntimeObservers()
         NotificationDelegate.shared.runtime = self
     }
 
     func start() {
-        guard chatViewModel.networkActivationAllowed else { return }
         guard !started else {
             checkForSharedContent()
             return
@@ -154,14 +151,12 @@ final class AppRuntime: ObservableObject {
     }
 
     func handleDidBecomeActiveNotification() {
-        guard chatViewModel.networkActivationAllowed else { return }
         chatViewModel.handleDidBecomeActive()
         checkForSharedContent()
     }
 
     #if os(macOS)
     func handleMacDidBecomeActiveNotification() {
-        guard chatViewModel.networkActivationAllowed else { return }
         record(.scenePhaseChanged(.active))
         chatViewModel.handleDidBecomeActive()
         checkForSharedContent()
@@ -180,7 +175,6 @@ final class AppRuntime: ObservableObject {
             didEnterBackground = true
 
         case .active:
-            guard chatViewModel.networkActivationAllowed else { return }
             record(.scenePhaseChanged(.active))
             chatViewModel.meshService.startServices()
             TorManager.shared.setAppForeground(true)
@@ -228,7 +222,6 @@ final class AppRuntime: ObservableObject {
         actionIdentifier: String = UNNotificationDefaultActionIdentifier,
         userInfo: [AnyHashable: Any]
     ) {
-        guard chatViewModel.networkActivationAllowed else { return }
         if actionIdentifier == NotificationService.waveActionID {
             chatViewModel.sendMeshWave()
             return
@@ -280,8 +273,6 @@ private extension AppRuntime {
         NotificationCenter.default.publisher(for: .TorWillRestart)
             .receive(on: DispatchQueue.main)
             .sink { [weak self] _ in
-                guard self?.chatViewModel.networkActivationAllowed == true
-                else { return }
                 self?.record(.torLifecycleChanged(.willRestart))
                 self?.chatViewModel.handleTorWillRestart()
             }
@@ -290,8 +281,6 @@ private extension AppRuntime {
         NotificationCenter.default.publisher(for: .TorDidBecomeReady)
             .receive(on: DispatchQueue.main)
             .sink { [weak self] _ in
-                guard self?.chatViewModel.networkActivationAllowed == true
-                else { return }
                 self?.record(.torLifecycleChanged(.didBecomeReady))
                 self?.chatViewModel.handleTorDidBecomeReady()
             }
@@ -300,8 +289,6 @@ private extension AppRuntime {
         NotificationCenter.default.publisher(for: .TorWillStart)
             .receive(on: DispatchQueue.main)
             .sink { [weak self] _ in
-                guard self?.chatViewModel.networkActivationAllowed == true
-                else { return }
                 self?.record(.torLifecycleChanged(.willStart))
                 self?.chatViewModel.handleTorWillStart()
             }
@@ -310,8 +297,6 @@ private extension AppRuntime {
         NotificationCenter.default.publisher(for: .TorUserPreferenceChanged)
             .receive(on: DispatchQueue.main)
             .sink { [weak self] notification in
-                guard self?.chatViewModel.networkActivationAllowed == true
-                else { return }
                 self?.record(.torLifecycleChanged(.preferenceChanged))
                 self?.chatViewModel.handleTorPreferenceChanged(notification)
             }
@@ -328,7 +313,6 @@ private extension AppRuntime {
     }
 
     func checkForSharedContent() {
-        guard chatViewModel.networkActivationAllowed else { return }
         guard let userDefaults = UserDefaults(suiteName: BitchatApp.groupID) else { return }
         let clearSharedContent = {
             userDefaults.removeObject(forKey: "sharedContent")
@@ -375,9 +359,7 @@ private extension AppRuntime {
         let becameConnected = isConnected && !lastNostrRelayConnectedState
         lastNostrRelayConnectedState = isConnected
 
-        guard chatViewModel.networkActivationAllowed,
-              started,
-              becameConnected else { return }
+        guard started, becameConnected else { return }
 
         let isInitialConnection = !didHandleInitialNostrConnection
         didHandleInitialNostrConnection = true

bitchat/App/LocationPresenceStore.swift

@@ -7,146 +7,45 @@ final class LocationPresenceStore: ObservableObject {
     @Published private(set) var geoNicknames: [String: String] = [:]
     @Published private(set) var teleportedGeo: Set<String> = []
 
-    private let teleportedGeoCapacity: Int
-    private var teleportedGeoOrder: [String] = []
-    private let geoNicknameCapacity: Int
-    private var geoNicknameOrder: [String] = []
-
-    init(
-        teleportedGeoCapacity: Int = TransportConfig.geoTeleportedParticipantsCap,
-        geoNicknameCapacity: Int = TransportConfig.geoNicknameParticipantsCap
-    ) {
-        self.teleportedGeoCapacity = max(0, teleportedGeoCapacity)
-        self.geoNicknameCapacity = max(0, geoNicknameCapacity)
-    }
-
     func setCurrentGeohash(_ geohash: String?) {
-        let normalized = geohash?.lowercased()
-        if currentGeohash != normalized {
-            // Presence markers are scoped to the active geohash channel.
-            clearTeleportedGeo()
-            clearGeoNicknames()
-        }
-        currentGeohash = normalized
+        currentGeohash = geohash?.lowercased()
     }
 
     func setNickname(_ nickname: String, for pubkeyHex: String) {
-        guard geoNicknameCapacity > 0 else {
-            clearGeoNicknames()
-            return
-        }
-
-        let key = pubkeyHex.lowercased()
-        if geoNicknames[key] != nil {
-            geoNicknames[key] = nickname
-            return
-        }
-
-        while geoNicknameOrder.count >= geoNicknameCapacity, let oldest = geoNicknameOrder.first {
-            geoNicknameOrder.removeFirst()
-            geoNicknames.removeValue(forKey: oldest)
-        }
-
-        geoNicknames[key] = nickname
-        geoNicknameOrder.append(key)
+        geoNicknames[pubkeyHex.lowercased()] = nickname
     }
 
     func replaceGeoNicknames(_ nicknames: [String: String]) {
-        guard geoNicknameCapacity > 0 else {
-            clearGeoNicknames()
-            return
+        geoNicknames = Dictionary(
+            uniqueKeysWithValues: nicknames.map { key, value in
+                (key.lowercased(), value)
             }
-
-        var seen: Set<String> = []
-        var ordered: [String] = []
-        var normalized: [String: String] = [:]
-        for (key, value) in nicknames {
-            let lower = key.lowercased()
-            guard seen.insert(lower).inserted else { continue }
-            ordered.append(lower)
-            normalized[lower] = value
-        }
-        if ordered.count > geoNicknameCapacity {
-            let kept = Array(ordered.suffix(geoNicknameCapacity))
-            ordered = kept
-            normalized = Dictionary(uniqueKeysWithValues: kept.compactMap { key in
-                normalized[key].map { (key, $0) }
-            })
-        }
-        geoNicknameOrder = ordered
-        geoNicknames = normalized
+        )
     }
 
     func clearGeoNicknames() {
         geoNicknames.removeAll()
-        geoNicknameOrder.removeAll()
-    }
-
-    func retainGeoNicknames(keeping pubkeys: Set<String>) {
-        let allowed = Set(pubkeys.map { $0.lowercased() })
-        geoNicknameOrder = geoNicknameOrder.filter { allowed.contains($0) }
-        geoNicknames = geoNicknames.filter { allowed.contains($0.key) }
     }
 
     func markTeleported(_ pubkeyHex: String) {
-        guard teleportedGeoCapacity > 0 else {
-            clearTeleportedGeo()
-            return
-        }
-
-        let key = pubkeyHex.lowercased()
-        guard !teleportedGeo.contains(key) else { return }
-
-        while teleportedGeoOrder.count >= teleportedGeoCapacity, let oldest = teleportedGeoOrder.first {
-            teleportedGeoOrder.removeFirst()
-            teleportedGeo.remove(oldest)
-        }
-
-        teleportedGeo.insert(key)
-        teleportedGeoOrder.append(key)
+        teleportedGeo.insert(pubkeyHex.lowercased())
     }
 
     func clearTeleported(_ pubkeyHex: String) {
-        let key = pubkeyHex.lowercased()
-        teleportedGeo.remove(key)
-        teleportedGeoOrder.removeAll { $0 == key }
+        teleportedGeo.remove(pubkeyHex.lowercased())
     }
 
     func replaceTeleportedGeo(_ pubkeys: Set<String>) {
-        guard teleportedGeoCapacity > 0 else {
-            clearTeleportedGeo()
-            return
-        }
-
-        var seen: Set<String> = []
-        var ordered: [String] = []
-        for key in pubkeys.map({ $0.lowercased() }) where !seen.contains(key) {
-            seen.insert(key)
-            ordered.append(key)
-        }
-        if ordered.count > teleportedGeoCapacity {
-            ordered = Array(ordered.suffix(teleportedGeoCapacity))
-        }
-        teleportedGeoOrder = ordered
-        teleportedGeo = Set(ordered)
-    }
-
-    func retainTeleportedGeo(keeping pubkeys: Set<String>) {
-        let allowed = Set(pubkeys.map { $0.lowercased() })
-        teleportedGeoOrder = teleportedGeoOrder.filter { allowed.contains($0) }
-        teleportedGeo = teleportedGeo.intersection(allowed)
+        teleportedGeo = Set(pubkeys.map { $0.lowercased() })
     }
 
     func clearTeleportedGeo() {
         teleportedGeo.removeAll()
-        teleportedGeoOrder.removeAll()
     }
 
     func reset() {
         currentGeohash = nil
         geoNicknames.removeAll()
-        geoNicknameOrder.removeAll()
         teleportedGeo.removeAll()
-        teleportedGeoOrder.removeAll()
     }
 }

bitchat/Features/voice/VoiceCaptureSession.swift

@@ -26,8 +26,6 @@ protocol VoiceCaptureSession: AnyObject {
     /// nothing valid was captured.
     func finish() async -> URL?
     func cancel() async
-    /// Stops capture and suppresses every later send before returning.
-    func panicCancelSynchronously()
 }
 
 /// The classic record-then-send backend, wrapping the shared `VoiceRecorder`.
@@ -57,10 +55,6 @@ final class VoiceNoteCaptureSession: VoiceCaptureSession {
     func cancel() async {
         await recorder.cancelRecording(owner: owner)
     }
-
-    func panicCancelSynchronously() {
-        recorder.panicCancelSynchronously(owner: owner)
-    }
 }
 
 /// Testable surface of the live capture engine. Production uses
@@ -222,13 +216,6 @@ final class PTTLiveVoiceSession: VoiceCaptureSession {
         }
     }
 
-    func panicCancelSynchronously() {
-        // Do not emit a canceled packet: it would itself be pre-panic
-        // conversation data racing the emergency transport reset.
-        completed = true
-        capture.cancel()
-    }
-
     private func sendControlPacket(_ kind: VoiceBurstPacket.Kind) {
         guard let packet = VoiceBurstPacket(burstID: burstID, seq: stream.packetizer.nextSeq, kind: kind) else { return }
         sendPacket(packet.encode())

bitchat/Features/voice/VoiceRecorder.swift

@@ -246,21 +246,6 @@ actor VoiceRecorder {
         currentURL = nil
     }
 
-    /// Panic is a synchronous security boundary: the caller must know the
-    /// microphone, audio-session lease, and partial file are gone before it
-    /// rotates identities or deletes the media tree. VoiceRecorder is an
-    /// independent actor and this cleanup path never hops to MainActor, so a
-    /// short semaphore join is safe even when invoked by the UI actor.
-    nonisolated
-    func panicCancelSynchronously(owner: RecordingOwner) {
-        let finished = DispatchSemaphore(value: 0)
-        Task {
-            await cancelRecording(owner: owner)
-            finished.signal()
-        }
-        finished.wait()
-    }
-
     /// The audio session was interrupted (call, Siri) or reconfigured: stop
     /// the recorder but keep `recorder`/`currentURL` so the caller's pending
     /// `stopRecording()` still returns the partial note.

bitchat/Noise/NoiseSecurityConstants.swift

@@ -15,9 +15,6 @@ enum NoiseSecurityConstants {
     // Maximum handshake message size
     static let maxHandshakeMessageSize = 2048 // 2KB to accommodate XX pattern
     
-    // Noise XX message 1 contains only the initiator's 32-byte ephemeral key.
-    static let xxInitialMessageSize = 32
-    
     // Session timeout - sessions older than this should be renegotiated
     static let sessionTimeout: TimeInterval = 86400 // 24 hours
     

bitchat/Noise/NoiseSession.swift

@@ -66,10 +66,7 @@ class NoiseSession {
             
             // Only initiator writes the first message
             if role == .initiator {
-                guard let handshake = handshakeState else {
-                    throw NoiseSessionError.invalidState
-                }
-                let message = try handshake.writeMessage()
+                let message = try handshakeState!.writeMessage()
                 sentHandshakeMessages.append(message)
                 return message
             } else {

bitchat/Noise/NoiseSessionError.swift

@@ -11,5 +11,4 @@ enum NoiseSessionError: Error, Equatable {
     case notEstablished
     case sessionNotFound
     case alreadyEstablished
-    case peerIdentityMismatch
 }

bitchat/Noise/NoiseSessionManager.swift

@@ -11,18 +11,8 @@ import CryptoKit
 import Foundation
 import BitFoundation
 
-struct NoiseHandshakeProcessingResult {
-    let response: Data?
-    let didEstablishAuthenticatedSession: Bool
-}
-
 final class NoiseSessionManager {
     private var sessions: [PeerID: NoiseSession] = [:]
-    /// A responder rehandshake must not evict a working transport session
-    /// before the candidate proves that its authenticated static key belongs
-    /// to the claimed wire ID. Candidates therefore live outside `sessions`
-    /// until the XX handshake completes and the binding is validated.
-    private var responderCandidates: [PeerID: NoiseSession] = [:]
     private let sessionFactory: (PeerID, NoiseRole) -> NoiseSession
     private let managerQueue = DispatchQueue(label: "chat.bitchat.noise.manager", attributes: .concurrent)
     
@@ -64,9 +54,6 @@ final class NoiseSessionManager {
             if let session = sessions.removeValue(forKey: peerID) {
                 session.reset() // Clear sensitive data before removing
             }
-            if let candidate = responderCandidates.removeValue(forKey: peerID) {
-                candidate.reset()
-            }
         }
     }
 
@@ -75,11 +62,7 @@ final class NoiseSessionManager {
             for (_, session) in sessions {
                 session.reset()
             }
-            for (_, candidate) in responderCandidates {
-                candidate.reset()
-            }
             sessions.removeAll()
-            responderCandidates.removeAll()
         }
     }
     
@@ -96,7 +79,6 @@ final class NoiseSessionManager {
             // Remove any existing non-established session
             if let existingSession = sessions[peerID], !existingSession.isEstablished() {
                 _ = sessions.removeValue(forKey: peerID)
-                existingSession.reset()
             }
             
             // Create new initiator session
@@ -109,7 +91,6 @@ final class NoiseSessionManager {
             } catch {
                 // Clean up failed session
                 _ = sessions.removeValue(forKey: peerID)
-                session.reset()
                 SecureLogger.error(.handshakeFailed(peerID: peerID.id, error: error.localizedDescription))
                 throw error
             }
@@ -117,116 +98,61 @@ final class NoiseSessionManager {
     }
     
     func handleIncomingHandshake(from peerID: PeerID, message: Data) throws -> Data? {
-        try handleIncomingHandshakeWithResult(
-            from: peerID,
-            message: message
-        ).response
-    }
-
-    /// Processes one exact handshake candidate and reports whether that
-    /// candidate completed authenticated establishment. The peer's retained
-    /// session may already be established while a replacement is only on
-    /// message one, so callers must not infer candidate completion from the
-    /// peer-level session table.
-    func handleIncomingHandshakeWithResult(
-        from peerID: PeerID,
-        message: Data
-    ) throws -> NoiseHandshakeProcessingResult {
         // Process everything within the synchronized block to prevent race conditions
         return try managerQueue.sync(flags: .barrier) {
-            let session: NoiseSession
-            let isReplacementCandidate: Bool
+            var shouldCreateNew = false
+            var existingSession: NoiseSession? = nil
             
-            if let candidate = responderCandidates[peerID] {
-                // A fresh XX message 1 supersedes an incomplete candidate,
-                // but never the established session it is trying to replace.
-                if message.count == NoiseSecurityConstants.xxInitialMessageSize {
-                    candidate.reset()
-                    let replacement = sessionFactory(peerID, .responder)
-                    responderCandidates[peerID] = replacement
-                    session = replacement
-                } else {
-                    session = candidate
-                }
-                isReplacementCandidate = true
-            } else if let existing = sessions[peerID] {
+            if let existing = sessions[peerID] {
+                // If we have an established session, the peer must have cleared their session
+                // for a good reason (e.g., decryption failure, restart, etc.)
+                // We should accept the new handshake to re-establish encryption
                 if existing.isEstablished() {
-                    SecureLogger.info(
-                        "Validating replacement handshake from \(peerID) while preserving the established session",
-                        category: .session
-                    )
-                    let candidate = sessionFactory(peerID, .responder)
-                    responderCandidates[peerID] = candidate
-                    session = candidate
-                    isReplacementCandidate = true
-                } else if existing.getState() == .handshaking,
-                          message.count == NoiseSecurityConstants.xxInitialMessageSize {
-                    // No established transport state exists to preserve. A
-                    // fresh initiation replaces the incomplete handshake.
+                    SecureLogger.info("Accepting handshake from \(peerID) despite existing session - peer likely cleared their session", category: .session)
                     _ = sessions.removeValue(forKey: peerID)
-                    existing.reset()
-                    let replacement = sessionFactory(peerID, .responder)
-                    sessions[peerID] = replacement
-                    session = replacement
-                    isReplacementCandidate = false
+                    shouldCreateNew = true
                 } else {
-                    session = existing
-                    isReplacementCandidate = false
+                    // If we're in the middle of a handshake and receive a new initiation,
+                    // reset and start fresh (the other side may have restarted)
+                    if existing.getState() == .handshaking && message.count == 32 {
+                        _ = sessions.removeValue(forKey: peerID)
+                        shouldCreateNew = true
+                    } else {
+                        existingSession = existing
+                    }
                 }
             } else {
+                shouldCreateNew = true
+            }
+            
+            // Get or create session
+            let session: NoiseSession
+            if shouldCreateNew {
                 let newSession = sessionFactory(peerID, .responder)
                 sessions[peerID] = newSession
                 session = newSession
-                isReplacementCandidate = false
+            } else {
+                session = existingSession!
             }
             
             // Process the handshake message within the synchronized block
             do {
                 let response = try session.processHandshakeMessage(message)
                 
-                // Check the exact session that processed this message. A
-                // preserved peer-level session can remain established while a
-                // replacement candidate is still unauthenticated.
-                let didEstablishAuthenticatedSession = session.isEstablished()
-                if didEstablishAuthenticatedSession {
-                    guard let remoteKey = session.getRemoteStaticPublicKey(),
-                          authenticatedRemoteKey(remoteKey, matches: peerID) else {
-                        throw NoiseSessionError.peerIdentityMismatch
-                    }
-
-                    if isReplacementCandidate {
-                        _ = responderCandidates.removeValue(forKey: peerID)
-                        let previous = sessions.updateValue(session, forKey: peerID)
-                        if let previous, previous !== session {
-                            previous.reset()
-                        }
-                    }
-
+                // Check if session is established after processing
+                if session.isEstablished() {
+                    if let remoteKey = session.getRemoteStaticPublicKey() {
                         // Schedule callback outside the synchronized block to prevent deadlock
                         DispatchQueue.global().async { [weak self] in
                             self?.onSessionEstablished?(peerID, remoteKey)
                         }
                     }
+                }
                 
-                return NoiseHandshakeProcessingResult(
-                    response: response,
-                    didEstablishAuthenticatedSession:
-                        didEstablishAuthenticatedSession
-                )
+                return response
             } catch {
-                // A failed candidate is discarded without touching the
-                // established session. Ordinary failed handshakes retain the
-                // historical cleanup behavior.
-                if isReplacementCandidate {
-                    if let storedCandidate = responderCandidates[peerID],
-                       storedCandidate === session {
-                        _ = responderCandidates.removeValue(forKey: peerID)
-                    }
-                } else if let storedSession = sessions[peerID],
-                          storedSession === session {
+                // Reset the session on handshake failure so next attempt can start fresh
                 _ = sessions.removeValue(forKey: peerID)
-                }
-                session.reset()
                 
                 // Schedule callback outside the synchronized block to prevent deadlock
                 DispatchQueue.global().async { [weak self] in
@@ -239,24 +165,6 @@ final class NoiseSessionManager {
         }
     }
     
-    /// Mesh handshakes normally use a 16-hex wire ID. Full Noise-key IDs are
-    /// also accepted by internal callers when they exactly match the static
-    /// key. Non-wire identifiers remain available to protocol test harnesses;
-    /// BLE packet ingress always supplies a short hexadecimal ID.
-    private func authenticatedRemoteKey(
-        _ remoteKey: Curve25519.KeyAgreement.PublicKey,
-        matches claimedPeerID: PeerID
-    ) -> Bool {
-        let rawKey = remoteKey.rawRepresentation
-        if claimedPeerID.isShort {
-            return PeerID(publicKey: rawKey) == claimedPeerID
-        }
-        if let claimedNoiseKey = claimedPeerID.noiseKey {
-            return claimedNoiseKey == rawKey
-        }
-        return true
-    }
-    
     // MARK: - Encryption/Decryption
     
     func encrypt(_ plaintext: Data, for peerID: PeerID) throws -> Data {

bitchat/Nostr/GeoRelayDirectory.swift

@@ -32,6 +32,23 @@ struct GeoRelayDirectoryDependencies {
     var retrySleep: (TimeInterval) async -> Void
     var activeNotificationName: Notification.Name?
     var autoStart: Bool
+    var validationPolicy: GeoRelayDirectoryValidationPolicy
+}
+
+struct GeoRelayDirectoryValidationPolicy: Sendable {
+    let maximumBytes: Int
+    let maximumRows: Int
+    let maximumEntries: Int
+    let minimumRemoteEntries: Int
+    let minimumRetainedFraction: Double
+
+    static let live = GeoRelayDirectoryValidationPolicy(
+        maximumBytes: 512 * 1024,
+        maximumRows: 5_000,
+        maximumEntries: 5_000,
+        minimumRemoteEntries: 50,
+        minimumRetainedFraction: 0.5
+    )
 }
 
 private extension GeoRelayDirectoryDependencies {
@@ -44,12 +61,16 @@ private extension GeoRelayDirectoryDependencies {
 #else
         let activeNotificationName: Notification.Name? = nil
 #endif
+        let validationPolicy = GeoRelayDirectoryValidationPolicy.live
 
         return Self(
             userDefaults: .standard,
             notificationCenter: .default,
             now: Date.init,
-            remoteURL: URL(string: "https://raw.githubusercontent.com/permissionlesstech/georelays/refs/heads/main/nostr_relays.csv")!,
+            // Runtime refreshes only from bitchat's reviewed copy. Upstream
+            // georelays/main is imported by a validator-backed pull request,
+            // so an upstream mutation cannot immediately retarget clients.
+            remoteURL: URL(string: "https://raw.githubusercontent.com/permissionlesstech/bitchat/refs/heads/main/relays/online_relays_gps.csv")!,
             fetchInterval: TransportConfig.geoRelayFetchIntervalSeconds,
             refreshCheckInterval: TransportConfig.geoRelayRefreshCheckIntervalSeconds,
             retryInitialSeconds: TransportConfig.geoRelayRetryInitialSeconds,
@@ -58,7 +79,27 @@ private extension GeoRelayDirectoryDependencies {
             makeFetchData: {
                 let session = TorURLSession.shared.session
                 return { request in
-                    let (data, _) = try await session.data(for: request)
+                    let (bytes, response) = try await session.bytes(for: request)
+                    guard let response = response as? HTTPURLResponse,
+                          (200...299).contains(response.statusCode),
+                          response.url == request.url else {
+                        throw URLError(.badServerResponse)
+                    }
+
+                    let maximumBytes = validationPolicy.maximumBytes
+                    guard response.expectedContentLength <= Int64(maximumBytes) else {
+                        throw URLError(.dataLengthExceedsMaximum)
+                    }
+                    var data = Data()
+                    if response.expectedContentLength > 0 {
+                        data.reserveCapacity(Int(response.expectedContentLength))
+                    }
+                    for try await byte in bytes {
+                        guard data.count < maximumBytes else {
+                            throw URLError(.dataLengthExceedsMaximum)
+                        }
+                        data.append(byte)
+                    }
                     return data
                 }
             },
@@ -76,7 +117,11 @@ private extension GeoRelayDirectoryDependencies {
                     )
                     let dir = base.appendingPathComponent("bitchat", isDirectory: true)
                     try? FileManager.default.createDirectory(at: dir, withIntermediateDirectories: true)
-                    return dir.appendingPathComponent("georelays_cache.csv")
+                    // v2 ignores caches populated from the old direct-upstream
+                    // trust path and subjects every load to strict validation.
+                    let legacyCache = dir.appendingPathComponent("georelays_cache.csv")
+                    try? FileManager.default.removeItem(at: legacyCache)
+                    return dir.appendingPathComponent("georelays_cache_v2.csv")
                 } catch {
                     return nil
                 }
@@ -94,7 +139,8 @@ private extension GeoRelayDirectoryDependencies {
                 try? await Task.sleep(nanoseconds: nanoseconds)
             },
             activeNotificationName: activeNotificationName,
-            autoStart: true
+            autoStart: true,
+            validationPolicy: validationPolicy
         )
     }
 }
@@ -125,7 +171,7 @@ final class GeoRelayDirectory {
     }
 
     private enum DetachedFetchOutcome: Sendable {
-        case success(entries: [Entry], csv: String)
+        case success(entries: [Entry], csv: Data)
         case torNotReady
         case invalidData
         case network(String)
@@ -212,6 +258,8 @@ final class GeoRelayDirectory {
         )
         let awaitTorReady = dependencies.awaitTorReady
         let fetchData = dependencies.makeFetchData()
+        let validationPolicy = dependencies.validationPolicy
+        let baselineEntries = Set(entries)
 
         Task { [weak self] in
             guard let self else { return }
@@ -219,7 +267,9 @@ final class GeoRelayDirectory {
             let outcome = await Self.fetchRemoteOutcome(
                 request: request,
                 awaitTorReady: awaitTorReady,
-                fetchData: fetchData
+                fetchData: fetchData,
+                validationPolicy: validationPolicy,
+                baselineEntries: baselineEntries
             )
 
             switch outcome {
@@ -238,7 +288,9 @@ final class GeoRelayDirectory {
     nonisolated private static func fetchRemoteOutcome(
         request: URLRequest,
         awaitTorReady: @escaping @Sendable () async -> Bool,
-        fetchData: @escaping @Sendable (URLRequest) async throws -> Data
+        fetchData: @escaping @Sendable (URLRequest) async throws -> Data,
+        validationPolicy: GeoRelayDirectoryValidationPolicy,
+        baselineEntries: Set<Entry>
     ) async -> DetachedFetchOutcome {
         await Task.detached(priority: .utility) {
             let ready = await awaitTorReady()
@@ -246,16 +298,16 @@ final class GeoRelayDirectory {
 
             do {
                 let data = try await fetchData(request)
-                guard let text = String(data: data, encoding: .utf8) else {
+                guard let parsed = Self.validatedEntries(
+                    from: data,
+                    policy: validationPolicy,
+                    minimumEntries: validationPolicy.minimumRemoteEntries,
+                    baselineEntries: baselineEntries
+                ) else {
                     return .invalidData
                 }
 
-                let parsed = Self.parseCSV(text)
-                guard !parsed.isEmpty else {
-                    return .invalidData
-                }
-
-                return .success(entries: parsed, csv: text)
+                return .success(entries: parsed, csv: data)
             } catch {
                 return .network(error.localizedDescription)
             }
@@ -269,7 +321,7 @@ final class GeoRelayDirectory {
     }
 
     @MainActor
-    private func handleFetchSuccess(entries parsed: [Entry], csv: String) {
+    private func handleFetchSuccess(entries parsed: [Entry], csv: Data) {
         entries = parsed
         persistCache(csv)
         dependencies.userDefaults.set(dependencies.now(), forKey: lastFetchKey)
@@ -321,9 +373,8 @@ final class GeoRelayDirectory {
         cleanupState.retryTask = nil
     }
 
-    private func persistCache(_ text: String) {
+    private func persistCache(_ data: Data) {
         guard let url = dependencies.cacheURL() else { return }
-        guard let data = text.data(using: .utf8) else { return }
         do {
             try dependencies.writeData(data, url)
         } catch {
@@ -336,9 +387,12 @@ final class GeoRelayDirectory {
         // Prefer cached file if present
         if let cache = dependencies.cacheURL(),
            let data = dependencies.readData(cache),
-           let text = String(data: data, encoding: .utf8) {
-            let arr = Self.parseCSV(text)
-            if !arr.isEmpty { return arr }
+           let entries = Self.validatedEntries(
+               from: data,
+               policy: dependencies.validationPolicy,
+               minimumEntries: 1
+           ) {
+            return entries
         }
 
         // Try bundled resource(s)
@@ -346,36 +400,157 @@ final class GeoRelayDirectory {
 
         for url in bundleCandidates {
             if let data = dependencies.readData(url),
-               let text = String(data: data, encoding: .utf8) {
-                let arr = Self.parseCSV(text)
-                if !arr.isEmpty { return arr }
+               let entries = Self.validatedEntries(
+                   from: data,
+                   policy: dependencies.validationPolicy,
+                   minimumEntries: 1
+               ) {
+                return entries
             }
         }
 
         // Try filesystem path (development/test)
         if let cwd = dependencies.currentDirectoryPath(),
            let data = dependencies.readData(URL(fileURLWithPath: cwd).appendingPathComponent("relays/online_relays_gps.csv")),
-           let text = String(data: data, encoding: .utf8) {
-            return Self.parseCSV(text)
+           let entries = Self.validatedEntries(
+               from: data,
+               policy: dependencies.validationPolicy,
+               minimumEntries: 1
+           ) {
+            return entries
         }
 
         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() {
-            guard let line = raw.trimmedOrNilIfEmpty else { continue }
-            if idx == 0 && line.lowercased().contains("relay url") { continue }
-            let parts = line.split(separator: ",").map { $0.trimmed }
-            guard parts.count >= 3 else { continue }
-            guard let host = NostrRelayURL.directoryAddress(parts[0]) else { continue }
-            guard let lat = Double(parts[1]), let lon = Double(parts[2]) else { continue }
-            result.insert(Entry(host: host, lat: lat, lon: lon))
+    /// Parses the fixed three-column format as an all-or-nothing trust unit.
+    /// One malformed or conflicting row rejects the complete dataset rather
+    /// than silently shrinking or partially replacing the current directory.
+    nonisolated static func validatedEntries(
+        from data: Data,
+        policy: GeoRelayDirectoryValidationPolicy,
+        minimumEntries: Int,
+        baselineEntries: Set<Entry>? = nil
+    ) -> [Entry]? {
+        guard !data.isEmpty, data.count <= policy.maximumBytes,
+              let text = String(data: data, encoding: .utf8),
+              !text.hasPrefix("\u{feff}") else {
+            return nil
         }
-        return Array(result)
+
+        let lines = text.split(whereSeparator: { $0.isNewline })
+            .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
+            .filter { !$0.isEmpty }
+        guard let header = lines.first,
+              lines.count - 1 <= policy.maximumRows else {
+            return nil
+        }
+
+        let headerParts = header
+            .split(separator: ",", omittingEmptySubsequences: false)
+            .map { $0.trimmingCharacters(in: .whitespacesAndNewlines).lowercased() }
+        let supportedHeaders = [
+            ["relay url", "latitude", "longitude"],
+            ["relay url", "lat", "lon"]
+        ]
+        guard supportedHeaders.contains(headerParts) else {
+            return nil
+        }
+
+        var entriesByHost: [String: Entry] = [:]
+        for line in lines.dropFirst() {
+            let parts = line
+                .split(separator: ",", omittingEmptySubsequences: false)
+                .map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }
+            guard parts.count == 3,
+                  let host = validatedDirectoryAddress(parts[0]),
+                  let latitude = Double(parts[1]), latitude.isFinite,
+                  (-90.0...90.0).contains(latitude),
+                  let longitude = Double(parts[2]), longitude.isFinite,
+                  (-180.0...180.0).contains(longitude) else {
+                return nil
+            }
+
+            let entry = Entry(host: host, lat: latitude, lon: longitude)
+            if let existing = entriesByHost[host], existing != entry {
+                // One endpoint cannot truthfully occupy two coordinates. Do
+                // not let row ordering choose which location clients trust.
+                return nil
+            }
+            entriesByHost[host] = entry
+            guard entriesByHost.count <= policy.maximumEntries else { return nil }
+        }
+
+        let parsedEntries = Set(entriesByHost.values)
+        guard parsedEntries.count >= minimumEntries else { return nil }
+
+        if let baselineEntries {
+            guard (0...1).contains(policy.minimumRetainedFraction) else { return nil }
+            let requiredOverlap = Int(
+                ceil(Double(baselineEntries.count) * policy.minimumRetainedFraction)
+            )
+            guard parsedEntries.intersection(baselineEntries).count >= requiredOverlap else {
+                return nil
+            }
+        }
+
+        return parsedEntries.sorted {
+            ($0.host, $0.lat, $0.lon) < ($1.host, $1.lat, $1.lon)
+        }
+    }
+
+    nonisolated private static func validatedDirectoryAddress(_ rawValue: String) -> String? {
+        let value = rawValue.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !value.isEmpty,
+              value.unicodeScalars.allSatisfy({
+                  $0.isASCII && !CharacterSet.controlCharacters.contains($0)
+              }) else {
+            return nil
+        }
+
+        let candidate = value.contains("://") ? value : "wss://\(value)"
+        guard let components = URLComponents(string: candidate),
+              let scheme = components.scheme?.lowercased(),
+              scheme == "wss" || scheme == "https",
+              components.user == nil,
+              components.password == nil,
+              components.query == nil,
+              components.fragment == nil,
+              components.path.isEmpty || components.path == "/",
+              let rawHost = components.host else {
+            return nil
+        }
+
+        let host = rawHost.lowercased()
+        guard !host.isEmpty, host.count <= 253,
+              host.unicodeScalars.allSatisfy({ $0.isASCII }),
+              !host.hasSuffix("."),
+              host != "localhost",
+              !host.hasSuffix(".localhost"),
+              !host.hasSuffix(".local"),
+              !host.hasSuffix(".internal") else {
+            return nil
+        }
+
+        let labels = host.split(separator: ".", omittingEmptySubsequences: false)
+        let allowed = CharacterSet(charactersIn: "abcdefghijklmnopqrstuvwxyz0123456789-")
+        guard labels.count >= 2,
+              !labels.allSatisfy({ $0.allSatisfy(\.isNumber) }),
+              labels.allSatisfy({ label in
+                  (1...63).contains(label.count) &&
+                  label.first != "-" &&
+                  label.last != "-" &&
+                  label.unicodeScalars.allSatisfy { allowed.contains($0) }
+              }) else {
+            return nil
+        }
+
+        if let port = components.port {
+            guard (1...65_535).contains(port) else { return nil }
+            if port != 443 { return "\(host):\(port)" }
+        }
+        return host
     }
 
     // MARK: - Observers & Timers

bitchat/Nostr/NostrProtocol.swift

@@ -701,10 +701,6 @@ struct NostrEvent: Codable {
             throw NostrError.invalidEvent
         }
         
-        guard Self.isWithinInboundTagLimits(tags) else {
-            throw NostrError.invalidEvent
-        }
-        
         self.id = dict["id"] as? String ?? ""
         self.pubkey = pubkey
         self.created_at = createdAt
@@ -714,21 +710,6 @@ struct NostrEvent: Codable {
         self.sig = dict["sig"] as? String
     }
     
-    /// Bounds untrusted relay tag arrays so attackers cannot force large
-    /// allocations or expensive joins on the inbound hot path.
-    static func isWithinInboundTagLimits(_ tags: [[String]]) -> Bool {
-        guard tags.count <= TransportConfig.nostrMaxEventTags else { return false }
-
-        for tag in tags {
-            guard tag.count <= TransportConfig.nostrMaxEventTagValues else { return false }
-            guard tag.allSatisfy({ $0.utf8.count <= TransportConfig.nostrMaxEventTagValueBytes }) else {
-                return false
-            }
-        }
-
-        return true
-    }
-    
     func sign(with key: P256K.Schnorr.PrivateKey) throws -> NostrEvent {
         let (eventId, eventIdHash) = try calculateEventId()
         

bitchat/Nostr/NostrRelayManager.swift

@@ -1480,7 +1480,7 @@ private enum ParsedInbound {
     case notice(String)
     
     init?(_ message: URLSessionWebSocketTask.Message) {
-        guard let data = message.dataWithinInboundLimit,
+        guard let data = message.data,
               let array = try? JSONSerialization.jsonObject(with: data) as? [Any],
               array.count >= 2,
               let type = array[0] as? String else {
@@ -1525,19 +1525,11 @@ private enum ParsedInbound {
 }
 
 private extension URLSessionWebSocketTask.Message {
-    /// Prefer rejecting oversized frames before UTF-8/Data materialization
-    /// where we can (string length), and always before JSON parse.
-    var dataWithinInboundLimit: Data? {
-        let maxBytes = TransportConfig.nostrMaxInboundMessageBytes
+    var data: Data? {
         switch self {
-        case .string(let text):
-            guard text.utf8.count <= maxBytes else { return nil }
-            return text.data(using: .utf8)
-        case .data(let data):
-            guard data.count <= maxBytes else { return nil }
-            return data
-        @unknown default:
-            return nil
+        case .string(let text): text.data(using: .utf8)
+        case .data(let data):   data
+        @unknown default:       nil
         }
     }
 }

bitchat/Nostr/NostrRelayURL.swift

@@ -39,13 +39,4 @@ enum NostrRelayURL {
 
         return components.string
     }
-
-    static func directoryAddress(_ rawValue: String) -> String? {
-        guard var normalized = normalized(rawValue, defaultScheme: "wss") else { return nil }
-        for prefix in ["wss://", "ws://"] where normalized.hasPrefix(prefix) {
-            normalized.removeFirst(prefix.count)
-            break
-        }
-        return normalized
-    }
 }

bitchat/Services/BLE/BLEIncomingFileStore.swift

@@ -2,124 +2,8 @@ import BitLogger
 import BitFoundation
 import Foundation
 
-struct PanicRecoveryIntent {
-    let fileMarkerEstablished: Bool
-    let externalMarkerEstablished: Bool
-
-    var hasDurableMarker: Bool {
-        fileMarkerEstablished || externalMarkerEstablished
-    }
-}
-
-/// Small, dependency-injectable transaction surface used by ChatViewModel.
-/// Production persists the same intent in two independent locations before
-/// any application state is erased. Tests can inject an ephemeral operation
-/// set without touching the developer's Application Support directory.
-struct PanicRecoveryOperations {
-    let isPending: () throws -> Bool
-    let begin: () -> PanicRecoveryIntent
-    let wipeMedia: (PanicRecoveryIntent) throws -> Void
-    let complete: () throws -> Void
-
-    static func ephemeral(
-        wipeMedia: @escaping () throws -> Void = {}
-    ) -> PanicRecoveryOperations {
-        PanicRecoveryOperations(
-            isPending: { false },
-            begin: {
-                PanicRecoveryIntent(
-                    fileMarkerEstablished: false,
-                    externalMarkerEstablished: false
-                )
-            },
-            wipeMedia: { _ in try wipeMedia() },
-            complete: {}
-        )
-    }
-
-    static func live(
-        fileStore: BLEIncomingFileStore = BLEIncomingFileStore(),
-        defaults: UserDefaults = .standard
-    ) -> PanicRecoveryOperations {
-        let defaultsKey = "bitchat.panicResetPending"
-        return PanicRecoveryOperations(
-            isPending: {
-                if defaults.bool(forKey: defaultsKey) {
-                    return true
-                }
-                return try fileStore.isPanicRecoveryPending()
-            },
-            begin: {
-                defaults.set(true, forKey: defaultsKey)
-                let externalMarkerEstablished =
-                    defaults.synchronize()
-                    && defaults.bool(forKey: defaultsKey)
-
-                let fileMarkerEstablished: Bool
-                do {
-                    try fileStore.markPanicRecoveryPending()
-                    fileMarkerEstablished = true
-                } catch {
-                    fileMarkerEstablished = false
-                    SecureLogger.error(
-                        "Failed to persist file panic-recovery marker: \(error)",
-                        category: .security
-                    )
-                }
-
-                return PanicRecoveryIntent(
-                    fileMarkerEstablished: fileMarkerEstablished,
-                    externalMarkerEstablished: externalMarkerEstablished
-                )
-            },
-            wipeMedia: { intent in
-                try fileStore.panicWipe(
-                    hasDurablePendingMarker: intent.hasDurableMarker
-                )
-            },
-            complete: {
-                // Keep the independent defaults latch until the file marker
-                // has definitely cleared. Any failure therefore remains
-                // visible to the next launch.
-                try fileStore.completePanicRecovery()
-                defaults.removeObject(forKey: defaultsKey)
-                guard defaults.synchronize(),
-                      !defaults.bool(forKey: defaultsKey) else {
-                    throw BLEIncomingFileStore.PanicRecoveryError
-                        .externalMarkerCommitFailed
-                }
-            }
-        )
-    }
-}
-
 struct BLEIncomingFileStore {
-    enum PanicRecoveryError: Error {
-        case externalMarkerCommitFailed
-        case markerWriteFailed(Error)
-        case markerWriteAndMediaWipeFailed(
-            markerError: Error,
-            mediaError: Error
-        )
-    }
-
     private static let quotaBytes: Int64 = 100 * 1024 * 1024
-    /// Kept outside `files/` so deleting the media tree cannot erase the
-    /// fail-closed startup decision before the full panic has committed.
-    private static let panicRecoveryPendingMarkerFileName =
-        ".panic-recovery-pending"
-    /// Compatibility with a short-lived development build that used the
-    /// media-specific name for the same full-transaction latch.
-    private static let legacyPanicRecoveryPendingMarkerFileName =
-        ".panic-media-wipe-pending"
-    private static let mediaSubdirectories = [
-        "voicenotes/incoming",
-        "voicenotes/outgoing",
-        "images/incoming",
-        "images/outgoing",
-        "files/incoming",
-        "files/outgoing"
-    ]
 
     /// Name prefix of in-flight live voice captures (progressively written by
     /// `ChatLiveVoiceCoordinator`). Quota eviction skips them by pattern —
@@ -133,96 +17,11 @@ struct BLEIncomingFileStore {
     let fileManager: FileManager
     private let baseDirectory: URL?
     private let dateProvider: () -> Date
-    private let panicMarkerWriter: (Data, URL) throws -> Void
 
-    init(
-        fileManager: FileManager = .default,
-        baseDirectory: URL? = nil,
-        dateProvider: @escaping () -> Date = Date.init,
-        panicMarkerWriter: @escaping (Data, URL) throws -> Void = {
-            try $0.write(to: $1, options: .atomic)
-        }
-    ) {
+    init(fileManager: FileManager = .default, baseDirectory: URL? = nil, dateProvider: @escaping () -> Date = Date.init) {
         self.fileManager = fileManager
         self.baseDirectory = baseDirectory
         self.dateProvider = dateProvider
-        self.panicMarkerWriter = panicMarkerWriter
-    }
-
-    /// Panic-wipe every managed incoming and outgoing media artifact before
-    /// returning. Recreating the directory tree keeps later capture/receive
-    /// paths usable without allowing a detached cleanup task to race them.
-    ///
-    /// Marker persistence and deletion are deliberately separate error
-    /// domains: even when both durable marker channels fail, deletion is
-    /// still attempted before this method reports the marker failure.
-    func panicWipe(
-        hasDurablePendingMarker: Bool = false
-    ) throws {
-        let markerError: Error?
-        do {
-            try markPanicRecoveryPending()
-            markerError = nil
-        } catch {
-            markerError = error
-            SecureLogger.error(
-                "Could not persist file panic-recovery marker; attempting media deletion anyway: \(error)",
-                category: .security
-            )
-        }
-
-        do {
-            let filesDirectory = try rootDirectory()
-                .appendingPathComponent("files", isDirectory: true)
-            if fileManager.fileExists(atPath: filesDirectory.path) {
-                try fileManager.removeItem(at: filesDirectory)
-            }
-            for subdirectory in Self.mediaSubdirectories {
-                try fileManager.createDirectory(
-                    at: filesDirectory.appendingPathComponent(
-                        subdirectory,
-                        isDirectory: true
-                    ),
-                    withIntermediateDirectories: true,
-                    attributes: nil
-                )
-            }
-        } catch {
-            if let markerError {
-                throw PanicRecoveryError.markerWriteAndMediaWipeFailed(
-                    markerError: markerError,
-                    mediaError: error
-                )
-            }
-            throw error
-        }
-
-        if let markerError, !hasDurablePendingMarker {
-            throw PanicRecoveryError.markerWriteFailed(markerError)
-        }
-    }
-
-    func markPanicRecoveryPending() throws {
-        let markerURL = try panicRecoveryPendingMarkerURL()
-        try fileManager.createDirectory(
-            at: markerURL.deletingLastPathComponent(),
-            withIntermediateDirectories: true,
-            attributes: nil
-        )
-        try panicMarkerWriter(Data([1]), markerURL)
-    }
-
-    func isPanicRecoveryPending() throws -> Bool {
-        try panicRecoveryMarkerURLs().contains {
-            fileManager.fileExists(atPath: $0.path)
-        }
-    }
-
-    func completePanicRecovery() throws {
-        for markerURL in try panicRecoveryMarkerURLs()
-        where fileManager.fileExists(atPath: markerURL.path) {
-            try fileManager.removeItem(at: markerURL)
-        }
     }
 
     /// Resolves (and creates) an incoming-media directory for callers that
@@ -314,39 +113,15 @@ struct BLEIncomingFileStore {
     }
 
     private func filesDirectory() throws -> URL {
-        let filesDir = try rootDirectory().appendingPathComponent("files", isDirectory: true)
-        try fileManager.createDirectory(at: filesDir, withIntermediateDirectories: true, attributes: nil)
-        return filesDir
-    }
-
-    private func rootDirectory() throws -> URL {
-        try baseDirectory ?? fileManager.url(
+        let root = try baseDirectory ?? fileManager.url(
             for: .applicationSupportDirectory,
             in: .userDomainMask,
             appropriateFor: nil,
             create: true
         )
-    }
-
-    private func panicRecoveryPendingMarkerURL() throws -> URL {
-        try rootDirectory().appendingPathComponent(
-            Self.panicRecoveryPendingMarkerFileName,
-            isDirectory: false
-        )
-    }
-
-    private func panicRecoveryMarkerURLs() throws -> [URL] {
-        let root = try rootDirectory()
-        return [
-            root.appendingPathComponent(
-                Self.panicRecoveryPendingMarkerFileName,
-                isDirectory: false
-            ),
-            root.appendingPathComponent(
-                Self.legacyPanicRecoveryPendingMarkerFileName,
-                isDirectory: false
-            )
-        ]
+        let filesDir = root.appendingPathComponent("files", isDirectory: true)
+        try fileManager.createDirectory(at: filesDir, withIntermediateDirectories: true, attributes: nil)
+        return filesDir
     }
 
     private func sanitizedFileName(_ name: String?, defaultName: String, fallbackExtension: String?) -> String {

bitchat/Services/BLE/BLENoisePacketHandler.swift

@@ -2,11 +2,6 @@ import BitFoundation
 import BitLogger
 import Foundation
 
-struct BLENoiseHandshakeHandlingResult {
-    let processed: Bool
-    let didEstablishAuthenticatedSession: Bool
-}
-
 /// Narrow environment for `BLENoisePacketHandler`.
 ///
 /// All queue hops (collections barrier writes, main-actor UI notification)
@@ -21,11 +16,8 @@ struct BLENoisePacketHandlerEnvironment {
     let messageTTL: UInt8
     /// Current time source.
     let now: () -> Date
-    /// Processes an inbound handshake message, returning its optional response
-    /// and whether that exact candidate authenticated (crypto).
-    let processHandshakeMessage:
-        (_ peerID: PeerID, _ message: Data) throws
-            -> NoiseHandshakeProcessingResult
+    /// Processes an inbound handshake message, returning an optional response payload (crypto).
+    let processHandshakeMessage: (_ peerID: PeerID, _ message: Data) throws -> Data?
     /// Whether any Noise session (established or pending) exists for the peer (crypto).
     let hasNoiseSession: (PeerID) -> Bool
     /// Initiates a fresh Noise handshake with the peer (crypto + send).
@@ -57,28 +49,13 @@ final class BLENoisePacketHandler {
         self.environment = environment
     }
 
-    /// Returns true when the handshake message was processed successfully.
-    /// Callers use this to distinguish an authenticated replacement completion
-    /// from a rejected candidate while an older session remains established.
-    @discardableResult
-    func handleHandshake(_ packet: BitchatPacket, from peerID: PeerID) -> Bool {
-        handleHandshakeWithResult(packet, from: peerID).processed
-    }
-
-    func handleHandshakeWithResult(
-        _ packet: BitchatPacket,
-        from peerID: PeerID
-    ) -> BLENoiseHandshakeHandlingResult {
+    func handleHandshake(_ packet: BitchatPacket, from peerID: PeerID) {
         let env = environment
         // Use NoiseEncryptionService for handshake processing
         if PeerID(hexData: packet.recipientID) == env.localPeerID() {
             // Handshake is for us
             do {
-                let result = try env.processHandshakeMessage(
-                    peerID,
-                    packet.payload
-                )
-                if let response = result.response {
+                if let response = try env.processHandshakeMessage(peerID, packet.payload) {
                     // Send response
                     let responsePacket = BitchatPacket(
                         type: MessageType.noiseHandshake.rawValue,
@@ -95,39 +72,14 @@ final class BLENoisePacketHandler {
 
                 // Session establishment will trigger onPeerAuthenticated callback
                 // which will send any pending messages at the right time
-                return BLENoiseHandshakeHandlingResult(
-                    processed: true,
-                    didEstablishAuthenticatedSession:
-                        result.didEstablishAuthenticatedSession
-                )
-            } catch NoiseSessionError.peerIdentityMismatch {
-                // The candidate was already discarded by the session manager.
-                // Do not let a spoofed claimed ID trigger a fresh outbound
-                // handshake or recreate state for the attacker-selected ID.
-                SecureLogger.warning(
-                    "Rejected Noise handshake whose static key does not match \(peerID.id.prefix(8))…",
-                    category: .security
-                )
-                return BLENoiseHandshakeHandlingResult(
-                    processed: false,
-                    didEstablishAuthenticatedSession: false
-                )
             } catch {
                 SecureLogger.error("Failed to process handshake: \(error)")
                 // Try initiating a new handshake
                 if !env.hasNoiseSession(peerID) {
                     env.initiateHandshake(peerID)
                 }
-                return BLENoiseHandshakeHandlingResult(
-                    processed: false,
-                    didEstablishAuthenticatedSession: false
-                )
             }
         }
-        return BLENoiseHandshakeHandlingResult(
-            processed: false,
-            didEstablishAuthenticatedSession: false
-        )
     }
 
     func handleEncrypted(_ packet: BitchatPacket, from peerID: PeerID) {

bitchat/Services/BLE/BLEService.swift

@@ -104,10 +104,6 @@ final class BLEService: NSObject {
     // Test-only tap on the outbound pipeline so multi-node tests can ferry
     // packets between in-process service instances.
     var _test_onOutboundPacket: ((BitchatPacket) -> Void)?
-    /// May block a synthetic CoreBluetooth receive callback immediately
-    /// before it hands a packet to `messageQueue`.
-    var _test_beforeReceivePacketHandoff: (() -> Void)?
-    var _test_onReceivePacketHandoff: (() -> Void)?
     #endif
     private var selfBroadcastTracker = BLESelfBroadcastTracker()
     private let meshTopology = MeshTopologyTracker()
@@ -123,7 +119,6 @@ final class BLEService: NSObject {
     private struct PendingMeshPing {
         let peerID: PeerID
         let sentAt: Date
-        let lifecycleGeneration: UInt64
         let completion: @MainActor (MeshPingResult?) -> Void
         let timeout: DispatchWorkItem
     }
@@ -160,10 +155,6 @@ final class BLEService: NSObject {
     private var centralManager: CBCentralManager?
     private var peripheralManager: CBPeripheralManager?
     private var characteristic: CBMutableCharacteristic?
-    private let shouldInitializeBluetoothManagers: Bool
-    private let panicLifecycleLock = NSLock()
-    private var _isPanicSuspended: Bool
-    private var panicLifecycleGeneration: UInt64 = 0
     
     // MARK: - Identity
     
@@ -284,13 +275,10 @@ final class BLEService: NSObject {
         keychain: KeychainManagerProtocol,
         idBridge: NostrIdentityBridge,
         identityManager: SecureIdentityStateManagerProtocol,
-        initializeBluetoothManagers: Bool = true,
-        startSuspendedForPanicRecovery: Bool = false
+        initializeBluetoothManagers: Bool = true
     ) {
         self.keychain = keychain
         self.idBridge = idBridge
-        self.shouldInitializeBluetoothManagers = initializeBluetoothManagers
-        self._isPanicSuspended = startSuspendedForPanicRecovery
         noiseService = NoiseEncryptionService(keychain: keychain)
         self.identityManager = identityManager
         super.init()
@@ -339,90 +327,37 @@ final class BLEService: NSObject {
         // any access from another queue (cross-queue reads use readLinkState).
         linkStateStore.assumeOwnership(of: bleQueue)
 
-        if !startSuspendedForPanicRecovery {
-            initializeBluetoothManagersIfNeeded()
-        }
-        
-        // Single maintenance timer for all periodic tasks (dispatch-based for
-        // determinism). Only run it when real Bluetooth managers exist.
-        meshBackgroundEnabled = initializeBluetoothManagers
-        if !startSuspendedForPanicRecovery {
-            startMaintenanceTimer()
-        }
-
-        // Publish initial empty state
-        requestPeerDataPublish()
-
-        // Initialize gossip sync manager
-        if !startSuspendedForPanicRecovery {
-            restartGossipManager()
-        }
-    }
-
-    private var isPanicSuspended: Bool {
-        panicLifecycleLock.lock()
-        defer { panicLifecycleLock.unlock() }
-        return _isPanicSuspended
-    }
-
-    private func setPanicSuspended(_ suspended: Bool) {
-        panicLifecycleLock.lock()
-        if suspended {
-            panicLifecycleGeneration &+= 1
-        }
-        _isPanicSuspended = suspended
-        panicLifecycleLock.unlock()
-    }
-
-    private func capturePanicLifecycleGeneration() -> UInt64? {
-        panicLifecycleLock.lock()
-        defer { panicLifecycleLock.unlock() }
-        return _isPanicSuspended ? nil : panicLifecycleGeneration
-    }
-
-    private func isCurrentPanicLifecycleGeneration(_ generation: UInt64) -> Bool {
-        panicLifecycleLock.lock()
-        defer { panicLifecycleLock.unlock() }
-        return !_isPanicSuspended && panicLifecycleGeneration == generation
-    }
-
-    private func initializeBluetoothManagersIfNeeded() {
-        guard shouldInitializeBluetoothManagers,
-              centralManager == nil,
-              peripheralManager == nil,
-              !isPanicSuspended else { return }
-
-        // Initialize BLE on its dedicated delegate queue. On iOS, retain the
-        // restoration identifiers even when construction was deferred by a
-        // pending panic-recovery latch.
+        if initializeBluetoothManagers {
+            // Initialize BLE on background queue to prevent main thread blocking.
             #if os(iOS)
             let centralOptions: [String: Any] = [
-            CBCentralManagerOptionRestoreIdentifierKey:
-                BLEService.centralRestorationID
+                CBCentralManagerOptionRestoreIdentifierKey: BLEService.centralRestorationID
             ]
-        centralManager = CBCentralManager(
-            delegate: self,
-            queue: bleQueue,
-            options: centralOptions
-        )
+            centralManager = CBCentralManager(delegate: self, queue: bleQueue, options: centralOptions)
 
             let peripheralOptions: [String: Any] = [
-            CBPeripheralManagerOptionRestoreIdentifierKey:
-                BLEService.peripheralRestorationID
+                CBPeripheralManagerOptionRestoreIdentifierKey: BLEService.peripheralRestorationID
             ]
-        peripheralManager = CBPeripheralManager(
-            delegate: self,
-            queue: bleQueue,
-            options: peripheralOptions
-        )
+            peripheralManager = CBPeripheralManager(delegate: self, queue: bleQueue, options: peripheralOptions)
             #else
             centralManager = CBCentralManager(delegate: self, queue: bleQueue)
             peripheralManager = CBPeripheralManager(delegate: self, queue: bleQueue)
             #endif
         }
         
+        // Single maintenance timer for all periodic tasks (dispatch-based for
+        // determinism). Only run it when real Bluetooth managers exist.
+        meshBackgroundEnabled = initializeBluetoothManagers
+        startMaintenanceTimer()
+
+        // Publish initial empty state
+        requestPeerDataPublish()
+
+        // Initialize gossip sync manager
+        restartGossipManager()
+    }
+    
     private func restartGossipManager() {
-        guard !isPanicSuspended else { return }
         // Stop existing
         gossipSyncManager?.stop()
         
@@ -481,39 +416,7 @@ final class BLEService: NSObject {
         #endif
     }
 
-    /// Close radio admission before application state starts disappearing.
-    /// CoreBluetooth callbacks consult the same gate and cannot restart scan
-    /// or advertising while the full panic transaction is incomplete.
-    func suspendForPanicReset() {
-        setPanicSuspended(true)
-        gossipSyncManager?.stop()
-        gossipSyncManager = nil
-        // Stop the radio and drain CoreBluetooth's delegate queue first. A
-        // callback may already have passed its initial suspension check; the
-        // bleQueue drain forces its final messageQueue handoff to happen
-        // before the receive barrier below.
-        stopServicesImmediatelyForPanic()
-        // Drain every receive/send submitted by callbacks that finished ahead
-        // of the radio stop. Later callbacks observe the closed lifecycle, and
-        // generation-bound handoffs that raced this barrier reject themselves.
-        messageQueue.sync(flags: .barrier) {}
-        clearEmergencySessionState()
-    }
-
-    /// Reopen the radio only after media deletion and recovery-marker commit.
-    func completePanicReset(restartServices: Bool) {
-        setPanicSuspended(false)
-        guard restartServices else { return }
-        startServices()
-        sendAnnounce(forceSend: true)
-    }
-
-    func resetIdentityForPanic(
-        currentNickname: String,
-        restartServices: Bool = true
-    ) {
-        gossipSyncManager?.stop()
-        gossipSyncManager = nil
+    func resetIdentityForPanic(currentNickname: String) {
         messageQueue.sync(flags: .barrier) {
             pendingNoiseSessionQueues.removeAll()
         }
@@ -557,19 +460,16 @@ final class BLEService: NSObject {
             configureNoiseServiceCallbacks(for: newNoise)
             refreshPeerIdentity()
         }
-        // Keep the transport silent until the application-level transaction
-        // has also removed its media and committed both recovery markers.
-        myNickname = currentNickname
+        restartGossipManager()
+
+        setNickname(currentNickname)
+
         messageDeduplicator.reset()
         messageQueue.async(flags: .barrier) { [weak self] in
             self?.selfBroadcastTracker.removeAll()
         }
         requestPeerDataPublish()
-        if restartServices {
-            restartGossipManager()
         startServices()
-            sendAnnounce(forceSend: true)
-        }
     }
     
     // Ensure this runs on message queue to avoid main thread blocking
@@ -581,7 +481,6 @@ final class BLEService: NSObject {
             }
             return
         }
-        guard !isPanicSuspended else { return }
         
         guard content.count <= maxMessageLength else {
             SecureLogger.error("Message too long: \(content.count) chars", category: .session)
@@ -663,9 +562,7 @@ final class BLEService: NSObject {
     /// `startServices()` — the latter matters after a panic reset, where
     /// `stopServices()` cancels and nils the timer.
     private func startMaintenanceTimer() {
-        guard !isPanicSuspended,
-              meshBackgroundEnabled,
-              maintenanceTimer == nil else { return }
+        guard meshBackgroundEnabled, maintenanceTimer == nil else { return }
         let timer = DispatchSource.makeTimerSource(queue: bleQueue)
         timer.schedule(deadline: .now() + TransportConfig.bleMaintenanceInterval,
                        repeating: TransportConfig.bleMaintenanceInterval,
@@ -678,12 +575,6 @@ final class BLEService: NSObject {
     }
 
     func startServices() {
-        guard let lifecycleGeneration =
-                capturePanicLifecycleGeneration() else { return }
-        initializeBluetoothManagersIfNeeded()
-        if gossipSyncManager == nil {
-            restartGossipManager()
-        }
         // Restart the maintenance timer if a prior stopServices() cancelled it
         // (e.g. the panic flow), otherwise periodic announces, peer reconciliation
         // and cache cleanup would never resume until app restart.
@@ -700,11 +591,7 @@ final class BLEService: NSObject {
         // Send initial announce after services are ready
         // Use longer delay to avoid conflicts with other announces
         messageQueue.asyncAfter(deadline: .now() + TransportConfig.bleInitialAnnounceDelaySeconds) { [weak self] in
-            guard let self,
-                  self.isCurrentPanicLifecycleGeneration(
-                    lifecycleGeneration
-                  ) else { return }
-            self.sendAnnounce(forceSend: true)
+            self?.sendAnnounce(forceSend: true)
         }
     }
     
@@ -773,61 +660,25 @@ final class BLEService: NSObject {
         }
     }
     
-    /// Panic cannot spend its security boundary sending a signed LEAVE or
-    /// pumping the main run loop. Close the radio and timers immediately;
-    /// the identity/session cleanup follows synchronously.
-    private func stopServicesImmediatelyForPanic() {
-        collectionsQueue.sync(flags: .barrier) {
-            pendingNotifications.removeAll()
-        }
-
-        maintenanceTimer?.cancel()
-        maintenanceTimer = nil
-        scanDutyTimer?.cancel()
-        scanDutyTimer = nil
-
-        centralManager?.stopScan()
-        peripheralManager?.stopAdvertising()
-
-        let peripheralsToDisconnect = bleQueue.sync {
-            linkStateStore.peripheralStates
-        }
-        for state in peripheralsToDisconnect {
-            centralManager?.cancelPeripheralConnection(state.peripheral)
-        }
-    }
-    
     func emergencyDisconnectAll() {
         stopServices()
-        clearEmergencySessionState()
-    }
 
-    private func clearEmergencySessionState() {
         // Clear all sessions and peers
-        let cancelled = collectionsQueue.sync(flags: .barrier) {
-            let entries = outboundFragmentTransfers.removeAll().map {
-                (id: $0.id, items: $0.workItems)
-            }
-            let pingTimeouts = pendingMeshPings.values.map(\.timeout)
-            pendingMeshPings.removeAll()
-            meshPingResponseLimiter = SyncResponseRateLimiter(
-                maxResponses: TransportConfig.meshPingInboundMaxPerLink,
-                window: TransportConfig.meshPingInboundWindowSeconds
-            )
+        let cancelledTransfers: [(id: String, items: [DispatchWorkItem])] = collectionsQueue.sync(flags: .barrier) {
+            let entries = outboundFragmentTransfers.removeAll().map { ($0.id, $0.workItems) }
             peerRegistry.removeAll()
             fragmentAssemblyBuffer.removeAll()
             sourceRouteFailures = BLESourceRouteFailureCache()
             // Also clear pending message queues to avoid stale state across sessions
             pendingNoiseSessionQueues.removeAll()
             pendingDirectedRelays.removeAll()
-            return (transfers: entries, pingTimeouts: pingTimeouts)
+            return entries
         }
 
-        for entry in cancelled.transfers {
+        for entry in cancelledTransfers {
             entry.items.forEach { $0.cancel() }
             TransferProgressManager.shared.cancel(id: entry.id)
         }
-        cancelled.pingTimeouts.forEach { $0.cancel() }
 
         // Clear processed messages
         messageDeduplicator.reset()
@@ -1048,7 +899,6 @@ final class BLEService: NSObject {
     func sendFileBroadcast(_ filePacket: BitchatFilePacket, transferId: String) {
         messageQueue.async { [weak self] in
             guard let self = self else { return }
-            guard !self.isPanicSuspended else { return }
             guard let payload = filePacket.encode() else {
                 SecureLogger.error("❌ Failed to encode file packet for broadcast", category: .session)
                 return
@@ -1085,7 +935,6 @@ final class BLEService: NSObject {
     func sendFilePrivate(_ filePacket: BitchatFilePacket, to peerID: PeerID, transferId: String) {
         messageQueue.async { [weak self] in
             guard let self = self else { return }
-            guard !self.isPanicSuspended else { return }
             guard let payload = filePacket.encode() else {
                 SecureLogger.error("❌ Failed to encode file packet for private send", category: .session)
                 return
@@ -1239,7 +1088,6 @@ final class BLEService: NSObject {
     // MARK: - Packet Broadcasting
     
     private func broadcastPacket(_ packet: BitchatPacket, transferId: String? = nil) {
-        guard !isPanicSuspended else { return }
         // Apply route if recipient exists (centralized route application)
         let packetToSend: BitchatPacket
         if let recipientPeerID = PeerID(hexData: packet.recipientID) {
@@ -1321,10 +1169,8 @@ final class BLEService: NSObject {
     }
 
     private func enqueuePendingNotification(data: Data, centrals: [CBCentral]?, context: String, attempt: Int = 0) {
-        guard !isPanicSuspended else { return }
         collectionsQueue.async(flags: .barrier) { [weak self] in
             guard let self = self else { return }
-            guard !self.isPanicSuspended else { return }
             let result = self.pendingNotifications.enqueue(
                 data: data,
                 targets: centrals,
@@ -1425,7 +1271,6 @@ final class BLEService: NSObject {
         requireDirectPeerLink: Bool = false,
         requireNoiseAuthenticatedPeerLink: Bool = false
     ) -> Bool {
-        guard !isPanicSuspended else { return false }
         let ingressRecord = collectionsQueue.sync { ingressLinks.record(for: packet) }
         var excludedPeerLinks = links(to: ingressRecord?.peerID)
         if requireNoiseAuthenticatedPeerLink {
@@ -1576,7 +1421,6 @@ final class BLEService: NSObject {
     }
 
     private func flushDirectedSpool() {
-        guard !isPanicSuspended else { return }
         // Move items out and attempt broadcast; if still no links, they'll be re-spooled
         let toSend = collectionsQueue.sync(flags: .barrier) {
             pendingDirectedRelays.drainUnexpired(
@@ -1620,40 +1464,22 @@ final class BLEService: NSObject {
     }
 
     func collectArchivedPublicMessages(completion: @escaping @MainActor ([ArchivedPublicMessage]) -> Void) {
-        guard let generation = capturePanicLifecycleGeneration() else {
-            return
-        }
         guard let sync = gossipSyncManager else {
-            notifyUI { [weak self] in
-                guard let self,
-                      self.isCurrentPanicLifecycleGeneration(generation) else {
-                    return
-                }
-                completion([])
-            }
+            Task { @MainActor in completion([]) }
             return
         }
         sync.collectPublicMessagePackets { [weak self] packets in
-            guard let self,
-                  self.isCurrentPanicLifecycleGeneration(generation) else {
+            guard let self = self else {
+                Task { @MainActor in completion([]) }
                 return
             }
             // Signature verification and registry lookups run on messageQueue
             // like the live receive path.
             self.messageQueue.async {
-                guard self.isCurrentPanicLifecycleGeneration(generation) else {
-                    return
-                }
                 let decoded = packets
                     .compactMap { self.decodeArchivedPublicMessage($0) }
                     .sorted { $0.timestamp < $1.timestamp }
-                self.notifyUI { [weak self] in
-                    guard let self,
-                          self.isCurrentPanicLifecycleGeneration(generation) else {
-                        return
-                    }
-                    completion(decoded)
-                }
+                Task { @MainActor in completion(decoded) }
             }
         }
     }
@@ -1792,44 +1618,7 @@ final class BLEService: NSObject {
         }
     }
 
-    /// Accept a leave only when the claimed sender proves possession of the
-    /// signing key bound by a verified announce. The persisted identity cache
-    /// keeps delayed/relayed leaves verifiable after the live registry entry
-    /// has aged out.
-    private func handleLeave(_ packet: BitchatPacket, from peerID: PeerID) -> Bool {
-        let registrySigningKey = collectionsQueue.sync {
-            peerRegistry.info(for: peerID)?.signingPublicKey
-        }
-        let verifiedViaRegistry = registrySigningKey.map {
-            noiseService.verifyPacketSignature(packet, publicKey: $0)
-        } ?? false
-        let verifiedViaPersistedIdentity = !verifiedViaRegistry
-            && identityManager.getCryptoIdentitiesByPeerIDPrefix(peerID).contains { identity in
-                PeerID(publicKey: identity.publicKey) == peerID
-                    && identity.signingPublicKey.map {
-                        noiseService.verifyPacketSignature(packet, publicKey: $0)
-                    } == true
-            }
-
-        guard verifiedViaRegistry || verifiedViaPersistedIdentity else {
-            SecureLogger.warning(
-                "🚫 Dropping leave with missing/invalid signature for claimed sender \(peerID.id.prefix(8))…",
-                category: .security
-            )
-            return false
-        }
-
-        // A valid departure retires transport state too; otherwise
-        // canDeliverSecurely could remain true for a peer we just removed.
-        noiseService.clearSession(for: peerID)
-        readLinkState { _ in
-            let departedLinks = noiseAuthenticatedLinkOwners.compactMap { link, owner in
-                owner == peerID ? link : nil
-            }
-            for link in departedLinks {
-                noiseAuthenticatedLinkOwners.removeValue(forKey: link)
-            }
-        }
+    private func handleLeave(_: BitchatPacket, from peerID: PeerID) {
         _ = collectionsQueue.sync(flags: .barrier) {
             // Remove the peer when they leave
             peerRegistry.remove(peerID)
@@ -1846,10 +1635,8 @@ final class BLEService: NSObject {
             self.deliverTransportEvent(.peerDisconnected(peerID))
             self.deliverTransportEvent(.peerListUpdated(currentPeerIDs))
         }
-        return true
     }
     private func sendAnnounce(forceSend: Bool = false) {
-        guard !isPanicSuspended else { return }
         // Throttle announces to prevent flooding
         if !announceThrottle.shouldSend(force: forceSend, now: Date()) {
             return
@@ -2059,13 +1846,6 @@ extension BLEService: CBCentralManagerDelegate {
     #if os(iOS)
     func centralManager(_ central: CBCentralManager, willRestoreState dict: [String: Any]) {
         let restoredPeripherals = (dict[CBCentralManagerRestoredStatePeripheralsKey] as? [CBPeripheral]) ?? []
-        guard !isPanicSuspended else {
-            central.stopScan()
-            restoredPeripherals.forEach {
-                central.cancelPeripheralConnection($0)
-            }
-            return
-        }
         let restoredServices = (dict[CBCentralManagerRestoredStateScanServicesKey] as? [CBUUID]) ?? []
         let restoredOptions = (dict[CBCentralManagerRestoredStateScanOptionsKey] as? [String: Any]) ?? [:]
         let allowDuplicates = restoredOptions[CBCentralManagerScanOptionAllowDuplicatesKey] as? Bool
@@ -2121,10 +1901,6 @@ extension BLEService: CBCentralManagerDelegate {
 
         switch central.state {
         case .poweredOn:
-            guard !isPanicSuspended else {
-                central.stopScan()
-                return
-            }
             // Links restored as connected have no characteristic in the new
             // process; without rediscovery they sit connected-but-unusable
             // until the peer disconnects. Runs here (not willRestoreState)
@@ -2181,8 +1957,7 @@ extension BLEService: CBCentralManagerDelegate {
     }
     
     private func startScanning() {
-        guard !isPanicSuspended,
-              let central = centralManager,
+        guard let central = centralManager,
               central.state == .poweredOn,
               !central.isScanning else { return }
         
@@ -2203,7 +1978,6 @@ extension BLEService: CBCentralManagerDelegate {
     }
     
     func centralManager(_ central: CBCentralManager, didDiscover peripheral: CBPeripheral, advertisementData: [String: Any], rssi RSSI: NSNumber) {
-        guard !isPanicSuspended else { return }
         let peripheralID = peripheral.identifier.uuidString
         let advertisedName = advertisementData[CBAdvertisementDataLocalNameKey] as? String ?? (peripheralID.prefix(6) + "…")
         let isConnectable = (advertisementData[CBAdvertisementDataIsConnectable] as? NSNumber)?.boolValue ?? true
@@ -2245,10 +2019,6 @@ extension BLEService: CBCentralManagerDelegate {
     }
     
     func centralManager(_ central: CBCentralManager, didConnect peripheral: CBPeripheral) {
-        guard !isPanicSuspended else {
-            central.cancelPeripheralConnection(peripheral)
-            return
-        }
         let peripheralID = peripheral.identifier.uuidString
 
         #if os(iOS)
@@ -2399,9 +2169,7 @@ private extension CBPeripheralState {
 
 extension BLEService {
     private func tryConnectFromQueue() {
-        guard !isPanicSuspended,
-              let central = centralManager,
-              central.state == .poweredOn else { return }
+        guard let central = centralManager, central.state == .poweredOn else { return }
 
         let decision = connectionScheduler.nextCandidate(
             connectedOrConnectingCount: linkStateStore.connectedOrConnectingPeripheralCount,
@@ -2427,7 +2195,6 @@ extension BLEService {
         using central: CBCentralManager,
         logPrefix: String
     ) {
-        guard !isPanicSuspended else { return }
         let peripheral = candidate.peripheral
         let peripheralID = candidate.peripheralID
         linkStateStore.beginConnecting(to: peripheral, at: Date())
@@ -2488,28 +2255,6 @@ private extension BLEService {
 #if DEBUG
 // Test-only helper to inject packets into the receive pipeline
 extension BLEService {
-    /// Queues an event through the same MainActor hop as production receive
-    /// handlers so panic-boundary tests can deterministically invalidate it.
-    func _test_emitTransportEvent(_ event: TransportEvent) {
-        emitTransportEvent(event)
-    }
-
-    var _test_isPanicIngressOpen: Bool {
-        capturePanicLifecycleGeneration() != nil
-    }
-
-    /// Models a CoreBluetooth delegate callback without requiring a physical
-    /// peripheral. The callback itself runs on `bleQueue`, exactly where the
-    /// panic radio-stop barrier must linearize it.
-    func _test_handlePacketFromBLEQueue(
-        _ packet: BitchatPacket,
-        fromPeerID: PeerID
-    ) {
-        bleQueue.async { [weak self] in
-            self?.handleReceivedPacket(packet, from: fromPeerID)
-        }
-    }
-
     func _test_handlePacket(_ packet: BitchatPacket, fromPeerID: PeerID, preseedPeer: Bool = true, signingPublicKey: Data? = nil) {
         if preseedPeer {
             // Ensure the synthetic peer is known and marked verified for public-message tests
@@ -2591,12 +2336,6 @@ extension BLEService {
         }
     }
 
-    func _test_isNoiseAuthenticatedCentral(_ centralUUID: String, for peerID: PeerID) -> Bool {
-        bleQueue.sync {
-            noiseAuthenticatedLinkOwners[.central(centralUUID)] == peerID
-        }
-    }
-
     func _test_seedConnectedPeer(_ peerID: PeerID, nickname: String) {
         collectionsQueue.sync(flags: .barrier) {
             peerRegistry.upsert(BLEPeerInfo(
@@ -2637,7 +2376,6 @@ extension BLEService {
 
 extension BLEService: CBPeripheralDelegate {
     func peripheral(_ peripheral: CBPeripheral, didDiscoverServices error: Error?) {
-        guard !isPanicSuspended else { return }
         if let error = error {
             SecureLogger.error("❌ Error discovering services for \(peripheral.name ?? "Unknown"): \(error.localizedDescription)", category: .session)
             // Retry service discovery after a delay
@@ -2664,7 +2402,6 @@ extension BLEService: CBPeripheralDelegate {
     }
     
     func peripheral(_ peripheral: CBPeripheral, didDiscoverCharacteristicsFor service: CBService, error: Error?) {
-        guard !isPanicSuspended else { return }
         if let error = error {
             SecureLogger.error("❌ Error discovering characteristics for \(peripheral.name ?? "Unknown"): \(error.localizedDescription)", category: .session)
             return
@@ -2712,7 +2449,6 @@ extension BLEService: CBPeripheralDelegate {
     }
     
     func peripheral(_ peripheral: CBPeripheral, didUpdateValueFor characteristic: CBCharacteristic, error: Error?) {
-        guard !isPanicSuspended else { return }
         if let error = error {
             SecureLogger.error("❌ Error receiving notification: \(error.localizedDescription)", category: .session)
             return
@@ -2830,7 +2566,6 @@ extension BLEService: CBPeripheralDelegate {
     }
     
     func peripheralIsReady(toSendWriteWithoutResponse peripheral: CBPeripheral) {
-        guard !isPanicSuspended else { return }
         // Resume queued writes for this peripheral - called when canSendWriteWithoutResponse becomes true again
         if logRateLimiter.shouldLog(key: "peripheral-ready:\(peripheral.identifier.uuidString)") {
             SecureLogger.debug("📤 Peripheral \(peripheral.name ?? peripheral.identifier.uuidString.prefix(8).description) ready for more writes", category: .session)
@@ -2839,7 +2574,6 @@ extension BLEService: CBPeripheralDelegate {
     }
     
     func peripheral(_ peripheral: CBPeripheral, didModifyServices invalidatedServices: [CBService]) {
-        guard !isPanicSuspended else { return }
         SecureLogger.warning("⚠️ Services modified for \(peripheral.name ?? peripheral.identifier.uuidString)", category: .session)
 
         let shouldRediscover = BLEService.shouldRediscoverBitChatService(
@@ -2860,7 +2594,6 @@ extension BLEService: CBPeripheralDelegate {
     }
     
     func peripheral(_ peripheral: CBPeripheral, didUpdateNotificationStateFor characteristic: CBCharacteristic, error: Error?) {
-        guard !isPanicSuspended else { return }
         if let error = error {
             SecureLogger.error("❌ Error updating notification state: \(error.localizedDescription)", category: .session)
         } else {
@@ -2884,12 +2617,6 @@ extension BLEService: CBPeripheralManagerDelegate {
 
         switch peripheral.state {
         case .poweredOn:
-            guard !isPanicSuspended else {
-                peripheral.stopAdvertising()
-                peripheral.removeAllServices()
-                characteristic = nil
-                return
-            }
             // Remove all services first to ensure clean state
             peripheral.removeAllServices()
 
@@ -2950,12 +2677,6 @@ extension BLEService: CBPeripheralManagerDelegate {
     
     #if os(iOS)
     func peripheralManager(_ peripheral: CBPeripheralManager, willRestoreState dict: [String: Any]) {
-        guard !isPanicSuspended else {
-            peripheral.stopAdvertising()
-            peripheral.removeAllServices()
-            characteristic = nil
-            return
-        }
         let restoredServices = (dict[CBPeripheralManagerRestoredStateServicesKey] as? [CBMutableService]) ?? []
         let restoredAdvertisement = (dict[CBPeripheralManagerRestoredStateAdvertisementDataKey] as? [String: Any]) ?? [:]
 
@@ -2982,10 +2703,6 @@ extension BLEService: CBPeripheralManagerDelegate {
     #endif
     
     func peripheralManager(_ peripheral: CBPeripheralManager, didAdd service: CBService, error: Error?) {
-        guard !isPanicSuspended else {
-            peripheral.stopAdvertising()
-            return
-        }
         if let error = error {
             SecureLogger.error("❌ Failed to add service: \(error.localizedDescription)", category: .session)
             return
@@ -3001,7 +2718,6 @@ extension BLEService: CBPeripheralManagerDelegate {
     }
     
     func peripheralManager(_ peripheral: CBPeripheralManager, central: CBCentral, didSubscribeTo characteristic: CBCharacteristic) {
-        guard !isPanicSuspended else { return }
         let centralUUID = central.identifier.uuidString
         SecureLogger.debug("📥 Central subscribed: \(centralUUID.prefix(8))…", category: .session)
         linkStateStore.addSubscribedCentral(central)
@@ -3043,7 +2759,7 @@ extension BLEService: CBPeripheralManagerDelegate {
         let removedPeerID = linkStateStore.removeSubscribedCentral(central)
         
         // Ensure we're still advertising for other devices to find us
-        if !isPanicSuspended, peripheral.isAdvertising == false {
+        if peripheral.isAdvertising == false {
             SecureLogger.debug("📡 Restarting advertising after central unsubscribed", category: .session)
             peripheral.startAdvertising(buildAdvertisementData())
         }
@@ -3080,7 +2796,6 @@ extension BLEService: CBPeripheralManagerDelegate {
     }
     
     func peripheralManagerIsReady(toUpdateSubscribers peripheral: CBPeripheralManager) {
-        guard !isPanicSuspended else { return }
         drainPendingNotifications(logPrefix: "✅ Sent")
     }
 
@@ -3141,7 +2856,6 @@ extension BLEService: CBPeripheralManagerDelegate {
         for request in requests {
             peripheral.respond(to: request, withResult: .success)
         }
-        guard !isPanicSuspended else { return }
         
         // Process writes. For long writes, CoreBluetooth may deliver multiple CBATTRequest values with offsets.
         // Combine per-central request values by offset before decoding.
@@ -3251,18 +2965,8 @@ extension BLEService {
     
     /// Notify UI on the MainActor to satisfy Swift concurrency isolation
     private func notifyUI(_ block: @escaping @MainActor () -> Void) {
-        // Capture the panic lifecycle before queueing the MainActor hop. A
-        // receive callback can enqueue UI delivery immediately before panic
-        // clears application state; rechecking here prevents that stale work
-        // from repopulating the wiped conversation store afterward.
-        guard let generation = capturePanicLifecycleGeneration() else {
-            return
-        }
-        Task { @MainActor [weak self] in
-            guard let self,
-                  self.isCurrentPanicLifecycleGeneration(generation) else {
-                return
-            }
+        // Always hop onto the MainActor so calls to @MainActor delegates are safe
+        Task { @MainActor in
             block()
         }
     }
@@ -3427,24 +3131,14 @@ extension BLEService {
     /// The completion fires exactly once on the main actor: with RTT/hops
     /// when the matching pong returns, or nil after the timeout window.
     func sendMeshPing(to peerID: PeerID, completion: @escaping @MainActor (MeshPingResult?) -> Void) {
-        guard let generation = capturePanicLifecycleGeneration() else {
-            return
-        }
         messageQueue.async { [weak self] in
             guard let self,
-                  self.isCurrentPanicLifecycleGeneration(generation),
                   let recipientData = peerID.toShort().routingData,
                   let payload = MeshPingPayload(
                     nonce: Data((0..<MeshPingPayload.nonceLength).map { _ in UInt8.random(in: .min ... .max) }),
                     originTTL: self.messageTTL
                   ) else {
-                self?.notifyUI { [weak self] in
-                    guard let self,
-                          self.isCurrentPanicLifecycleGeneration(generation) else {
-                        return
-                    }
-                    completion(nil)
-                }
+                Task { @MainActor in completion(nil) }
                 return
             }
             let nonce = payload.nonce
@@ -3463,21 +3157,12 @@ extension BLEService {
                     self.pendingMeshPings.removeValue(forKey: nonce)
                 }
                 guard let expired else { return }
-                self.notifyUI { [weak self] in
-                    guard let self,
-                          self.isCurrentPanicLifecycleGeneration(
-                              expired.lifecycleGeneration
-                          ) else {
-                        return
-                    }
-                    expired.completion(nil)
-                }
+                Task { @MainActor in expired.completion(nil) }
             }
             self.collectionsQueue.sync(flags: .barrier) {
                 self.pendingMeshPings[nonce] = PendingMeshPing(
                     peerID: PeerID(hexData: recipientData),
                     sentAt: Date(),
-                    lifecycleGeneration: generation,
                     completion: completion,
                     timeout: timeout
                 )
@@ -3544,15 +3229,7 @@ extension BLEService {
             rttMs: max(0, rttMs),
             hops: MeshPingPayload.hopCount(originTTL: pong.originTTL, receivedTTL: packet.ttl)
         )
-        notifyUI { [weak self] in
-            guard let self,
-                  self.isCurrentPanicLifecycleGeneration(
-                      pending.lifecycleGeneration
-                  ) else {
-                return
-            }
-            pending.completion(result)
-        }
+        Task { @MainActor in pending.completion(result) }
     }
 
     /// Estimated intermediate hops toward `peerID`, BFS over gossiped
@@ -4036,7 +3713,7 @@ extension BLEService {
         let store = courierStore
         let policy = courierDepositPolicy
         let metrics = sfMetrics
-        notifyUI {
+        Task { @MainActor in
             guard let tier = policy(depositorKey, isVerifiedPeer) else {
                 SecureLogger.debug("📦 Courier deposit from \(peerID.id.prefix(8))… rejected (neither favorite nor verified)", category: .session)
                 return
@@ -4116,7 +3793,7 @@ extension BLEService {
             }
         }
         let policy = courierDepositPolicy
-        notifyUI {
+        Task { @MainActor in
             // Same trust gate as deposits: don't hand mail to a peer who
             // would reject it from us.
             guard policy(noiseKey, isVerifiedPeer) != nil else { return }
@@ -4461,7 +4138,6 @@ extension BLEService {
         let uuid = peripheral.identifier.uuidString
         bleQueue.async { [weak self] in
             guard let self = self else { return }
-            guard !self.isPanicSuspended else { return }
             guard let state = self.linkStateStore.state(forPeripheralID: uuid), let ch = state.characteristic else { return }
 
             // Atomically take all pending items from the queue to avoid race conditions
@@ -4552,10 +4228,7 @@ extension BLEService {
         slotReserve: Int = TransportConfig.bleBackgroundPendingConnectSlotReserve
     ) {
         bleQueue.async { [weak self] in
-            guard let self,
-                  !self.isPanicSuspended,
-                  let central = self.centralManager,
-                  central.state == .poweredOn else { return }
+            guard let self, let central = self.centralManager, central.state == .poweredOn else { return }
             let budget = TransportConfig.bleMaxCentralLinks
                 - slotReserve
                 - self.linkStateStore.connectedOrConnectingPeripheralCount
@@ -5008,24 +4681,8 @@ extension BLEService {
     private func handleReceivedPacket(_ packet: BitchatPacket, from peerID: PeerID) {
         // Call directly if already on messageQueue, otherwise dispatch
         if DispatchQueue.getSpecific(key: messageQueueKey) == nil {
-            guard let lifecycleGeneration =
-                    capturePanicLifecycleGeneration() else {
-                return
-            }
-            #if DEBUG
-            _test_beforeReceivePacketHandoff?()
-            #endif
             messageQueue.async { [weak self] in
-                guard let self,
-                      self.isCurrentPanicLifecycleGeneration(
-                          lifecycleGeneration
-                      ) else {
-                    return
-                }
-                #if DEBUG
-                self._test_onReceivePacketHandoff?()
-                #endif
-                self.handleReceivedPacket(packet, from: peerID)
+                self?.handleReceivedPacket(packet, from: peerID)
             }
             return
         }
@@ -5128,9 +4785,7 @@ extension BLEService {
             handleMeshPong(packet, from: senderID)
 
         case .leave:
-            // A forged leave must neither evict the claimed peer nor spread
-            // to downstream nodes.
-            guard handleLeave(packet, from: senderID) else { return }
+            handleLeave(packet, from: senderID)
 
         case .none:
             SecureLogger.warning("⚠️ Unknown message type: \(packet.type)", category: .session)
@@ -5770,11 +5425,9 @@ extension BLEService {
     }
 
     private func handleNoiseHandshake(_ packet: BitchatPacket, from peerID: PeerID) {
-        let result = noisePacketHandler.handleHandshakeWithResult(
-            packet,
-            from: peerID
-        )
-        if result.didEstablishAuthenticatedSession {
+        let wasEstablished = noiseService.hasEstablishedSession(with: peerID)
+        noisePacketHandler.handleHandshake(packet, from: peerID)
+        if !wasEstablished, noiseService.hasEstablishedSession(with: peerID) {
             markNoiseAuthenticatedIngressLink(for: packet, peerID: peerID)
         }
     }
@@ -5797,16 +5450,7 @@ extension BLEService {
             messageTTL: messageTTL,
             now: { Date() },
             processHandshakeMessage: { [weak self] peerID, message in
-                guard let self else {
-                    return NoiseHandshakeProcessingResult(
-                        response: nil,
-                        didEstablishAuthenticatedSession: false
-                    )
-                }
-                return try self.noiseService.processHandshakeMessageWithResult(
-                    from: peerID,
-                    message: message
-                )
+                try self?.noiseService.processHandshakeMessage(from: peerID, message: message)
             },
             hasNoiseSession: { [weak self] peerID in
                 self?.noiseService.hasSession(with: peerID) ?? false
@@ -5882,7 +5526,8 @@ extension BLEService {
         let transportPeers: [TransportPeerSnapshot] = collectionsQueue.sync {
             peerRegistry.transportSnapshots(selfNickname: myNickname)
         }
-        notifyUI { [weak self] in
+        // Notify UI on MainActor via delegate
+        Task { @MainActor [weak self] in
             self?.peerEventsDelegate?.didUpdatePeerSnapshots(transportPeers)
         }
     }
@@ -5890,7 +5535,6 @@ extension BLEService {
     // MARK: Consolidated Maintenance
     
     private func performMaintenance() {
-        guard !isPanicSuspended else { return }
         maintenanceCounter += 1
         lastMaintenanceAt = Date()
 

bitchat/Services/GeohashPresenceService.swift

@@ -45,9 +45,6 @@ final class GeohashPresenceService: ObservableObject {
 
     private var subscriptions = Set<AnyCancellable>()
     private var heartbeatTimer: GeohashPresenceTimerProtocol?
-    private var pendingBroadcastTasks: [UUID: Task<Void, Never>] = [:]
-    private var heartbeatGeneration: UInt64 = 0
-    private var started = false
     private let availableChannelsProvider: () -> [GeohashChannel]
     private let locationChanges: AnyPublisher<[GeohashChannel], Never>
     private let torReadyPublisher: AnyPublisher<Void, Never>
@@ -150,25 +147,10 @@ final class GeohashPresenceService: ObservableObject {
     
     /// Start the service (safe to call multiple times)
     func start() {
-        guard !started else { return }
-        started = true
-        heartbeatGeneration &+= 1
         SecureLogger.info("Presence: service starting...", category: .session)
         scheduleNextHeartbeat()
     }
 
-    /// Stops the timer and every decorrelation task synchronously at the panic
-    /// boundary. Generation checks also protect against custom sleepers that
-    /// ignore task cancellation and return later.
-    func stopForPanic() {
-        started = false
-        heartbeatGeneration &+= 1
-        heartbeatTimer?.invalidate()
-        heartbeatTimer = nil
-        pendingBroadcastTasks.values.forEach { $0.cancel() }
-        pendingBroadcastTasks.removeAll(keepingCapacity: false)
-    }
-
     private func setupObservers() {
         // Monitor location channel changes
         locationChanges
@@ -187,26 +169,20 @@ final class GeohashPresenceService: ObservableObject {
     }
 
     func handleLocationChange() {
-        guard started else { return }
         // 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
-        let generation = heartbeatGeneration
         heartbeatTimer = scheduleTimer(5.0) { [weak self] in
             Task { @MainActor [weak self] in
-                guard let self,
-                      self.started,
-                      self.heartbeatGeneration == generation else { return }
-                self.performHeartbeat()
+                self?.performHeartbeat()
             }
         }
     }
     
     func handleConnectivityChange() {
-        guard started else { return }
         SecureLogger.debug("Presence: connectivity restored, triggering heartbeat", category: .session)
         // If we were waiting for network, do it now
         if heartbeatTimer == nil || !heartbeatTimer!.isValid {
@@ -215,29 +191,18 @@ final class GeohashPresenceService: ObservableObject {
     }
 
     func scheduleNextHeartbeat() {
-        guard started else { return }
         heartbeatTimer?.invalidate()
         let interval = TimeInterval.random(in: loopMinInterval...loopMaxInterval)
-        let generation = heartbeatGeneration
         heartbeatTimer = scheduleTimer(interval) { [weak self] in
             Task { @MainActor [weak self] in
-                guard let self,
-                      self.started,
-                      self.heartbeatGeneration == generation else { return }
-                self.performHeartbeat()
+                self?.performHeartbeat()
             }
         }
     }
 
     func performHeartbeat() {
-        guard started else { return }
-        let generation = heartbeatGeneration
         // Always schedule next loop first ensures continuity even if this one fails/skips
-        defer {
-            if started, heartbeatGeneration == generation {
-                scheduleNextHeartbeat()
-            }
-        }
+        defer { scheduleNextHeartbeat() }
 
         // 1. Check preconditions
         guard torIsReady() else {
@@ -263,27 +228,14 @@ final class GeohashPresenceService: ObservableObject {
             }
             
             // Launch independent task for each channel's delay
-            let taskID = UUID()
-            let sleeper = self.sleeper
-            let delay = TimeInterval.random(
-                in: burstMinDelay...burstMaxDelay
-            )
-            let nanoseconds = UInt64(delay * 1_000_000_000)
-            let task = Task { @MainActor [weak self] in
+            Task { @MainActor in
                 // Random delay for decorrelation
-                await sleeper(nanoseconds)
+                let delay = TimeInterval.random(in: self.burstMinDelay...self.burstMaxDelay)
+                let nanoseconds = UInt64(delay * 1_000_000_000)
+                await self.sleeper(nanoseconds)
                 
-                guard let self else { return }
-                guard !Task.isCancelled,
-                      self.started,
-                      self.heartbeatGeneration == generation else {
-                    self.pendingBroadcastTasks.removeValue(forKey: taskID)
-                    return
-                }
-                self.pendingBroadcastTasks.removeValue(forKey: taskID)
                 self.broadcastPresence(for: channel.geohash)
             }
-            pendingBroadcastTasks[taskID] = task
         }
     }
 

bitchat/Services/KeychainManager.swift

@@ -11,54 +11,6 @@ import BitFoundation
 import Foundation
 import Security
 
-enum KeychainInstallLifecycleAction: Equatable {
-    case markerPresent
-    case bootstrapMarker
-    case clearStaleKeys
-    case retryLater
-}
-
-/// Process-local fail-closed gate for an unresolved install lifecycle.
-///
-/// A blocked caller may perform one synchronous reconciliation attempt.
-/// Concurrent callers fail closed instead of reading while that cleanup is
-/// in flight. Once reconciliation succeeds, access remains open.
-final class KeychainInstallAccessGate: @unchecked Sendable {
-    private let lock = NSLock()
-    private var blocked = false
-    private var reconciliationInProgress = false
-
-    func block() {
-        lock.lock()
-        blocked = true
-        lock.unlock()
-    }
-
-    func allowsAccess(reconcile: () -> Bool) -> Bool {
-        lock.lock()
-        if !blocked {
-            lock.unlock()
-            return true
-        }
-        guard !reconciliationInProgress else {
-            lock.unlock()
-            return false
-        }
-        reconciliationInProgress = true
-        lock.unlock()
-
-        let completed = reconcile()
-
-        lock.lock()
-        if completed {
-            blocked = false
-        }
-        reconciliationInProgress = false
-        lock.unlock()
-        return completed
-    }
-}
-
 final class KeychainManager: KeychainManagerProtocol {
     /// Default keychain for components that construct their own rather than
     /// having one injected. Under test this is an in-memory keychain: the
@@ -89,281 +41,53 @@ final class KeychainManager: KeychainManagerProtocol {
     // Use consistent service name for all keychain items
     private let service = BitchatApp.bundleID
     private let appGroup = "group.\(BitchatApp.bundleID)"
-    #if os(iOS)
-    private let installAccessGate = KeychainInstallAccessGate()
-    #endif
-    /// Every generic-password service owned by this app, including names used
-    /// by older releases. Keep custom services here so one-time security
-    /// migrations and panic deletion cannot silently miss them.
-    private static let additionalApplicationOwnedServices = [
-        "chat.bitchat.nostr",
-        "chat.bitchat.favorites",
-        "chat.bitchat.outbox",
-        "com.bitchat.passwords",
-        "com.bitchat.deviceidentity",
-        "com.bitchat.noise.identity",
-        "chat.bitchat.passwords",
-        "bitchat.keychain",
-        "bitchat",
-        "com.bitchat"
-    ]
+
     // AfterFirstUnlock, not WhenUnlocked: the mesh keeps running with the
     // device locked (identity-cache saves failed with -25308 throughout
     // locked-phone testing), and a wake-on-proximity relaunch via BLE state
     // restoration must be able to read the noise keys before the user
-    // unlocks. ThisDeviceOnly prevents private identities and group keys from
-    // migrating through device backups onto a second device.
-    private static let itemAccessibility = kSecAttrAccessibleAfterFirstUnlockThisDeviceOnly
+    // unlocks. Backup/sync semantics are unchanged (not ThisDeviceOnly).
+    private static let itemAccessibility = kSecAttrAccessibleAfterFirstUnlock
 
     init() {
         #if os(iOS)
-        if reconcileInstallLifecycle() {
         migrateAccessibilityIfNeeded()
-        } else {
-            installAccessGate.block()
-        }
         #endif
     }
 
-    static func installLifecycleAction(
-        containerKnowsMarker: Bool,
-        cleanupPending: Bool = false,
-        markerRead: KeychainReadResult
-    ) -> KeychainInstallLifecycleAction {
-        // Once a reinstall cleanup has started, its container-local latch
-        // must win even if the keychain marker was deleted before a later
-        // keychain operation failed. Otherwise the next launch could mistake
-        // a partial cleanup for a fresh bootstrap and preserve stale secrets.
-        if cleanupPending {
-            return .clearStaleKeys
-        }
-
-        switch markerRead {
-        case .success:
-            return containerKnowsMarker ? .markerPresent : .clearStaleKeys
-        case .itemNotFound:
-            return .bootstrapMarker
-        case .accessDenied, .deviceLocked, .authenticationFailed, .otherError:
-            return .retryLater
-        }
-    }
-
-    static func applicationOwnedKeychainServices(primaryService: String) -> [String] {
-        var seen = Set<String>()
-        return ([primaryService] + additionalApplicationOwnedServices).filter {
-            seen.insert($0).inserted
-        }
-    }
-
-    /// Runs every service update even after one failure. Successful updates
-    /// are idempotent, while returning false keeps the one-time flag unset so
-    /// a later unlocked launch retries the incomplete migration.
-    static func migrateAccessibilityForApplicationOwnedServices(
-        primaryService: String,
-        updateService: (String) -> OSStatus
-    ) -> Bool {
-        var completed = true
-        for serviceName in applicationOwnedKeychainServices(
-            primaryService: primaryService
-        ) {
-            let status = updateService(serviceName)
-            if status != errSecSuccess && status != errSecItemNotFound {
-                completed = false
-            }
-        }
-        return completed
-    }
-
-    /// Deletes every declared service even after one failure. An empty scope
-    /// is already clean, while any other status leaves the cleanup
-    /// incomplete so its durable retry marker remains set.
-    static func deleteApplicationOwnedKeychainServices(
-        primaryService: String,
-        deleteService: (String) -> OSStatus
-    ) -> Bool {
-        var completed = true
-        for serviceName in applicationOwnedKeychainServices(
-            primaryService: primaryService
-        ) {
-            let status = deleteService(serviceName)
-            if status != errSecSuccess && status != errSecItemNotFound {
-                completed = false
-            }
-        }
-        return completed
-    }
-
-    /// The app currently has an application-group entitlement, not a
-    /// keychain-access-group entitlement. Keep the historical group cleanup
-    /// probe as best effort without making its expected -34018 response block
-    /// panic recovery forever.
-    static func completedApplicationGroupDelete(status: OSStatus) -> Bool {
-        status == errSecSuccess
-            || status == errSecItemNotFound
-            || status == -34018
-    }
-
     #if os(iOS)
-
-    private static let installMarkerAccount = "install_lifecycle_marker"
-    private static let installMarkerDefaultsKey = "keychain.installLifecycleMarker.present"
-    private static let installCleanupPendingDefaultsKey =
-        "keychain.installLifecycleCleanup.pending"
-
-    /// Keychain items can survive app removal while the app container and its
-    /// UserDefaults do not. The first version carrying this marker bootstraps
-    /// without deleting existing users' identities. On a later reinstall, a
-    /// surviving keychain marker plus a missing defaults marker proves the app
-    /// container was replaced, so stale secrets are removed before use.
-    @discardableResult
-    private func reconcileInstallLifecycle() -> Bool {
-        let defaults = UserDefaults.standard
-        let containerKnowsMarker = defaults.bool(forKey: Self.installMarkerDefaultsKey)
-        let cleanupPending = defaults.bool(
-            forKey: Self.installCleanupPendingDefaultsKey
-        )
-
-        let markerRead = retrieveDataWithResult(forKey: Self.installMarkerAccount)
-        switch Self.installLifecycleAction(
-            containerKnowsMarker: containerKnowsMarker,
-            cleanupPending: cleanupPending,
-            markerRead: markerRead
-        ) {
-        case .markerPresent:
-            defaults.set(true, forKey: Self.installMarkerDefaultsKey)
-            return true
-
-        case .bootstrapMarker:
-            if case .success = saveDataWithResult(Data([1]), forKey: Self.installMarkerAccount) {
-                defaults.set(true, forKey: Self.installMarkerDefaultsKey)
-            }
-            // A missing marker is the intentional bootstrap path for both a
-            // fresh install and the first marker-carrying upgrade. Preserve
-            // existing users' identities even if marker creation must retry
-            // on a later construction.
-            return true
-
-        case .clearStaleKeys:
-            // Establish a container-local retry latch before deleting the
-            // surviving keychain marker. If the process exits or any keychain
-            // operation fails, the next launch retries even when that marker
-            // can no longer be read.
-            defaults.set(true, forKey: Self.installCleanupPendingDefaultsKey)
-            guard defaults.synchronize(),
-                  defaults.bool(forKey: Self.installCleanupPendingDefaultsKey)
-            else {
-                SecureLogger.error(
-                    "Could not persist reinstall keychain-cleanup intent",
-                    category: .security
-                )
-                return false
-            }
-
-            guard deleteAllKeychainData() else {
-                SecureLogger.error(
-                    "Reinstall keychain cleanup incomplete; retry remains pending",
-                    category: .security
-                )
-                return false
-            }
-
-            defaults.set(true, forKey: Self.installMarkerDefaultsKey)
-            defaults.removeObject(
-                forKey: Self.installCleanupPendingDefaultsKey
-            )
-            guard defaults.synchronize(),
-                  defaults.bool(forKey: Self.installMarkerDefaultsKey),
-                  !defaults.bool(
-                    forKey: Self.installCleanupPendingDefaultsKey
-                  )
-            else {
-                // Preserve the fail-closed state in memory and make one more
-                // best-effort persistence attempt before startup continues.
-                defaults.set(
-                    true,
-                    forKey: Self.installCleanupPendingDefaultsKey
-                )
-                _ = defaults.synchronize()
-                SecureLogger.error(
-                    "Could not commit reinstall keychain-cleanup state; retry remains pending",
-                    category: .security
-                )
-                return false
-            }
-            return true
-
-        case .retryLater:
-            // Do not guess that a temporarily unreadable marker is absent.
-            // An established container may keep using ordinary protected-data
-            // semantics: reads fail while locked and recover after unlock. A
-            // container that has not committed the marker must stay blocked
-            // until the marker becomes readable and this state machine can
-            // distinguish bootstrap from reinstall.
-            return containerKnowsMarker
-        }
-    }
-
     /// One-time upgrade of items created under WhenUnlocked. New saves get
     /// the right class on their own (saves are delete-then-add), but the
     /// long-lived identity keys are written once and would otherwise stay
     /// unreadable while the device is locked.
     private func migrateAccessibilityIfNeeded() {
-        let flag = "keychain.accessibility.afterFirstUnlockThisDeviceOnly.migrated"
+        let flag = "keychain.accessibility.afterFirstUnlock.migrated"
         guard !UserDefaults.standard.bool(forKey: flag) else { return }
 
+        let query: [String: Any] = [
+            kSecClass as String: kSecClassGenericPassword,
+            kSecAttrService as String: service
+        ]
         let update: [String: Any] = [
             kSecAttrAccessible as String: Self.itemAccessibility
         ]
-        let completed = Self.migrateAccessibilityForApplicationOwnedServices(
-            primaryService: service
-        ) { serviceName in
-            let query: [String: Any] = [
-                kSecClass as String: kSecClassGenericPassword,
-                kSecAttrService as String: serviceName
-            ]
-            return SecItemUpdate(
-                query as CFDictionary,
-                update as CFDictionary
-            )
-        }
-        if completed {
-            // Missing services on a fresh install are terminal, but the flag is
-            // set only after every application-owned service was considered.
+        let status = SecItemUpdate(query as CFDictionary, update as CFDictionary)
+        switch status {
+        case errSecSuccess, errSecItemNotFound:
+            // Nothing to migrate on a fresh install; both are terminal.
             UserDefaults.standard.set(true, forKey: flag)
-            SecureLogger.info(
-                "Keychain accessibility migrated to AfterFirstUnlockThisDeviceOnly",
-                category: .keychain
-            )
-        } else {
+            SecureLogger.info("Keychain accessibility migrated to AfterFirstUnlock (status \(status))", category: .keychain)
+        default:
             // Likely errSecInteractionNotAllowed (relaunched while locked) —
             // leave the flag unset so the next launch retries.
-            SecureLogger.warning(
-                "Keychain accessibility migration deferred for at least one application-owned service",
-                category: .keychain
-            )
+            SecureLogger.warning("Keychain accessibility migration deferred (status \(status))", category: .keychain)
         }
     }
     #endif
 
-    private func installAccessAllowed() -> Bool {
-        #if os(iOS)
-        return installAccessGate.allowsAccess { [self] in
-            guard reconcileInstallLifecycle() else { return false }
-            migrateAccessibilityIfNeeded()
-            return true
-        }
-        #else
-        return true
-        #endif
-    }
-
     // MARK: - Identity Keys
     
     func saveIdentityKey(_ keyData: Data, forKey key: String) -> Bool {
-        guard installAccessAllowed() else {
-            SecureLogger.logKeyOperation(.save, keyType: key, success: false)
-            return false
-        }
         let fullKey = "identity_\(key)"
         let result = saveData(keyData, forKey: fullKey)
         SecureLogger.logKeyOperation(.save, keyType: key, success: result)
@@ -371,16 +95,11 @@ final class KeychainManager: KeychainManagerProtocol {
     }
     
     func getIdentityKey(forKey key: String) -> Data? {
-        guard installAccessAllowed() else { return nil }
         let fullKey = "identity_\(key)"
         return retrieveData(forKey: fullKey)
     }
     
     func deleteIdentityKey(forKey key: String) -> Bool {
-        guard installAccessAllowed() else {
-            SecureLogger.logKeyOperation(.delete, keyType: key, success: false)
-            return false
-        }
         let result = delete(forKey: "identity_\(key)")
         SecureLogger.logKeyOperation(.delete, keyType: key, success: result)
         return result
@@ -391,14 +110,12 @@ final class KeychainManager: KeychainManagerProtocol {
     /// Get identity key with detailed result for proper error handling
     /// Distinguishes between missing keys (expected) and critical failures
     func getIdentityKeyWithResult(forKey key: String) -> KeychainReadResult {
-        guard installAccessAllowed() else { return .accessDenied }
         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 {
-        guard installAccessAllowed() else { return .accessDenied }
         let fullKey = "identity_\(key)"
         return saveDataWithResult(keyData, forKey: fullKey)
     }
@@ -669,164 +386,113 @@ final class KeychainManager: KeychainManagerProtocol {
     func deleteAllKeychainData() -> Bool {
         SecureLogger.warning("Panic mode - deleting all keychain data", category: .security)
         
-        let ownedServices = Set(
-            Self.applicationOwnedKeychainServices(
-                primaryService: service
-            )
-        )
-        var enumerationCompleted = true
+        var totalDeleted = 0
+        
+        // Search without service restriction to catch all items
         let searchQuery: [String: Any] = [
             kSecClass as String: kSecClassGenericPassword,
             kSecMatchLimit as String: kSecMatchLimitAll,
             kSecReturnAttributes as String: true
         ]
+        
         var result: AnyObject?
-        let searchStatus = SecItemCopyMatching(
-            searchQuery as CFDictionary,
-            &result
-        )
-        switch searchStatus {
-        case errSecSuccess:
-            guard let items = result as? [[String: Any]] else {
-                enumerationCompleted = false
-                SecureLogger.error(
-                    "Unable to decode application-owned keychain inventory",
-                    category: .security
-                )
-                break
-            }
+        let searchStatus = SecItemCopyMatching(searchQuery as CFDictionary, &result)
         
-            // Preserve the access-group sweep for custom services that are
-            // not yet in the declared legacy-service list.
+        if searchStatus == errSecSuccess, let items = result as? [[String: Any]] {
             for item in items {
-                let account =
-                    item[kSecAttrAccount as String] as? String ?? ""
-                let itemService =
-                    item[kSecAttrService as String] as? String ?? ""
-                let accessGroup =
-                    item[kSecAttrAccessGroup as String] as? String
-                guard accessGroup == appGroup
-                        || ownedServices.contains(itemService)
-                else {
-                    continue
+                var shouldDelete = false
+                let account = item[kSecAttrAccount as String] as? String ?? ""
+                let service = item[kSecAttrService as String] as? String ?? ""
+                let accessGroup = item[kSecAttrAccessGroup as String] as? String
+                
+                // More precise deletion criteria:
+                // 1. Check for our specific app group
+                // 2. OR check for our exact service name
+                // 3. OR check for known legacy service names
+                if accessGroup == appGroup {
+                    shouldDelete = true
+                } else if service == self.service {
+                    shouldDelete = true
+                } else if [
+                    "com.bitchat.passwords",
+                    "com.bitchat.deviceidentity",
+                    "com.bitchat.noise.identity",
+                    "chat.bitchat.passwords",
+                    "bitchat.keychain",
+                    "bitchat",
+                    "com.bitchat"
+                ].contains(service) {
+                    shouldDelete = true
                 }
                 
+                if shouldDelete {
+                    // Build delete query with all available attributes for precise deletion
                     var deleteQuery: [String: Any] = [
                         kSecClass as String: kSecClassGenericPassword
                     ]
+                    
                     if !account.isEmpty {
                         deleteQuery[kSecAttrAccount as String] = account
                     }
-                if !itemService.isEmpty {
-                    deleteQuery[kSecAttrService as String] = itemService
+                    if !service.isEmpty {
+                        deleteQuery[kSecAttrService as String] = service
                     }
-                if let accessGroup,
-                   !accessGroup.isEmpty,
-                   accessGroup != "test" {
+                    
+                    // Add access group if present
+                    if let accessGroup = item[kSecAttrAccessGroup as String] as? String,
+                       !accessGroup.isEmpty && accessGroup != "test" {
                         deleteQuery[kSecAttrAccessGroup as String] = accessGroup
                     }
                     
-                let status = SecItemDelete(deleteQuery as CFDictionary)
-                if status != errSecSuccess && status != errSecItemNotFound {
-                    enumerationCompleted = false
-                    SecureLogger.error(
-                        NSError(domain: "Keychain", code: Int(status)),
-                        context: "Unable to delete enumerated application-owned keychain item",
-                        category: .keychain
-                    )
+                    let deleteStatus = SecItemDelete(deleteQuery as CFDictionary)
+                    if deleteStatus == errSecSuccess {
+                        totalDeleted += 1
+                        SecureLogger.info("Deleted keychain item: \(account) from \(service)", category: .keychain)
+                    }
+                }
             }
         }
         
-        case errSecItemNotFound:
-            break
+        // Also try to delete by known service names and app group
+        // This catches any items that might have been missed above
+        let knownServices = [
+            self.service,  // Current service name
+            "com.bitchat.passwords",
+            "com.bitchat.deviceidentity", 
+            "com.bitchat.noise.identity",
+            "chat.bitchat.passwords",
+            "chat.bitchat.nostr",
+            "bitchat.keychain",
+            "bitchat",
+            "com.bitchat"
+        ]
         
-        default:
-            enumerationCompleted = false
-            SecureLogger.error(
-                NSError(domain: "Keychain", code: Int(searchStatus)),
-                context: "Unable to enumerate application-owned keychain items",
-                category: .keychain
-            )
-        }
-
-        // Bulk deletion by every application-owned service is authoritative
-        // and idempotent. It also verifies that every known service scope is
-        // empty even when the inventory pass found no items.
-        let servicesCompleted =
-            Self.deleteApplicationOwnedKeychainServices(
-                primaryService: service
-            ) { serviceName in
+        for serviceName in knownServices {
             let query: [String: Any] = [
                 kSecClass as String: kSecClassGenericPassword,
                 kSecAttrService as String: serviceName
             ]
+            
             let status = SecItemDelete(query as CFDictionary)
-                if status != errSecSuccess && status != errSecItemNotFound {
-                    SecureLogger.error(
-                        NSError(domain: "Keychain", code: Int(status)),
-                        context: "Unable to delete application-owned keychain service \(serviceName)",
-                        category: .keychain
-                    )
+            if status == errSecSuccess {
+                totalDeleted += 1
             }
-                return status
         }
         
-        // Historical builds attempted this application-group identifier as a
-        // keychain access group. It is not currently entitled, so -34018
-        // means the scope is inapplicable rather than partially deleted.
+        // Also delete by app group to ensure complete cleanup
         let groupQuery: [String: Any] = [
             kSecClass as String: kSecClassGenericPassword,
             kSecAttrAccessGroup as String: appGroup
         ]
+        
         let groupStatus = SecItemDelete(groupQuery as CFDictionary)
-        let groupCompleted = Self.completedApplicationGroupDelete(
-            status: groupStatus
-        )
-        if !groupCompleted {
-            SecureLogger.error(
-                NSError(domain: "Keychain", code: Int(groupStatus)),
-                context: "Unable to delete historical application-group keychain items",
-                category: .keychain
-            )
+        if groupStatus == errSecSuccess {
+            totalDeleted += 1
         }
         
-        var markerCompleted = true
-        #if os(iOS)
-        // The non-secret marker is intentionally recreated after a panic so a
-        // later uninstall/reinstall can still be distinguished from an in-place
-        // upgrade. Do not commit the container-side marker here: reinstall
-        // reconciliation may still need to retry an incomplete cleanup.
-        if case .success = saveDataWithResult(
-            Data([1]),
-            forKey: Self.installMarkerAccount
-        ) {
-            markerCompleted = true
-        } else {
-            markerCompleted = false
-            SecureLogger.error(
-                "Unable to restore install-lifecycle keychain marker",
-                category: .security
-            )
-        }
-        #endif
+        SecureLogger.warning("Panic mode cleanup completed. Total items deleted: \(totalDeleted)", category: .keychain)
         
-        let completed =
-            enumerationCompleted
-            && servicesCompleted
-            && groupCompleted
-            && markerCompleted
-        if completed {
-            SecureLogger.warning(
-                "Panic mode keychain cleanup completed",
-                category: .keychain
-            )
-        } else {
-            SecureLogger.error(
-                "Panic mode keychain cleanup incomplete",
-                category: .security
-            )
-        }
-        return completed
+        return totalDeleted > 0
     }
     
     // MARK: - Security Utilities
@@ -852,7 +518,6 @@ final class KeychainManager: KeychainManagerProtocol {
     // MARK: - Debug
 
     func verifyIdentityKeyExists() -> Bool {
-        guard installAccessAllowed() else { return false }
         let key = "identity_noiseStaticKey"
         return retrieveData(forKey: key) != nil
     }
@@ -861,40 +526,18 @@ final class KeychainManager: KeychainManagerProtocol {
 
     /// Save data with a custom service name
     func save(key: String, data: Data, service customService: String, accessible: CFString?) {
-        guard installAccessAllowed() else { return }
-        let primaryKeyQuery: [String: Any] = [
+        var query: [String: Any] = [
             kSecClass as String: kSecClassGenericPassword,
             kSecAttrService as String: customService,
-            kSecAttrAccount as String: key
+            kSecAttrAccount as String: key,
+            kSecValueData as String: data
         ]
-        var addQuery = primaryKeyQuery
-        addQuery.merge([
-            kSecValueData as String: data,
-            kSecAttrAccessible as String: accessible ?? Self.itemAccessibility,
-            kSecAttrSynchronizable as String: false
-        ]) { _, new in new }
+        if let accessible = accessible {
+            query[kSecAttrAccessible as String] = accessible
+        }
 
-        // Delete by the item's primary key only. Value/accessibility fields
-        // are add attributes, not valid selectors for replacing an existing
-        // item; including them can leave the old item in place and make the
-        // subsequent add fail as a duplicate.
-        let deleteStatus = SecItemDelete(primaryKeyQuery as CFDictionary)
-        guard deleteStatus == errSecSuccess || deleteStatus == errSecItemNotFound else {
-            SecureLogger.error(
-                NSError(domain: "Keychain", code: Int(deleteStatus)),
-                context: "Unable to replace custom-service keychain item",
-                category: .keychain
-            )
-            return
-        }
-        let addStatus = SecItemAdd(addQuery as CFDictionary, nil)
-        if addStatus != errSecSuccess {
-            SecureLogger.error(
-                NSError(domain: "Keychain", code: Int(addStatus)),
-                context: "Unable to save custom-service keychain item",
-                category: .keychain
-            )
-        }
+        SecItemDelete(query as CFDictionary)
+        SecItemAdd(query as CFDictionary, nil)
     }
 
     /// Load data from a custom service
@@ -908,7 +551,6 @@ final class KeychainManager: KeychainManagerProtocol {
     /// Load custom-service data without collapsing `itemNotFound` and
     /// protected-data/keychain failures into the same nil result.
     func loadWithResult(key: String, service customService: String) -> KeychainReadResult {
-        guard installAccessAllowed() else { return .accessDenied }
         let query: [String: Any] = [
             kSecClass as String: kSecClassGenericPassword,
             kSecAttrService as String: customService,
@@ -923,7 +565,6 @@ final class KeychainManager: KeychainManagerProtocol {
 
     /// Delete data from a custom service
     func delete(key: String, service customService: String) {
-        guard installAccessAllowed() else { return }
         let query: [String: Any] = [
             kSecClass as String: kSecClassGenericPassword,
             kSecAttrService as String: customService,
@@ -935,7 +576,6 @@ final class KeychainManager: KeychainManagerProtocol {
 
     /// Delete every item stored under a custom service
     func deleteAll(service customService: String) {
-        guard installAccessAllowed() else { return }
         let query: [String: Any] = [
             kSecClass as String: kSecClassGenericPassword,
             kSecAttrService as String: customService,

bitchat/Services/MessageFormattingEngine.swift

@@ -251,9 +251,9 @@ final class MessageFormattingEngine {
         isSelf: Bool,
         isMentioned: Bool
     ) -> AttributedString {
-        // For very long content, use plain formatting to avoid expensive
-        // regex/detector work. Cashu presence must not disable this guard.
-        if content.isOversizedForRichFormatting() {
+        // For very long content without special tokens, use plain formatting
+        let containsCashu = containsCashuToken(content)
+        if (content.count > 4000 || content.hasVeryLongToken(threshold: 1024)) && !containsCashu {
             return formatPlainContent(content, baseColor: baseColor, isSelf: isSelf)
         }
 

bitchat/Services/NetworkActivationService.swift

@@ -154,19 +154,6 @@ final class NetworkActivationService: ObservableObject {
             .store(in: &cancellables)
     }
 
-    /// Stops all internet-facing work at the synchronous panic boundary.
-    /// `start()` may be called again only after the full wipe commits.
-    func stopForPanic() {
-        cancellables.removeAll()
-        started = false
-        reachabilityMonitor.stop()
-        activationAllowed = false
-        torAutoStartDesired = false
-        relayController.disconnect()
-        torController.setAutoStartAllowed(false)
-        applyTorState(torDesired: false)
-    }
-
     func setUserTorEnabled(_ enabled: Bool) {
         guard enabled != userTorEnabled else { return }
         userTorEnabled = enabled
@@ -180,7 +167,6 @@ final class NetworkActivationService: ObservableObject {
     }
 
     private func reevaluate() {
-        guard started else { return }
         let allowed = effectiveAllowed()
         let torDesired = allowed && userTorEnabled
         let statusChanged = allowed != activationAllowed

bitchat/Services/NetworkReachabilityMonitor.swift

@@ -27,8 +27,6 @@ protocol NetworkReachabilityMonitoring: AnyObject {
     var reachabilityPublisher: AnyPublisher<Bool, Never> { get }
     /// Begin monitoring. Idempotent.
     func start()
-    /// Stop monitoring and discard pending debounce work. Idempotent.
-    func stop()
 }
 
 /// Pure debounce/decision logic for reachability, split out so it can be
@@ -90,6 +88,18 @@ struct ReachabilityDebounce {
     }
 }
 
+/// Always-reachable stub. Used as the default in tests and as the fallback on
+/// platforms without the Network framework, so reachability never suppresses
+/// startup by itself.
+@MainActor
+final class AlwaysReachableMonitor: NetworkReachabilityMonitoring {
+    var isReachable: Bool { true }
+    var reachabilityPublisher: AnyPublisher<Bool, Never> {
+        Empty(completeImmediately: false).eraseToAnyPublisher()
+    }
+    func start() {}
+}
+
 /// `NWPathMonitor`-backed reachability. All state lives on the main actor; the
 /// background path callback hops here before touching the debounce.
 @MainActor
@@ -136,18 +146,6 @@ final class NWPathReachabilityMonitor: NetworkReachabilityMonitoring {
         #endif
     }
 
-    func stop() {
-        guard started else { return }
-        started = false
-        flushWorkItem?.cancel()
-        flushWorkItem = nil
-        #if canImport(Network)
-        monitor?.pathUpdateHandler = nil
-        monitor?.cancel()
-        monitor = nil
-        #endif
-    }
-
     /// Feed an observation into the debounce and publish committed changes.
     /// Exposed internally so higher layers/tests could drive it if needed.
     func ingest(reachable: Bool) {

bitchat/Services/NoiseEncryptionService.swift

@@ -664,18 +664,6 @@ final class NoiseEncryptionService {
     
     /// Process an incoming handshake message
     func processHandshakeMessage(from peerID: PeerID, message: Data) throws -> Data? {
-        try processHandshakeMessageWithResult(
-            from: peerID,
-            message: message
-        ).response
-    }
-
-    /// Process an incoming handshake message and report whether the exact
-    /// session that consumed it completed authenticated establishment.
-    func processHandshakeMessageWithResult(
-        from peerID: PeerID,
-        message: Data
-    ) throws -> NoiseHandshakeProcessingResult {
         
         // Validate peer ID
         guard peerID.isValid else {
@@ -697,14 +685,11 @@ final class NoiseEncryptionService {
         
         // For handshakes, we process the raw data directly without NoiseMessage wrapper
         // The Noise protocol handles its own message format
-        let result = try sessionManager.handleIncomingHandshakeWithResult(
-            from: peerID,
-            message: message
-        )
+        let responsePayload = try sessionManager.handleIncomingHandshake(from: peerID, message: message)
         
         
         // Return raw response without wrapper
-        return result
+        return responsePayload
     }
     
     /// Check if we have an established session with a peer

bitchat/Services/TransportConfig.swift

@@ -46,7 +46,6 @@ enum TransportConfig {
     static let privateChatCap: Int = 1337
     static let meshTimelineCap: Int = 1337
     static let geoTimelineCap: Int = 1337
-    static let geoNicknameParticipantsCap: Int = 1337
     static let contentLRUCap: Int = 2000
     static let geoSamplingEventLRUCap: Int = 2000
 
@@ -82,11 +81,6 @@ enum TransportConfig {
     static let nostrDuplicateEventLogInterval: Int = 50
     // Sample interval for per-event debug logs on the inbound hot path.
     static let nostrInboundEventLogInterval: Int = 100
-    // Reject oversized/untrusted relay frames before JSON parse / store.
-    static let nostrMaxInboundMessageBytes: Int = 256 * 1024
-    static let nostrMaxEventTags: Int = 64
-    static let nostrMaxEventTagValues: Int = 16
-    static let nostrMaxEventTagValueBytes: Int = 1024
 
     // Conversation store diagnostics (field observability)
     // Sample interval for the periodic store-audit "OK" heartbeat line
@@ -104,16 +98,11 @@ enum TransportConfig {
     static let uiSenderRateBucketRefillPerSec: Double = 1.0
     static let uiContentRateBucketCapacity: Double = 3
     static let uiContentRateBucketRefillPerSec: Double = 0.5
-    // Bound attacker-keyed bucket maps (sender IDs / content digests).
-    static let uiSenderRateBucketMaxEntries: Int = 2000
-    static let uiContentRateBucketMaxEntries: Int = 2000
-    static let uiRateBucketIdleTTL: TimeInterval = 10 * 60
-    // Cap teleported-participant markers so remote events cannot grow the set.
-    static let geoTeleportedParticipantsCap: Int = 1337
 
     // UI sleeps/delays
     static let uiStartupInitialDelaySeconds: TimeInterval = 1.0
     static let uiStartupPhaseDurationSeconds: TimeInterval = 2.0
+    static let uiAsyncShortSleepNs: UInt64 = 100_000_000
     static let uiReadReceiptRetryShortSeconds: TimeInterval = 0.1
     static let uiReadReceiptRetryLongSeconds: TimeInterval = 0.5
     static let uiBatchDispatchStaggerSeconds: TimeInterval = 0.15

bitchat/Utils/AppLanguageSettings.swift

@@ -1,40 +0,0 @@
-import Foundation
-
-/// In-app override for the UI language, on top of the system per-app
-/// language. Apple resolves localization from the AppleLanguages default at
-/// process start, so a new choice takes effect on the next launch — callers
-/// surface a "restart to apply" note after changing it.
-enum AppLanguageSettings {
-    /// "" means no override: follow the device (or per-app system) language.
-    static let overrideKey = "app.languageOverride"
-    private static let appleLanguagesKey = "AppleLanguages"
-
-    /// Language codes the app ships translations for, straight from the
-    /// built bundle so this never drifts from the string catalog.
-    static var availableLanguages: [String] {
-        Bundle.main.localizations
-            .filter { $0 != "Base" }
-            .sorted { endonym(for: $0).localizedCaseInsensitiveCompare(endonym(for: $1)) == .orderedAscending }
-    }
-
-    /// The language's name in that language ("فارسی", "한국어") so every user
-    /// can find their own entry regardless of the current UI language.
-    static func endonym(for code: String) -> String {
-        let locale = Locale(identifier: code)
-        let name = locale.localizedString(forIdentifier: code) ?? code
-        return name.lowercased(with: locale)
-    }
-
-    /// Persists the override (nil clears it). AppleLanguages drives the
-    /// actual localization lookup on next launch.
-    static func setOverride(_ code: String?) {
-        let defaults = UserDefaults.standard
-        if let code, !code.isEmpty {
-            defaults.set(code, forKey: overrideKey)
-            defaults.set([code], forKey: appleLanguagesKey)
-        } else {
-            defaults.removeObject(forKey: overrideKey)
-            defaults.removeObject(forKey: appleLanguagesKey)
-        }
-    }
-}

bitchat/ViewModels/ChatLiveVoiceCoordinator.swift

@@ -226,21 +226,6 @@ final class ChatLiveVoiceCoordinator {
         assemblies.values.contains { $0.messageID == message.id }
     }
 
-    /// Stop every live file handle/player before the panic media directory is
-    /// removed. This prevents an in-flight assembly from continuing to write
-    /// through an unlinked file after the wipe returns.
-    func resetForPanic() {
-        for assembly in Array(assemblies.values) {
-            cancelAssembly(assembly)
-        }
-        for player in drainingPlayers.values {
-            player.stop()
-        }
-        drainingPlayers.removeAll(keepingCapacity: false)
-        finishedBursts.removeAll(keepingCapacity: false)
-        updatePublicTalkerIndicator()
-    }
-
     /// Called for every inbound private message: when it is the finalized
     /// voice note of a burst we assembled (matched by burst ID in the file
     /// name), swap it into the existing live bubble and report `true` so the

bitchat/ViewModels/ChatMediaTransferCoordinator.swift

@@ -72,79 +72,15 @@ extension ChatViewModel: ChatMediaTransferContext {
     }
 }
 
-/// Synchronous boundary between detached image writers and panic deletion.
-///
-/// Invalidation closes admission before waiting for writers that already
-/// entered. Those writers never need the main actor while inside the boundary,
-/// so a synchronous panic transaction can safely join them and then delete
-/// every output before reporting completion.
-private final class ImagePreparationBarrier: @unchecked Sendable {
-    private let condition = NSCondition()
-    private var generation: UInt64 = 0
-    private var activeOperations = 0
-
-    var currentGeneration: UInt64 {
-        condition.lock()
-        defer { condition.unlock() }
-        return generation
-    }
-
-    func isCurrent(_ candidate: UInt64) -> Bool {
-        condition.lock()
-        defer { condition.unlock() }
-        return generation == candidate
-    }
-
-    func performIfCurrent<T>(
-        generation candidate: UInt64,
-        operation: () throws -> T
-    ) rethrows -> T? {
-        condition.lock()
-        guard generation == candidate else {
-            condition.unlock()
-            return nil
-        }
-        activeOperations += 1
-        condition.unlock()
-
-        defer {
-            condition.lock()
-            activeOperations -= 1
-            if activeOperations == 0 {
-                condition.broadcast()
-            }
-            condition.unlock()
-        }
-        return try operation()
-    }
-
-    func invalidateAndWait() {
-        condition.lock()
-        generation &+= 1
-        while activeOperations > 0 {
-            condition.wait()
-        }
-        condition.unlock()
-    }
-}
-
 @MainActor
 final class ChatMediaTransferCoordinator {
     private unowned let context: any ChatMediaTransferContext
-    private let prepareImagePacket: @Sendable (URL) throws -> ChatPreparedImage
-    private let imagePreparationBarrier = ImagePreparationBarrier()
 
     private(set) var transferIdToMessageIDs: [String: [String]] = [:]
     private(set) var messageIDToTransferId: [String: String] = [:]
 
-    init(
-        context: any ChatMediaTransferContext,
-        prepareImagePacket: @escaping @Sendable (URL) throws -> ChatPreparedImage = {
-            try ChatMediaPreparation.prepareImagePacket(from: $0)
-        }
-    ) {
+    init(context: any ChatMediaTransferContext) {
         self.context = context
-        self.prepareImagePacket = prepareImagePacket
     }
 
     func sendVoiceNote(at url: URL) {
@@ -162,17 +98,13 @@ final class ChatMediaTransferCoordinator {
         )
         let messageID = message.id
         let transferId = makeTransferID(messageID: messageID)
-        let generation = imagePreparationBarrier.currentGeneration
 
         Task.detached(priority: .userInitiated) { [weak self] in
             do {
                 let packet = try ChatMediaPreparation.prepareVoiceNotePacket(at: url)
 
                 await MainActor.run { [weak self] in
-                    guard let self,
-                          self.imagePreparationBarrier.isCurrent(generation) else {
-                        return
-                    }
+                    guard let self else { return }
                     self.registerTransfer(transferId: transferId, messageID: messageID)
                     if let peerID = targetPeer {
                         self.context.sendFilePrivate(packet, to: peerID, transferId: transferId)
@@ -184,19 +116,13 @@ final class ChatMediaTransferCoordinator {
                 SecureLogger.warning("Voice note exceeds size limit (\(size) bytes)", category: .session)
                 try? FileManager.default.removeItem(at: url)
                 await MainActor.run { [weak self] in
-                    guard let self,
-                          self.imagePreparationBarrier.isCurrent(generation) else {
-                        return
-                    }
+                    guard let self else { return }
                     self.handleMediaSendFailure(messageID: messageID, reason: String(localized: "content.delivery.reason.voice_too_large", comment: "Failure reason shown when a voice note exceeds the size limit"))
                 }
             } catch {
                 SecureLogger.error("Voice note send failed: \(error)", category: .session)
                 await MainActor.run { [weak self] in
-                    guard let self,
-                          self.imagePreparationBarrier.isCurrent(generation) else {
-                        return
-                    }
+                    guard let self else { return }
                     self.handleMediaSendFailure(messageID: messageID, reason: String(localized: "content.delivery.reason.voice_send_failed", comment: "Failure reason shown when a voice note could not be sent"))
                 }
             }
@@ -206,24 +132,11 @@ final class ChatMediaTransferCoordinator {
     #if os(iOS)
     func processThenSendImage(_ image: UIImage?) {
         guard let image else { return }
-        let generation = imagePreparationBarrier.currentGeneration
-        let barrier = imagePreparationBarrier
-        Task.detached(priority: .userInitiated) { [weak self, barrier] in
+        Task.detached { [weak self] in
             do {
-                guard let processedURL = try barrier.performIfCurrent(
-                    generation: generation,
-                    operation: {
-                        try ImageUtils.processImage(image)
-                    }
-                ) else {
-                    return
-                }
-                await MainActor.run { [weak self, barrier] in
-                    guard let self,
-                          barrier.isCurrent(generation) else {
-                        try? FileManager.default.removeItem(at: processedURL)
-                        return
-                    }
+                let processedURL = try ImageUtils.processImage(image)
+                await MainActor.run { [weak self] in
+                    guard let self else { return }
                     self.sendImage(from: processedURL)
                 }
             } catch {
@@ -234,24 +147,11 @@ final class ChatMediaTransferCoordinator {
     #elseif os(macOS)
     func processThenSendImage(from url: URL?) {
         guard let url else { return }
-        let generation = imagePreparationBarrier.currentGeneration
-        let barrier = imagePreparationBarrier
-        Task.detached(priority: .userInitiated) { [weak self, barrier] in
+        Task.detached { [weak self] in
             do {
-                guard let processedURL = try barrier.performIfCurrent(
-                    generation: generation,
-                    operation: {
-                        try ImageUtils.processImage(at: url)
-                    }
-                ) else {
-                    return
-                }
-                await MainActor.run { [weak self, barrier] in
-                    guard let self,
-                          barrier.isCurrent(generation) else {
-                        try? FileManager.default.removeItem(at: processedURL)
-                        return
-                    }
+                let processedURL = try ImageUtils.processImage(at: url)
+                await MainActor.run { [weak self] in
+                    guard let self else { return }
                     self.sendImage(from: processedURL)
                 }
             } catch {
@@ -270,7 +170,6 @@ final class ChatMediaTransferCoordinator {
         }
 
         let targetPeer = context.selectedPrivateChatPeer
-        let generation = imagePreparationBarrier.currentGeneration
 
         do {
             try ImageUtils.validateImageSource(at: sourceURL)
@@ -280,25 +179,12 @@ final class ChatMediaTransferCoordinator {
             return
         }
 
-        let prepareImagePacket = self.prepareImagePacket
-        let barrier = imagePreparationBarrier
-        Task.detached(priority: .userInitiated) { [weak self, barrier] in
+        Task.detached(priority: .userInitiated) { [weak self] in
             do {
-                guard let prepared = try barrier.performIfCurrent(
-                    generation: generation,
-                    operation: {
-                        try prepareImagePacket(sourceURL)
-                    }
-                ) else {
-                    return
-                }
+                let prepared = try ChatMediaPreparation.prepareImagePacket(from: sourceURL)
 
-                await MainActor.run { [weak self, barrier] in
-                    guard let self,
-                          barrier.isCurrent(generation) else {
-                        try? FileManager.default.removeItem(at: prepared.outputURL)
-                        return
-                    }
+                await MainActor.run { [weak self] in
+                    guard let self else { return }
                     let message = self.enqueueMediaMessage(
                         content: "\(MimeType.Category.image.messagePrefix)\(prepared.outputURL.lastPathComponent)",
                         targetPeer: targetPeer
@@ -314,20 +200,14 @@ final class ChatMediaTransferCoordinator {
                 }
             } catch ChatMediaPreparationError.imageTooLarge(let size) {
                 SecureLogger.warning("Processed image exceeds size limit (\(size) bytes)", category: .session)
-                await MainActor.run { [weak self, barrier] in
-                    guard let self,
-                          barrier.isCurrent(generation) else {
-                        return
-                    }
+                await MainActor.run { [weak self] in
+                    guard let self else { return }
                     self.context.addSystemMessage("Image is too large to send.")
                 }
             } catch {
                 SecureLogger.error("Image send preparation failed: \(error)", category: .session)
-                await MainActor.run { [weak self, barrier] in
-                    guard let self,
-                          barrier.isCurrent(generation) else {
-                        return
-                    }
+                await MainActor.run { [weak self] in
+                    guard let self else { return }
                     self.context.addSystemMessage("Failed to prepare image for sending.")
                 }
             }
@@ -461,20 +341,6 @@ final class ChatMediaTransferCoordinator {
         clearTransferMapping(for: messageID)
         context.removeMessage(withID: messageID, cleanupFile: true)
     }
-
-    /// Invalidates detached preparation work and cancels every transfer that
-    /// reached the transport. Closing image-preparation admission and joining
-    /// active synchronous writers ensures the following panic media deletion
-    /// is the last filesystem mutation before the transaction can complete.
-    func resetForPanic() {
-        imagePreparationBarrier.invalidateAndWait()
-        let transferIDs = Set(transferIdToMessageIDs.keys)
-        transferIdToMessageIDs.removeAll(keepingCapacity: false)
-        messageIDToTransferId.removeAll(keepingCapacity: false)
-        for transferID in transferIDs {
-            context.cancelTransfer(transferID)
-        }
-    }
 }
 
 private extension ChatMediaTransferCoordinator {

bitchat/ViewModels/ChatMessageFormatter.swift

@@ -71,8 +71,12 @@ final class ChatMessageFormatter {
             let content = message.content
             let nsContent = content as NSString
             let nsLen = nsContent.length
+            let containsCashuEarly: Bool = {
+                let regex = Patterns.quickCashuPresence
+                return regex.numberOfMatches(in: content, options: [], range: NSRange(location: 0, length: nsLen)) > 0
+            }()
 
-            if content.isOversizedForRichFormatting() {
+            if (content.count > 4000 || content.hasVeryLongToken(threshold: 1024)) && !containsCashuEarly {
                 var plainStyle = AttributeContainer()
                 plainStyle.foregroundColor = baseColor
                 plainStyle.font = isSelf

bitchat/ViewModels/ChatViewModel.swift

@@ -89,26 +89,6 @@ import UIKit
 #endif
 import UniformTypeIdentifiers
 
-struct PanicNetworkLifecycle {
-    let stop: @MainActor () -> Void
-    let restart: @MainActor () -> Void
-
-    static let noop = PanicNetworkLifecycle(stop: {}, restart: {})
-
-    static var live: PanicNetworkLifecycle {
-        PanicNetworkLifecycle(
-            stop: {
-                GeohashPresenceService.shared.stopForPanic()
-                NetworkActivationService.shared.stopForPanic()
-            },
-            restart: {
-                NetworkActivationService.shared.start()
-                GeohashPresenceService.shared.start()
-            }
-        )
-    }
-}
-
 /// Manages the application state and business logic for BitChat.
 /// Acts as the primary coordinator between UI components and backend services,
 /// implementing the BitchatDelegate protocol to handle network events.
@@ -162,8 +142,6 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, TransportEventDele
     @Published var currentColorScheme: ColorScheme = .light
     @Published var currentTheme: AppTheme = .matrix
     @Published var isConnected = false
-    @Published private(set) var panicRecoveryBlocked = false
-    var networkActivationAllowed: Bool { !panicRecoveryBlocked }
     @Published var nickname: String = "" {
         didSet {
             // Trim whitespace whenever nickname is set; whitespace-only becomes ""
@@ -173,7 +151,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, TransportEventDele
                 return
             }
             // Update mesh service nickname if it's initialized
-            if !isPanicResetting, !meshService.myPeerID.isEmpty {
+            if !meshService.myPeerID.isEmpty {
                 meshService.setNickname(nickname)
             }
         }
@@ -199,10 +177,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, TransportEventDele
     lazy var privateConversationCoordinator = ChatPrivateConversationCoordinator(context: self)
     lazy var nostrCoordinator = ChatNostrCoordinator(context: self)
     lazy var mediaTransferCoordinator = ChatMediaTransferCoordinator(context: self)
-    lazy var liveVoiceCoordinator = ChatLiveVoiceCoordinator(
-        context: self,
-        sweepsOnInit: !TestEnvironment.isRunningTests
-    )
+    lazy var liveVoiceCoordinator = ChatLiveVoiceCoordinator(context: self)
     lazy var verificationCoordinator = ChatVerificationCoordinator(context: self)
     lazy var groupCoordinator = ChatGroupCoordinator(context: self)
     lazy var vouchCoordinator = ChatVouchCoordinator(context: self)
@@ -317,9 +292,6 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, TransportEventDele
     var nostrRelayManager: NostrRelayManager?
     private let userDefaults = UserDefaults.standard
     let keychain: KeychainManagerProtocol
-    private let panicRecoveryOperations: PanicRecoveryOperations
-    private let panicNetworkLifecycle: PanicNetworkLifecycle
-    private var isPanicResetting = false
     /// Private group membership: keys in the keychain, metadata on disk.
     let groupStore: GroupStore
     private let nicknameKey = "bitchat.nickname"
@@ -797,34 +769,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, TransportEventDele
         locationPresenceStore: LocationPresenceStore? = nil,
         locationManager: LocationChannelManager = .shared
     ) {
-        let livePanicRecoveryOperations = PanicRecoveryOperations.live()
-        let startSuspendedForRecovery: Bool
-        do {
-            startSuspendedForRecovery =
-                try livePanicRecoveryOperations.isPending()
-        } catch {
-            startSuspendedForRecovery = true
-        }
-        // Preserve the preflight decision used to defer CoreBluetooth. A
-        // transiently successful second read must not skip recovery and leave
-        // the service permanently suspended without running the wipe.
-        let panicRecoveryOperations = PanicRecoveryOperations(
-            isPending: {
-                if startSuspendedForRecovery {
-                    return true
-                }
-                return try livePanicRecoveryOperations.isPending()
-            },
-            begin: livePanicRecoveryOperations.begin,
-            wipeMedia: livePanicRecoveryOperations.wipeMedia,
-            complete: livePanicRecoveryOperations.complete
-        )
-        let meshService = BLEService(
-            keychain: keychain,
-            idBridge: idBridge,
-            identityManager: identityManager,
-            startSuspendedForPanicRecovery: startSuspendedForRecovery
-        )
+        let meshService = BLEService(keychain: keychain, idBridge: idBridge, identityManager: identityManager)
         meshService.sfMetrics = .shared
         self.init(
             keychain: keychain,
@@ -836,9 +781,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, TransportEventDele
             locationPresenceStore: locationPresenceStore ?? LocationPresenceStore(),
             locationManager: locationManager,
             outboxStore: MessageOutboxStore(keychain: keychain),
-            sfMetrics: .shared,
-            panicRecoveryOperations: panicRecoveryOperations,
-            panicNetworkLifecycle: .live
+            sfMetrics: .shared
         )
     }
 
@@ -856,10 +799,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, TransportEventDele
         locationManager: LocationChannelManager = .shared,
         readReceiptsDefaults: UserDefaults? = nil,
         outboxStore: MessageOutboxStore? = nil,
-        sfMetrics: StoreAndForwardMetrics? = nil,
-        panicMediaWipe: (() throws -> Void)? = nil,
-        panicRecoveryOperations: PanicRecoveryOperations? = nil,
-        panicNetworkLifecycle: PanicNetworkLifecycle = .noop
+        sfMetrics: StoreAndForwardMetrics? = nil
     ) {
         let conversations = conversations ?? ConversationStore()
         let peerIdentityStore = peerIdentityStore ?? PeerIdentityStore()
@@ -874,9 +814,6 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, TransportEventDele
         )
 
         self.keychain = keychain
-        self.panicRecoveryOperations = panicRecoveryOperations
-            ?? .ephemeral(wipeMedia: panicMediaWipe ?? {})
-        self.panicNetworkLifecycle = panicNetworkLifecycle
         self.groupStore = GroupStore(keychain: keychain)
         self.idBridge = idBridge
         self.identityManager = identityManager
@@ -912,32 +849,8 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, TransportEventDele
             }
             .store(in: &cancellables)
 
-        let recoveryRequired: Bool
-        do {
-            recoveryRequired = try self.panicRecoveryOperations.isPending()
-        } catch {
-            // Failure to read the latch cannot fail open. Re-run the complete
-            // transaction; a persistent storage failure leaves services
-            // blocked below.
-            recoveryRequired = true
-            SecureLogger.error(
-                "Could not read panic-recovery state; retrying the full wipe before startup: \(error)",
-                category: .security
-            )
-        }
-
-        if recoveryRequired {
-            SecureLogger.warning(
-                "Pending panic recovery detected; wiping before runtime services start",
-                category: .security
-            )
-            _ = panicClearAllData(restartServices: false)
-        }
-
-        if networkActivationAllowed {
         ChatViewModelBootstrapper(viewModel: self).configure()
     }
-    }
 
     // MARK: - Deinitialization
 
@@ -1240,33 +1153,8 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, TransportEventDele
 
     // PANIC: Emergency data clearing for activist safety
     @MainActor
-    @discardableResult
-    func panicClearAllData(restartServices: Bool = true) -> Bool {
-        panicRecoveryBlocked = true
-        isPanicResetting = true
-        defer { isPanicResetting = false }
-
-        // Stop internet and location-presence work before clearing identity or
-        // state. These services cancel their subscriptions and delayed tasks,
-        // so old callbacks cannot reconnect during the transaction.
-        panicNetworkLifecycle.stop()
-
-        // Establish both independent durable intents before erasing anything.
-        // `wipeMedia` will still attempt deletion if neither write succeeds.
-        let recoveryIntent = panicRecoveryOperations.begin()
-
-        // Quiesce the mesh before clearing stores. Identity replacement below
-        // deliberately stays stopped until media deletion and marker commit.
-        if let bleService = meshService as? BLEService {
-            bleService.suspendForPanicReset()
-        } else {
-            meshService.emergencyDisconnectAll()
-        }
-
-        // Invalidate detached media preparation and close live capture file
-        // handles before clearing state or removing the media directory.
-        mediaTransferCoordinator.resetForPanic()
-        liveVoiceCoordinator.resetForPanic()
+    func panicClearAllData() {
+        // Messages are processed immediately - nothing to flush
 
         // Clear all messages (public timelines and private chats live in the
         // single-writer ConversationStore; the derived `messages` view and
@@ -1275,13 +1163,7 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, TransportEventDele
         pendingGeohashSystemMessages.removeAll()
 
         // Delete all keychain data (including Noise and Nostr keys)
-        let keychainWipeCompleted = keychain.deleteAllKeychainData()
-        if !keychainWipeCompleted {
-            SecureLogger.error(
-                "Panic keychain cleanup incomplete; recovery remains pending",
-                category: .security
-            )
-        }
+        _ = keychain.deleteAllKeychainData()
 
         // Clear UserDefaults identity data
         userDefaults.removeObject(forKey: "bitchat.noiseIdentityKey")
@@ -1294,14 +1176,13 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, TransportEventDele
 
         // Reset nickname to anonymous
         nickname = "anon\(Int.random(in: 1000...9999))"
-        userDefaults.set(nickname, forKey: nicknameKey)
+        saveNickname()
 
         // Clear favorites and peer mappings
         // Clear through SecureIdentityStateManager instead of directly
         identityManager.clearAllIdentityData()
         peerIdentityStore.clearAll()
         locationPresenceStore.reset()
-        publicRateLimiter.reset()
 
         // Clear persistent favorites from keychain
         FavoritesPersistenceService.shared.clearAllFavorites()
@@ -1366,77 +1247,78 @@ final class ChatViewModel: ObservableObject, BitchatDelegate, TransportEventDele
         // Clear Nostr identity associations
         idBridge.clearAllAssociations()
 
-        // Replace the BLE identity while keeping the radio stopped. It may
-        // reopen only after the durable panic transaction commits.
+        // Disconnect from all peers and clear persistent identity
+        // This will force creation of a new identity (new fingerprint) on next launch
+        meshService.emergencyDisconnectAll()
         if let bleService = meshService as? BLEService {
-            bleService.resetIdentityForPanic(
-                currentNickname: nickname,
-                restartServices: false
-            )
-        } else {
-            meshService.setNickname(nickname)
+            bleService.resetIdentityForPanic(currentNickname: nickname)
         }
 
-        // The wipe must finish before this security action returns. A detached
-        // task could otherwise lose a race with a new capture or app exit and
-        // leave pre-panic media behind.
-        let panicCompleted: Bool
-        do {
-            try panicRecoveryOperations.wipeMedia(recoveryIntent)
-            if keychainWipeCompleted {
-                try panicRecoveryOperations.complete()
-                panicCompleted = true
-                SecureLogger.info(
-                    "🗑️ Deleted all media files during panic clear",
-                    category: .session
-                )
-            } else {
-                // Do not clear either durable recovery marker. Startup must
-                // retry the entire transaction before any transport restarts.
-                panicCompleted = false
-            }
-        } catch {
-            panicCompleted = false
-            SecureLogger.error(
-                "Panic transaction did not commit; services remain stopped: \(error)",
-                category: .security
-            )
-        }
-        panicRecoveryBlocked = !panicCompleted
+        // No need to force UserDefaults synchronization
 
-        // BCH-01-013: Clear iOS app switcher snapshots. Keep tests away from
-        // the host user's real cache tree just as the default media wipe does.
-        #if os(iOS)
+        // Reinitialize Nostr with new identity
+        // This will generate new Nostr keys derived from new Noise keys.
+        // Skipped under tests: connecting the shared relay singleton starts
+        // real network/reconnect work that never completes and would keep the
+        // test process alive (the singleton, unlike a discardable instance, is
+        // never deallocated to cancel it).
         if !TestEnvironment.isRunningTests {
-            Self.clearAppSwitcherSnapshots()
-        }
-        #endif
+            Task { @MainActor in
+                // Small delay to ensure cleanup completes
+                try? await Task.sleep(nanoseconds: TransportConfig.uiAsyncShortSleepNs) // 0.1 seconds
 
-        guard panicCompleted else { return false }
-
-        if let bleService = meshService as? BLEService {
-            // Startup recovery reopens admission but leaves actual service
-            // start to the bootstrapper immediately after this method.
-            bleService.completePanicReset(
-                restartServices: restartServices
-            )
-        }
-
-        if restartServices {
-            // All persistent state and media are gone. Bring each service back
-            // only now, under the new identity.
-            if !(meshService is BLEService) {
-                meshService.startServices()
-            }
-
-            if !TestEnvironment.isRunningTests {
+                // Reinitialize Nostr relay manager with new identity. Reuse the
+                // shared singleton — every other component (NostrTransport, geohash
+                // subscriptions, AppRuntime observers) is bound to `.shared`, so
+                // creating a fresh instance here would split relay state and leave
+                // sends running against a disconnected manager.
                 nostrRelayManager = NostrRelayManager.shared
                 setupNostrMessageHandling()
+                nostrRelayManager?.connect()
             }
-            panicNetworkLifecycle.restart()
         }
 
-        return true
+        // Delete ALL media files (incoming and outgoing) in background
+        Task.detached(priority: .utility) {
+            // Skipped under tests: the test process shares the user's real
+            // ~/Library/Application Support/files tree, and this detached
+            // utility-priority wipe fires at a nondeterministic time —
+            // deleting media that concurrently running tests (e.g. the
+            // sendImage flow) just wrote there, and the developer's real
+            // app data with it.
+            guard !TestEnvironment.isRunningTests else { return }
+            do {
+                let base = try FileManager.default.url(for: .applicationSupportDirectory, in: .userDomainMask, appropriateFor: nil, create: true)
+                let filesDir = base.appendingPathComponent("files", isDirectory: true)
+
+                // Delete the entire files directory and recreate it
+                if FileManager.default.fileExists(atPath: filesDir.path) {
+                    try FileManager.default.removeItem(at: filesDir)
+                    SecureLogger.info("🗑️ Deleted all media files during panic clear", category: .session)
+                }
+
+                // Recreate empty directory structure
+                try FileManager.default.createDirectory(at: filesDir, withIntermediateDirectories: true, attributes: nil)
+                try FileManager.default.createDirectory(at: filesDir.appendingPathComponent("voicenotes/incoming", isDirectory: true), withIntermediateDirectories: true, attributes: nil)
+                try FileManager.default.createDirectory(at: filesDir.appendingPathComponent("voicenotes/outgoing", isDirectory: true), withIntermediateDirectories: true, attributes: nil)
+                try FileManager.default.createDirectory(at: filesDir.appendingPathComponent("images/incoming", isDirectory: true), withIntermediateDirectories: true, attributes: nil)
+                try FileManager.default.createDirectory(at: filesDir.appendingPathComponent("images/outgoing", isDirectory: true), withIntermediateDirectories: true, attributes: nil)
+                try FileManager.default.createDirectory(at: filesDir.appendingPathComponent("files/incoming", isDirectory: true), withIntermediateDirectories: true, attributes: nil)
+                try FileManager.default.createDirectory(at: filesDir.appendingPathComponent("files/outgoing", isDirectory: true), withIntermediateDirectories: true, attributes: nil)
+            } 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

bitchat/ViewModels/ChatViewModelBootstrapper.swift

@@ -156,17 +156,6 @@ private extension ChatViewModelBootstrapper {
                 viewModel?.objectWillChange.send()
             }
             .store(in: &viewModel.cancellables)
-
-        viewModel.participantTracker.$visiblePeople
-            .receive(on: DispatchQueue.main)
-            .sink { [weak viewModel] people in
-                Task { @MainActor [weak viewModel] in
-                    let visible = Set(people.map { $0.id })
-                    viewModel?.locationPresenceStore.retainTeleportedGeo(keeping: visible)
-                    viewModel?.locationPresenceStore.retainGeoNicknames(keeping: visible)
-                }
-            }
-            .store(in: &viewModel.cancellables)
     }
 
     func loadPersistedViewState() {

bitchat/ViewModels/MessageRateLimiter.swift

@@ -26,10 +26,6 @@ struct MessageRateLimiter {
             }
             return false
         }
-
-        func isIdle(since now: Date, idleTTL: TimeInterval) -> Bool {
-            now.timeIntervalSince(lastRefill) >= idleTTL
-        }
     }
 
     private var senderBuckets: [String: TokenBucket] = [:]
@@ -39,26 +35,17 @@ struct MessageRateLimiter {
     private let senderRefill: Double
     private let contentCapacity: Double
     private let contentRefill: Double
-    private let maxSenderBuckets: Int
-    private let maxContentBuckets: Int
-    private let bucketIdleTTL: TimeInterval
 
     init(
         senderCapacity: Double,
         senderRefillPerSec: Double,
         contentCapacity: Double,
-        contentRefillPerSec: Double,
-        maxSenderBuckets: Int = TransportConfig.uiSenderRateBucketMaxEntries,
-        maxContentBuckets: Int = TransportConfig.uiContentRateBucketMaxEntries,
-        bucketIdleTTL: TimeInterval = TransportConfig.uiRateBucketIdleTTL
+        contentRefillPerSec: Double
     ) {
         self.senderCapacity = senderCapacity
         self.senderRefill = senderRefillPerSec
         self.contentCapacity = contentCapacity
         self.contentRefill = contentRefillPerSec
-        self.maxSenderBuckets = max(1, maxSenderBuckets)
-        self.maxContentBuckets = max(1, maxContentBuckets)
-        self.bucketIdleTTL = bucketIdleTTL
     }
 
     /// - Parameter powBits: validated NIP-13 difficulty of the event
@@ -71,83 +58,25 @@ struct MessageRateLimiter {
         if powBits >= NostrPoW.rateLimitBypassBits {
             senderAllowed = true
         } else {
-            var senderBucket = Self.bucket(
-                for: senderKey,
-                in: &senderBuckets,
+            var senderBucket = senderBuckets[senderKey] ?? TokenBucket(
                 capacity: senderCapacity,
+                tokens: senderCapacity,
                 refillPerSec: senderRefill,
-                maxBuckets: maxSenderBuckets,
-                idleTTL: bucketIdleTTL,
-                now: now
+                lastRefill: now
             )
             senderAllowed = senderBucket.allow(now: now)
             senderBuckets[senderKey] = senderBucket
         }
 
-        // Rejected senders must not mint attacker-keyed content entries.
-        guard senderAllowed else { return false }
-
-        var contentBucket = Self.bucket(
-            for: contentKey,
-            in: &contentBuckets,
+        var contentBucket = contentBuckets[contentKey] ?? TokenBucket(
             capacity: contentCapacity,
+            tokens: contentCapacity,
             refillPerSec: contentRefill,
-            maxBuckets: maxContentBuckets,
-            idleTTL: bucketIdleTTL,
-            now: now
+            lastRefill: now
         )
         let contentAllowed = contentBucket.allow(now: now)
         contentBuckets[contentKey] = contentBucket
 
-        return contentAllowed
-    }
-
-    mutating func reset() {
-        senderBuckets.removeAll()
-        contentBuckets.removeAll()
-    }
-
-    var bucketCountsForTesting: (sender: Int, content: Int) {
-        (senderBuckets.count, contentBuckets.count)
-    }
-
-    // Static so we can take `inout` on a stored dictionary without overlapping
-    // exclusive access through a mutating method on `self`.
-    private static func bucket(
-        for key: String,
-        in buckets: inout [String: TokenBucket],
-        capacity: Double,
-        refillPerSec: Double,
-        maxBuckets: Int,
-        idleTTL: TimeInterval,
-        now: Date
-    ) -> TokenBucket {
-        if let existing = buckets[key] {
-            return existing
-        }
-
-        evictIfNeeded(from: &buckets, maxBuckets: maxBuckets, idleTTL: idleTTL, now: now)
-        return TokenBucket(
-            capacity: capacity,
-            tokens: capacity,
-            refillPerSec: refillPerSec,
-            lastRefill: now
-        )
-    }
-
-    private static func evictIfNeeded(
-        from buckets: inout [String: TokenBucket],
-        maxBuckets: Int,
-        idleTTL: TimeInterval,
-        now: Date
-    ) {
-        guard buckets.count >= maxBuckets else { return }
-
-        buckets = buckets.filter { !$0.value.isIdle(since: now, idleTTL: idleTTL) }
-        guard buckets.count >= maxBuckets else { return }
-
-        if let oldestKey = buckets.min(by: { $0.value.lastRefill < $1.value.lastRefill })?.key {
-            buckets.removeValue(forKey: oldestKey)
-        }
+        return senderAllowed && contentAllowed
     }
 }

bitchat/ViewModels/NostrInboundPipeline.swift

@@ -196,10 +196,7 @@ final class NostrInboundPipeline {
         // Sampled: fires for every geo event and floods dev logs in busy geohashes.
         geoEventLogCount += 1
         if geoEventLogCount == 1 || geoEventLogCount.isMultiple(of: TransportConfig.nostrInboundEventLogInterval) {
-            SecureLogger.debug(
-                "GeoTeleport: recv #\(geoEventLogCount) pub=\(event.pubkey.prefix(8))… pow=\(powBits) tagCount=\(event.tags.count)",
-                category: .session
-            )
+            SecureLogger.debug("GeoTeleport: recv #\(geoEventLogCount) pub=\(event.pubkey.prefix(8))… pow=\(powBits) tags=\(event.tags.map { "[" + $0.joined(separator: ",") + "]" }.joined(separator: ","))", category: .session)
         }
 
         if context.isNostrBlocked(pubkeyHexLowercased: event.pubkey) {

bitchat/ViewModels/VoiceRecordingViewModel.swift

@@ -188,25 +188,8 @@ final class VoiceRecordingViewModel: ObservableObject {
 
         Task {
             let finalDuration = Date().timeIntervalSince(startDate)
-            if let url = await session.finish() {
-                // Panic and a newer hold both invalidate this completion.
-                // Never route an old recording using a post-panic target.
-                guard generation == holdGeneration else {
-                    try? FileManager.default.removeItem(at: url)
-                    return
-                }
-                guard isValidRecording(
-                    at: url,
-                    duration: finalDuration
-                ) else {
-                    guard state == .idle else { return }
-                    state = .error(
-                        message: finalDuration < VoiceRecorder.minRecordingDuration
-                        ? "Recording is too short."
-                        : "Recording failed to save."
-                    )
-                    return
-                }
+            if let url = await session.finish(),
+               isValidRecording(at: url, duration: finalDuration) {
                 completion(url)
             } else {
                 guard generation == holdGeneration, state == .idle else { return }
@@ -223,17 +206,6 @@ final class VoiceRecordingViewModel: ObservableObject {
         finish(completion: nil)
     }
 
-    /// Invalidates in-flight permission/start/finalize callbacks and tears
-    /// down an active microphone before the panic transaction continues.
-    func panicWipe() {
-        holdGeneration &+= 1
-        let session = activeSession
-        activeSession = nil
-        state = .idle
-        isLiveStreaming = false
-        session?.panicCancelSynchronously()
-    }
-
     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,

bitchat/Views/AppInfoView.swift

@@ -26,10 +26,6 @@ struct AppInfoView: View {
     /// introduction), and afterwards the sheet reopens wherever it was left.
     @AppStorage("appInfo.selectedPane") private var selectedPane: Pane = .info
     @State private var showPanicConfirmation = false
-    @AppStorage(AppLanguageSettings.overrideKey) private var languageOverride = ""
-    /// The override changed this session; localization resolves at process
-    /// start, so surface the restart hint.
-    @State private var showLanguageRestartNote = false
 
     private enum Pane: String {
         case settings
@@ -59,11 +55,6 @@ struct AppInfoView: View {
 
             static let connectivityTitle = String(localized: "app_info.settings.connectivity.title", defaultValue: "CONNECTIVITY", comment: "Section header (uppercase) for the connectivity toggles: mesh bridge, internet gateway, tor routing")
 
-            static let languageTitle = String(localized: "app_info.settings.language.title", defaultValue: "LANGUAGE", comment: "Section header (uppercase) for the app language picker in settings")
-            static let languagePickerLabel = String(localized: "app_info.settings.language.picker_label", defaultValue: "app language", comment: "Label of the app language picker row in settings")
-            static let languageSystem = String(localized: "app_info.settings.language.system", defaultValue: "system default", comment: "Menu option that clears the in-app language override so the app follows the device language")
-            static let languageRestartNote = String(localized: "app_info.settings.language.restart_note", defaultValue: "restart bitchat to apply the new language", comment: "Caption shown after the user picks a different app language; the change takes effect on next launch")
-
             static let bridgeTitle = String(localized: "app_info.settings.bridge.title", defaultValue: "mesh bridge", comment: "Title of the mesh bridge toggle in settings")
             static let bridgeSubtitle = String(localized: "app_info.settings.bridge.subtitle", defaultValue: "joins nearby mesh islands over the internet: what you say in the mesh channel also reaches people in your area beyond radio range, and their messages appear here marked with the network glyph. while you have internet, your device also carries bridge and location-channel traffic for phones around you that have none.", comment: "Subtitle explaining what the mesh bridge toggle does")
             static func bridgeCell(_ cell: String) -> String {
@@ -322,52 +313,6 @@ struct AppInfoView: View {
                 }
             }
 
-            // Language — an in-app override so the UI language can differ
-            // from the device language (takes effect on next launch).
-            VStack(alignment: .leading, spacing: 12) {
-                SectionHeader(verbatim: Strings.Settings.languageTitle)
-
-                settingsCard {
-                    Menu {
-                        Button {
-                            selectLanguage(nil)
-                        } label: {
-                            menuItemLabel(Strings.Settings.languageSystem, isSelected: languageOverride.isEmpty)
-                        }
-                        Divider()
-                        ForEach(AppLanguageSettings.availableLanguages, id: \.self) { code in
-                            Button {
-                                selectLanguage(code)
-                            } label: {
-                                menuItemLabel(AppLanguageSettings.endonym(for: code), isSelected: languageOverride == code)
-                            }
-                        }
-                    } label: {
-                        HStack {
-                            Text(Strings.Settings.languagePickerLabel)
-                                .bitchatFont(size: 12, weight: .semibold)
-                                .foregroundColor(textColor)
-                            Spacer()
-                            Text(languageOverride.isEmpty ? Strings.Settings.languageSystem : AppLanguageSettings.endonym(for: languageOverride))
-                                .bitchatFont(size: 12)
-                                .foregroundColor(palette.accent)
-                            Image(systemName: "chevron.up.chevron.down")
-                                .font(.system(size: 10))
-                                .foregroundColor(secondaryTextColor)
-                        }
-                        .contentShape(Rectangle())
-                    }
-                    .buttonStyle(.plain)
-
-                    if showLanguageRestartNote {
-                        Text(Strings.Settings.languageRestartNote)
-                            .bitchatFont(size: 11)
-                            .foregroundColor(secondaryTextColor)
-                            .fixedSize(horizontal: false, vertical: true)
-                    }
-                }
-            }
-
             // Voice — same card + IRC pill as every other toggle setting.
             VStack(alignment: .leading, spacing: 12) {
                 SectionHeader(Strings.Voice.title)
@@ -513,24 +458,6 @@ struct AppInfoView: View {
         .padding()
     }
 
-    private func selectLanguage(_ code: String?) {
-        let previous = languageOverride
-        AppLanguageSettings.setOverride(code)
-        languageOverride = code ?? ""
-        if languageOverride != previous {
-            showLanguageRestartNote = true
-        }
-    }
-
-    private func menuItemLabel(_ title: String, isSelected: Bool) -> some View {
-        HStack {
-            Text(title)
-            if isSelected {
-                Image(systemName: "checkmark")
-            }
-        }
-    }
-
     private var bridgeToggleBinding: Binding<Bool> {
         Binding(
             get: { bridgeService.isEnabled },

bitchat/Views/Components/TextMessageView.swift

@@ -41,7 +41,7 @@ struct TextMessageView: View {
             // first text line; a fixed top padding left the lock's solid body
             // hanging below the line's visual center.
             HStack(alignment: .firstTextBaseline, spacing: 0) {
-                let isLong = message.content.isLongForDisplay()
+                let isLong = (message.content.count > TransportConfig.uiLongMessageLengthThreshold || message.content.hasVeryLongToken(threshold: TransportConfig.uiVeryLongTokenThreshold)) && cashuLinks.isEmpty
                 let isExpanded = expandedMessageIDs.contains(message.id)
                 if message.isPrivate {
                     Image(systemName: "lock.fill")
@@ -103,7 +103,7 @@ struct TextMessageView: View {
             }
             
             // Expand/Collapse for very long messages
-            if message.content.isLongForDisplay() {
+            if (message.content.count > TransportConfig.uiLongMessageLengthThreshold || message.content.hasVeryLongToken(threshold: TransportConfig.uiVeryLongTokenThreshold)) && cashuLinks.isEmpty {
                 let isExpanded = expandedMessageIDs.contains(message.id)
                 let labelKey = isExpanded ? LocalizedStringKey("content.message.show_less") : LocalizedStringKey("content.message.show_more")
                 Button(labelKey) {

bitchat/Views/ContentView.swift

@@ -79,9 +79,6 @@ struct ContentView: View {
                 voiceRecordingVM.sessionProvider = { [weak conversationUIModel] in
                     conversationUIModel?.makeVoiceCaptureSession() ?? VoiceNoteCaptureSession()
                 }
-                appChromeModel.setPanicPreparation { [weak voiceRecordingVM] in
-                    voiceRecordingVM?.panicWipe()
-                }
                 #if os(macOS)
                 DispatchQueue.main.async {
                     isNicknameFieldFocused = false
@@ -232,7 +229,6 @@ struct ContentView: View {
         }
         .onDisappear {
             autocompleteDebounceTimer?.invalidate()
-            appChromeModel.setPanicPreparation(nil)
         }
     }
 

bitchat/Views/MessageTextHelpers.swift

@@ -21,26 +21,6 @@ extension String {
         return current >= threshold
     }
 
-    /// True when the message should collapse behind Show more in the UI.
-    /// Length alone decides this — embedding a Cashu-looking token must not
-    /// disable the guard (remote DoS via unbounded layout).
-    func isLongForDisplay(
-        lengthThreshold: Int = TransportConfig.uiLongMessageLengthThreshold,
-        tokenThreshold: Int = TransportConfig.uiVeryLongTokenThreshold
-    ) -> Bool {
-        count > lengthThreshold || hasVeryLongToken(threshold: tokenThreshold)
-    }
-
-    /// True when rich formatting (regex / link detectors) should be skipped.
-    /// Cashu presence used to exempt oversized content from the plain path;
-    /// that let untrusted input force expensive formatting work.
-    func isOversizedForRichFormatting(
-        lengthThreshold: Int = 4000,
-        tokenThreshold: Int = 1024
-    ) -> Bool {
-        count > lengthThreshold || hasVeryLongToken(threshold: tokenThreshold)
-    }
-
     // Extract up to `max` distinct Cashu tokens (cashuA/cashuB), as the bare
     // bearer strings. Allow dot '.' and shorter lengths. The `cashu:` URI
     // form matches too — the token embedded after the scheme is the match.

bitchat/_PreviewHelpers/PreviewKeychainManager.swift

@@ -14,25 +14,11 @@ final class PreviewKeychainManager: KeychainManagerProtocol {
     // every default-constructed component under test, which access it from
     // arbitrary threads.
     private let lock = NSLock()
-    private let installAccessGate: KeychainInstallAccessGate
-    private let reconcileInstallAccess: () -> Bool
     private var storage: [String: Data] = [:]
     private var serviceStorage: [String: [String: Data]] = [:]
-
-    init(
-        installAccessGate: KeychainInstallAccessGate = KeychainInstallAccessGate(),
-        reconcileInstallAccess: @escaping () -> Bool = { true }
-    ) {
-        self.installAccessGate = installAccessGate
-        self.reconcileInstallAccess = reconcileInstallAccess
-    }
-
-    private func installAccessAllowed() -> Bool {
-        installAccessGate.allowsAccess(reconcile: reconcileInstallAccess)
-    }
+    init() {}
 
     func saveIdentityKey(_ keyData: Data, forKey key: String) -> Bool {
-        guard installAccessAllowed() else { return false }
         lock.lock()
         defer { lock.unlock() }
         storage[key] = keyData
@@ -40,14 +26,12 @@ final class PreviewKeychainManager: KeychainManagerProtocol {
     }
 
     func getIdentityKey(forKey key: String) -> Data? {
-        guard installAccessAllowed() else { return nil }
         lock.lock()
         defer { lock.unlock() }
         return storage[key]
     }
 
     func deleteIdentityKey(forKey key: String) -> Bool {
-        guard installAccessAllowed() else { return false }
         lock.lock()
         defer { lock.unlock() }
         storage.removeValue(forKey: key)
@@ -67,7 +51,6 @@ final class PreviewKeychainManager: KeychainManagerProtocol {
     func secureClear(_ string: inout String) {}
 
     func verifyIdentityKeyExists() -> Bool {
-        guard installAccessAllowed() else { return false }
         lock.lock()
         defer { lock.unlock() }
         return storage["identity_noiseStaticKey"] != nil
@@ -75,7 +58,6 @@ final class PreviewKeychainManager: KeychainManagerProtocol {
 
     // BCH-01-009: New methods with proper error classification
     func getIdentityKeyWithResult(forKey key: String) -> KeychainReadResult {
-        guard installAccessAllowed() else { return .accessDenied }
         lock.lock()
         defer { lock.unlock() }
         if let data = storage[key] {
@@ -85,7 +67,6 @@ final class PreviewKeychainManager: KeychainManagerProtocol {
     }
 
     func saveIdentityKeyWithResult(_ keyData: Data, forKey key: String) -> KeychainSaveResult {
-        guard installAccessAllowed() else { return .accessDenied }
         lock.lock()
         defer { lock.unlock() }
         storage[key] = keyData
@@ -95,38 +76,24 @@ final class PreviewKeychainManager: KeychainManagerProtocol {
     // MARK: - Generic Data Storage (consolidated from KeychainHelper)
 
     func save(key: String, data: Data, service: String, accessible: CFString?) {
-        guard installAccessAllowed() else { return }
         lock.lock()
         defer { lock.unlock() }
         serviceStorage[service, default: [:]][key] = data
     }
 
     func load(key: String, service: String) -> Data? {
-        guard case .success(let data) = loadWithResult(key: key, service: service) else {
-            return nil
-        }
-        return data
-    }
-
-    func loadWithResult(key: String, service: String) -> KeychainReadResult {
-        guard installAccessAllowed() else { return .accessDenied }
         lock.lock()
         defer { lock.unlock() }
-        guard let data = serviceStorage[service]?[key] else {
-            return .itemNotFound
-        }
-        return .success(data)
+        return serviceStorage[service]?[key]
     }
 
     func delete(key: String, service: String) {
-        guard installAccessAllowed() else { return }
         lock.lock()
         defer { lock.unlock() }
         serviceStorage[service]?.removeValue(forKey: key)
     }
 
     func deleteAll(service: String) {
-        guard installAccessAllowed() else { return }
         lock.lock()
         defer { lock.unlock() }
         serviceStorage.removeValue(forKey: service)

bitchatShareExtension/Localization/Localizable.xcstrings

@@ -38,12 +38,6 @@
             "comment" : "Fallback title when saving a shared link"
           }
         },
-        "fa" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "پیوند اشتراک‌گذاری‌شده"
-          }
-        },
         "fil" : {
           "stringUnit" : {
             "state" : "needs_review",
@@ -239,12 +233,6 @@
             "comment" : "Shown when the share payload cannot be encoded"
           }
         },
-        "fa" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "کدگذاری پیوند ناموفق بود"
-          }
-        },
         "fil" : {
           "stringUnit" : {
             "state" : "needs_review",
@@ -440,12 +428,6 @@
             "comment" : "Shown when provided content cannot be shared"
           }
         },
-        "fa" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "محتوای قابل اشتراک‌گذاری وجود ندارد"
-          }
-        },
         "fil" : {
           "stringUnit" : {
             "state" : "needs_review",
@@ -641,12 +623,6 @@
             "comment" : "Shown when the share extension receives no content"
           }
         },
-        "fa" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "چیزی برای اشتراک‌گذاری نیست"
-          }
-        },
         "fil" : {
           "stringUnit" : {
             "state" : "needs_review",
@@ -842,12 +818,6 @@
             "comment" : "Confirmation after successfully sharing a link"
           }
         },
-        "fa" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "✓ پیوند در bitchat به اشتراک گذاشته شد"
-          }
-        },
         "fil" : {
           "stringUnit" : {
             "state" : "needs_review",
@@ -1043,12 +1013,6 @@
             "comment" : "Confirmation after successfully sharing text"
           }
         },
-        "fa" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "✓ متن در bitchat به اشتراک گذاشته شد"
-          }
-        },
         "fil" : {
           "stringUnit" : {
             "state" : "needs_review",

bitchatTests/AppArchitectureTests.swift

@@ -147,44 +147,6 @@ struct AppArchitectureTests {
         #expect(store.teleportedGeo.isEmpty)
     }
 
-    @Test("LocationPresenceStore bounds and prunes teleported geohash participants")
-    @MainActor
-    func locationPresenceStoreBoundsTeleportedParticipants() {
-        let store = LocationPresenceStore(teleportedGeoCapacity: 2)
-
-        store.setCurrentGeohash("u4pruy")
-        store.markTeleported("AAAAAA")
-        store.markTeleported("BBBBBB")
-        store.markTeleported("CCCCCC")
-
-        #expect(store.teleportedGeo == Set(["bbbbbb", "cccccc"]))
-
-        store.retainTeleportedGeo(keeping: Set(["CCCCCC"]))
-        #expect(store.teleportedGeo == Set(["cccccc"]))
-
-        store.setCurrentGeohash("u4pruz")
-        #expect(store.teleportedGeo.isEmpty)
-    }
-
-    @Test("LocationPresenceStore bounds geohash nicknames and clears on channel switch")
-    @MainActor
-    func locationPresenceStoreBoundsGeoNicknames() {
-        let store = LocationPresenceStore(geoNicknameCapacity: 2)
-
-        store.setCurrentGeohash("u4pruy")
-        store.setNickname("alice", for: "AAAAAA")
-        store.setNickname("bob", for: "BBBBBB")
-        store.setNickname("carol", for: "CCCCCC")
-
-        #expect(store.geoNicknames == ["bbbbbb": "bob", "cccccc": "carol"])
-
-        store.retainGeoNicknames(keeping: Set(["CCCCCC"]))
-        #expect(store.geoNicknames == ["cccccc": "carol"])
-
-        store.setCurrentGeohash("u4pruz")
-        #expect(store.geoNicknames.isEmpty)
-    }
-
     @Test("PeerHandle equality and hashing use the canonical identity only")
     func peerHandleEqualityUsesCanonicalIdentity() {
         let first = PeerHandle(id: "noise:abc123", routingPeerID: PeerID(str: "peer-a"))

bitchatTests/BLEServiceCoreTests.swift

@@ -99,95 +99,6 @@ struct BLEServiceCoreTests {
         #expect(ble.currentPeerSnapshots().isEmpty)
     }
 
-    @Test
-    func unsignedAndBadSignatureLeaveDoNotEvictOrRelayClaimedPeer() async throws {
-        let ble = makeService()
-        let alice = NoiseEncryptionService(keychain: MockKeychain())
-        let mallory = NoiseEncryptionService(keychain: MockKeychain())
-        let alicePeerID = PeerID(publicKey: alice.getStaticPublicKeyData())
-        let outbound = OutboundPacketTap()
-        ble._test_onOutboundPacket = outbound.record
-
-        let unsigned = makeLeavePacket(sender: alicePeerID, marker: "unsigned")
-        ble._test_handlePacket(
-            unsigned,
-            fromPeerID: alicePeerID,
-            signingPublicKey: alice.getSigningPublicKeyData()
-        )
-
-        let unsignedRelayed = await TestHelpers.waitUntil(
-            { outbound.count(ofType: .leave) > 0 },
-            timeout: TestConstants.shortTimeout
-        )
-        #expect(!unsignedRelayed)
-        #expect(ble.currentPeerSnapshots().contains { $0.peerID == alicePeerID })
-
-        let badSignature = try #require(
-            mallory.signPacket(makeLeavePacket(sender: alicePeerID, marker: "bad-signature"))
-        )
-        ble._test_handlePacket(
-            badSignature,
-            fromPeerID: alicePeerID,
-            signingPublicKey: alice.getSigningPublicKeyData()
-        )
-
-        let badSignatureRelayed = await TestHelpers.waitUntil(
-            { outbound.count(ofType: .leave) > 0 },
-            timeout: TestConstants.shortTimeout
-        )
-        #expect(!badSignatureRelayed)
-        #expect(ble.currentPeerSnapshots().contains { $0.peerID == alicePeerID })
-    }
-
-    @Test
-    func validSignedLeaveEvictsSessionAndRelays() async throws {
-        let ble = makeService()
-        let alice = NoiseEncryptionService(keychain: MockKeychain())
-        let alicePeerID = PeerID(publicKey: alice.getStaticPublicKeyData())
-
-        // Establish a real session so the leave regression also verifies that
-        // stale secure-delivery state is retired, not just the peer-list row.
-        let message1 = try ble._test_noiseInitiateHandshake(with: alicePeerID)
-        let message2 = try #require(
-            try alice.processHandshakeMessage(from: ble.myPeerID, message: message1)
-        )
-        let message3 = try #require(
-            try ble._test_noiseProcessHandshakeMessage(from: alicePeerID, message: message2)
-        )
-        _ = try alice.processHandshakeMessage(from: ble.myPeerID, message: message3)
-        #expect(ble.canDeliverSecurely(to: alicePeerID))
-        let centralUUID = "central-valid-leave"
-        ble._test_bindCentral(centralUUID, to: alicePeerID)
-        ble._test_markNoiseAuthenticatedCentral(centralUUID, to: alicePeerID)
-        #expect(ble._test_isNoiseAuthenticatedCentral(centralUUID, for: alicePeerID))
-
-        let outbound = OutboundPacketTap()
-        ble._test_onOutboundPacket = outbound.record
-        let signedLeave = try #require(
-            alice.signPacket(makeLeavePacket(sender: alicePeerID, marker: "valid"))
-        )
-        ble._test_handlePacket(
-            signedLeave,
-            fromPeerID: alicePeerID,
-            signingPublicKey: alice.getSigningPublicKeyData()
-        )
-
-        let evicted = await TestHelpers.waitUntil(
-            {
-                !ble.currentPeerSnapshots().contains { $0.peerID == alicePeerID }
-                    && !ble.canDeliverSecurely(to: alicePeerID)
-                    && !ble._test_isNoiseAuthenticatedCentral(centralUUID, for: alicePeerID)
-            },
-            timeout: TestConstants.longTimeout
-        )
-        #expect(evicted)
-        let relayed = await TestHelpers.waitUntil(
-            { outbound.count(ofType: .leave) == 1 },
-            timeout: TestConstants.longTimeout
-        )
-        #expect(relayed)
-    }
-
     @Test
     func ingressAllowsRelayedSenderOnBoundLink() async throws {
         let ble = makeService()
@@ -529,94 +440,6 @@ struct BLEServiceCoreTests {
         #expect(outbound.count(ofType: .courierEnvelope) == 0)
     }
 
-    @Test
-    func replacementXXMessageOneWithPayloadCannotAuthenticateIngressLink() async throws {
-        let ble = makeService()
-        let victim = NoiseEncryptionService(keychain: MockKeychain())
-        let victimPeerID = PeerID(publicKey: victim.getStaticPublicKeyData())
-
-        // Preserve a working victim session while an unauthenticated
-        // replacement candidate arrives on a newly bound physical link.
-        let message1 = try ble._test_noiseInitiateHandshake(with: victimPeerID)
-        let message2 = try #require(
-            try victim.processHandshakeMessage(from: ble.myPeerID, message: message1)
-        )
-        let message3 = try #require(
-            try ble._test_noiseProcessHandshakeMessage(
-                from: victimPeerID,
-                message: message2
-            )
-        )
-        _ = try victim.processHandshakeMessage(
-            from: ble.myPeerID,
-            message: message3
-        )
-        #expect(ble.canDeliverSecurely(to: victimPeerID))
-
-        let centralUUID = "central-replacement-xx-message-one"
-        ble._test_bindCentral(centralUUID, to: victimPeerID)
-        #expect(
-            !ble._test_isNoiseAuthenticatedCentral(
-                centralUUID,
-                for: victimPeerID
-            )
-        )
-
-        // XX message one may legally carry a payload, so its length is not a
-        // reliable signal that the replacement handshake completed.
-        let unauthenticatedInitiator = NoiseHandshakeState(
-            role: .initiator,
-            pattern: .XX,
-            keychain: MockKeychain()
-        )
-        let replacementMessage1 = try unauthenticatedInitiator.writeMessage(
-            payload: Data([0xA5])
-        )
-        #expect(
-            replacementMessage1.count
-                > NoiseSecurityConstants.xxInitialMessageSize
-        )
-
-        let packet = BitchatPacket(
-            type: MessageType.noiseHandshake.rawValue,
-            senderID: Data(hexString: victimPeerID.id) ?? Data(),
-            recipientID: Data(hexString: ble.myPeerID.id),
-            timestamp: UInt64(Date().timeIntervalSince1970 * 1000),
-            payload: replacementMessage1,
-            signature: nil,
-            ttl: TransportConfig.messageTTLDefault
-        )
-        #expect(
-            ble._test_recordIngressIfNew(
-                packet: packet,
-                linkID: centralUUID
-            )
-        )
-
-        let outbound = OutboundPacketTap()
-        ble._test_onOutboundPacket = outbound.record
-        ble._test_handlePacket(
-            packet,
-            fromPeerID: victimPeerID,
-            preseedPeer: false
-        )
-
-        // Waiting for the responder's message two proves the candidate was
-        // processed before checking its exact authentication result.
-        let candidateProcessed = await TestHelpers.waitUntil(
-            { outbound.count(ofType: .noiseHandshake) == 1 },
-            timeout: TestConstants.longTimeout
-        )
-        #expect(candidateProcessed)
-        #expect(
-            !ble._test_isNoiseAuthenticatedCentral(
-                centralUUID,
-                for: victimPeerID
-            )
-        )
-        #expect(ble.canDeliverSecurely(to: victimPeerID))
-    }
-
     /// A legitimate rotation announce necessarily arrives on a link still
     /// bound to the OLD ID, so its registry upsert stores the new peer
     /// disconnected. The successful rebind must promote it: a healed
@@ -749,108 +572,6 @@ struct BLEServiceCoreTests {
         #expect(ble.myPeerID == PeerID(str: newFingerprint.prefix(16)))
     }
 
-    @Test
-    func panicSuspension_dropsLateOutboundWorkUntilCommit() async {
-        let ble = makeService()
-        let outbound = OutboundPacketTap()
-        ble._test_onOutboundPacket = outbound.record
-        let packet = makePublicPacket(
-            content: "late callback",
-            sender: ble.myPeerID,
-            timestamp: UInt64(Date().timeIntervalSince1970 * 1000)
-        )
-
-        ble.suspendForPanicReset()
-        ble.sendPacket(packet)
-        #expect(outbound.count(ofType: .message) == 0)
-
-        ble.completePanicReset(restartServices: false)
-        ble.sendPacket(packet)
-        #expect(outbound.count(ofType: .message) == 1)
-    }
-
-    @Test @MainActor
-    func panicSuspension_invalidatesQueuedMainActorIngress() async {
-        let ble = makeService()
-        let delegate = TransportEventCaptureDelegate()
-        ble.eventDelegate = delegate
-        let message = BitchatMessage(
-            id: "pre-panic-ingress",
-            sender: "Peer",
-            content: "must not survive panic",
-            timestamp: Date(),
-            isRelay: false,
-            isPrivate: true,
-            recipientNickname: "Me",
-            senderPeerID: PeerID(str: "1122334455667788")
-        )
-
-        // The test already owns MainActor, so this task cannot run until the
-        // synchronous panic boundary below has invalidated its generation.
-        ble._test_emitTransportEvent(.messageReceived(message))
-        ble.suspendForPanicReset()
-        await Task.yield()
-        #expect(delegate.messageIDs.isEmpty)
-
-        ble.completePanicReset(restartServices: false)
-        ble._test_emitTransportEvent(.messageReceived(message))
-        await Task.yield()
-        #expect(delegate.messageIDs == [message.id])
-    }
-
-    @Test @MainActor
-    func panicSuspension_rejectsPausedBLEReceiveBeforeMessageQueueHandoff() async {
-        let ble = makeService()
-        let gate = ReceivePacketHandoffGate()
-        ble._test_beforeReceivePacketHandoff = gate.pause
-        ble._test_onReceivePacketHandoff = gate.recordHandoff
-        defer {
-            gate.release()
-            ble._test_beforeReceivePacketHandoff = nil
-            ble._test_onReceivePacketHandoff = nil
-        }
-
-        let sender = PeerID(str: "1122334455667788")
-        let packet = makePublicPacket(
-            content: "must not cross panic",
-            sender: sender,
-            timestamp: UInt64(Date().timeIntervalSince1970 * 1000)
-        )
-        ble._test_handlePacketFromBLEQueue(packet, fromPeerID: sender)
-        #expect(await TestHelpers.waitUntil(
-            { gate.hasPaused },
-            timeout: TestConstants.longTimeout
-        ))
-
-        // Panic closes the lifecycle before waiting for the paused bleQueue
-        // callback. Releasing it afterward lets the callback enqueue its
-        // messageQueue handoff, where the captured generation must be rejected
-        // before packet processing starts.
-        let panicIngressObserver = PanicIngressObserver(service: ble)
-        let didObservePanicClosure = await withCheckedContinuation { continuation in
-            DispatchQueue.global(qos: .userInitiated).async {
-                let didObserveClosure = panicIngressObserver.waitUntilClosed(
-                    timeout: TestConstants.defaultTimeout
-                )
-                gate.release()
-                continuation.resume(returning: didObserveClosure)
-            }
-            ble.suspendForPanicReset()
-        }
-
-        #expect(didObservePanicClosure)
-        #expect(gate.handoffCount == 0)
-
-        // A packet captured under the reopened lifecycle still crosses the
-        // same handoff, proving the test did not merely disable the hook.
-        ble.completePanicReset(restartServices: false)
-        ble._test_handlePacketFromBLEQueue(packet, fromPeerID: sender)
-        #expect(await TestHelpers.waitUntil(
-            { gate.handoffCount == 1 },
-            timeout: TestConstants.longTimeout
-        ))
-    }
-
     @Test
     func modifiedServices_rediscoverWhenBitChatServiceIsInvalidated() async throws {
         let otherService = CBUUID(string: "0000180F-0000-1000-8000-00805F9B34FB")
@@ -945,68 +666,6 @@ private final class OutboundPacketTap {
     }
 }
 
-private final class ReceivePacketHandoffGate: @unchecked Sendable {
-    private let condition = NSCondition()
-    private var paused = false
-    private var released = false
-    private var recordedHandoffCount = 0
-
-    var hasPaused: Bool {
-        condition.lock()
-        defer { condition.unlock() }
-        return paused
-    }
-
-    var handoffCount: Int {
-        condition.lock()
-        defer { condition.unlock() }
-        return recordedHandoffCount
-    }
-
-    func pause() {
-        condition.lock()
-        paused = true
-        condition.broadcast()
-        while !released {
-            condition.wait()
-        }
-        condition.unlock()
-    }
-
-    func release() {
-        condition.lock()
-        released = true
-        condition.broadcast()
-        condition.unlock()
-    }
-
-    func recordHandoff() {
-        condition.lock()
-        recordedHandoffCount += 1
-        condition.unlock()
-    }
-}
-
-/// Lets a dedicated dispatch worker observe the lock-protected panic gate
-/// without treating the full BLE service as generally Sendable.
-private final class PanicIngressObserver: @unchecked Sendable {
-    private let service: BLEService
-
-    init(service: BLEService) {
-        self.service = service
-    }
-
-    func waitUntilClosed(timeout: TimeInterval) -> Bool {
-        let deadline = DispatchTime.now().uptimeNanoseconds
-            + UInt64(timeout * 1_000_000_000)
-        while service._test_isPanicIngressOpen,
-              DispatchTime.now().uptimeNanoseconds < deadline {
-            Thread.sleep(forTimeInterval: 0.001)
-        }
-        return !service._test_isPanicIngressOpen
-    }
-}
-
 private func makeService() -> BLEService {
     let keychain = MockKeychain()
     let identityManager = MockIdentityManager(keychain)
@@ -1031,18 +690,6 @@ private func makePublicPacket(content: String, sender: PeerID, timestamp: UInt64
     )
 }
 
-private func makeLeavePacket(sender: PeerID, marker: String) -> BitchatPacket {
-    BitchatPacket(
-        type: MessageType.leave.rawValue,
-        senderID: Data(hexString: sender.id) ?? Data(),
-        recipientID: nil,
-        timestamp: UInt64(Date().timeIntervalSince1970 * 1000),
-        payload: Data(marker.utf8),
-        signature: nil,
-        ttl: TransportConfig.messageTTLDefault
-    )
-}
-
 private final class PublicCaptureDelegate: BitchatDelegate {
     private let lock = NSLock()
     private(set) var publicMessages: [BitchatMessage] = []
@@ -1077,13 +724,3 @@ private final class PublicCaptureDelegate: BitchatDelegate {
         return publicMessages
     }
 }
-
-@MainActor
-private final class TransportEventCaptureDelegate: TransportEventDelegate {
-    private(set) var messageIDs: [String] = []
-
-    func didReceiveTransportEvent(_ event: TransportEvent) {
-        guard case .messageReceived(let message) = event else { return }
-        messageIDs.append(message.id)
-    }
-}

bitchatTests/ChatMediaTransferCoordinatorContextTests.swift

@@ -16,11 +16,6 @@
 import Testing
 import Foundation
 import BitFoundation
-#if os(iOS)
-import UIKit
-#else
-import AppKit
-#endif
 @testable import bitchat
 
 // MARK: - Mock Context
@@ -193,114 +188,6 @@ struct ChatMediaTransferCoordinatorContextTests {
         #expect(coordinator.messageIDToTransferId.isEmpty)
     }
 
-    @Test @MainActor
-    func resetForPanic_cancelsEveryTransportTransferAndClearsMappings() {
-        let context = MockChatMediaTransferContext()
-        let coordinator = ChatMediaTransferCoordinator(context: context)
-        coordinator.registerTransfer(transferId: "t1", messageID: "m1")
-        coordinator.registerTransfer(transferId: "t1", messageID: "m2")
-        coordinator.registerTransfer(transferId: "t2", messageID: "m3")
-
-        coordinator.resetForPanic()
-
-        #expect(Set(context.cancelledTransfers) == Set(["t1", "t2"]))
-        #expect(coordinator.transferIdToMessageIDs.isEmpty)
-        #expect(coordinator.messageIDToTransferId.isEmpty)
-    }
-
-    @Test @MainActor
-    func resetForPanic_waitsForActiveImageWriterBeforeReturning() async throws {
-        let context = MockChatMediaTransferContext()
-        let sourceURL = try makeCoordinatorTestImageURL()
-        let outputURL = FileManager.default.temporaryDirectory
-            .appendingPathComponent("panic-prepared-\(UUID().uuidString).jpg")
-        let preparer = PausedImagePreparer(outputURL: outputURL)
-        let coordinator = ChatMediaTransferCoordinator(
-            context: context,
-            prepareImagePacket: { sourceURL in
-                try preparer.prepare(sourceURL)
-            }
-        )
-        defer {
-            preparer.release()
-            try? FileManager.default.removeItem(at: sourceURL)
-            try? FileManager.default.removeItem(at: outputURL)
-        }
-
-        coordinator.sendImage(from: sourceURL)
-        #expect(await TestHelpers.waitUntil(
-            { preparer.hasStarted },
-            timeout: TestConstants.longTimeout
-        ))
-
-        DispatchQueue.global(qos: .userInitiated).asyncAfter(
-            deadline: .now() + .milliseconds(100)
-        ) {
-            preparer.release()
-        }
-        coordinator.resetForPanic()
-
-        // The synchronous reset boundary cannot return while a pre-panic
-        // writer can still create output. The real panic path deletes media
-        // immediately after this method returns.
-        #expect(preparer.hasFinished)
-
-        try? FileManager.default.removeItem(at: outputURL)
-        #expect(await TestHelpers.waitUntil(
-            { !FileManager.default.fileExists(atPath: outputURL.path) },
-            timeout: TestConstants.longTimeout
-        ))
-        await Task.yield()
-        #expect(context.privateFileSends.isEmpty)
-        #expect(context.broadcastFileSends.isEmpty)
-        #expect(context.systemMessages.isEmpty)
-    }
-
-    @Test @MainActor
-    func imagePreparation_doesNotRetainCoordinatorOrDeallocatedContext() async throws {
-        let sourceURL = try makeCoordinatorTestImageURL()
-        let outputURL = FileManager.default.temporaryDirectory
-            .appendingPathComponent("released-context-\(UUID().uuidString).jpg")
-        let preparer = PausedImagePreparer(outputURL: outputURL)
-        var context: MockChatMediaTransferContext? = MockChatMediaTransferContext()
-        var coordinator: ChatMediaTransferCoordinator? = ChatMediaTransferCoordinator(
-            context: context!,
-            prepareImagePacket: { sourceURL in
-                try preparer.prepare(sourceURL)
-            }
-        )
-        weak var weakContext: MockChatMediaTransferContext?
-        weak var weakCoordinator: ChatMediaTransferCoordinator?
-        weakContext = context
-        weakCoordinator = coordinator
-        defer {
-            preparer.release()
-            try? FileManager.default.removeItem(at: sourceURL)
-            try? FileManager.default.removeItem(at: outputURL)
-        }
-
-        coordinator?.sendImage(from: sourceURL)
-        #expect(await TestHelpers.waitUntil(
-            { preparer.hasStarted },
-            timeout: TestConstants.longTimeout
-        ))
-
-        coordinator = nil
-        context = nil
-        #expect(weakCoordinator == nil)
-        #expect(weakContext == nil)
-
-        preparer.release()
-        #expect(await TestHelpers.waitUntil(
-            { preparer.hasFinished },
-            timeout: TestConstants.longTimeout
-        ))
-        #expect(await TestHelpers.waitUntil(
-            { !FileManager.default.fileExists(atPath: outputURL.path) },
-            timeout: TestConstants.longTimeout
-        ))
-    }
-
     @Test @MainActor
     func sendVoiceNote_blockedContextRemovesFileAndExplains() async throws {
         let context = MockChatMediaTransferContext()
@@ -320,91 +207,3 @@ struct ChatMediaTransferCoordinatorContextTests {
         #expect(coordinator.transferIdToMessageIDs.isEmpty)
     }
 }
-
-private final class PausedImagePreparer: @unchecked Sendable {
-    private let condition = NSCondition()
-    private let outputURL: URL
-    private var started = false
-    private var released = false
-    private var finished = false
-
-    init(outputURL: URL) {
-        self.outputURL = outputURL
-    }
-
-    var hasStarted: Bool {
-        condition.lock()
-        defer { condition.unlock() }
-        return started
-    }
-
-    var hasFinished: Bool {
-        condition.lock()
-        defer { condition.unlock() }
-        return finished
-    }
-
-    func prepare(_ _: URL) throws -> ChatPreparedImage {
-        condition.lock()
-        started = true
-        condition.broadcast()
-        while !released {
-            condition.wait()
-        }
-        condition.unlock()
-
-        let data = Data("prepared image".utf8)
-        try data.write(to: outputURL, options: .atomic)
-        let packet = BitchatFilePacket(
-            fileName: outputURL.lastPathComponent,
-            fileSize: UInt64(data.count),
-            mimeType: "image/jpeg",
-            content: data
-        )
-
-        condition.lock()
-        finished = true
-        condition.broadcast()
-        condition.unlock()
-        return ChatPreparedImage(outputURL: outputURL, packet: packet)
-    }
-
-    func release() {
-        condition.lock()
-        released = true
-        condition.broadcast()
-        condition.unlock()
-    }
-}
-
-private func makeCoordinatorTestImageURL() throws -> URL {
-    let url = FileManager.default.temporaryDirectory
-        .appendingPathComponent("coordinator-image-\(UUID().uuidString).png")
-    #if os(iOS)
-    let image = UIGraphicsImageRenderer(size: CGSize(width: 16, height: 16))
-        .image { context in
-            UIColor.systemBlue.setFill()
-            context.fill(CGRect(x: 0, y: 0, width: 16, height: 16))
-        }
-    guard let data = image.pngData() else {
-        throw CoordinatorImageTestError.encodingFailed
-    }
-    #else
-    let image = NSImage(size: NSSize(width: 16, height: 16))
-    image.lockFocus()
-    NSColor.systemBlue.setFill()
-    NSRect(x: 0, y: 0, width: 16, height: 16).fill()
-    image.unlockFocus()
-    guard let tiff = image.tiffRepresentation,
-          let bitmap = NSBitmapImageRep(data: tiff),
-          let data = bitmap.representation(using: .png, properties: [:]) else {
-        throw CoordinatorImageTestError.encodingFailed
-    }
-    #endif
-    try data.write(to: url, options: .atomic)
-    return url
-}
-
-private enum CoordinatorImageTestError: Error {
-    case encodingFailed
-}

bitchatTests/ChatViewModelTests.swift

@@ -15,13 +15,8 @@ import BitFoundation
 
 /// Creates a ChatViewModel with mock dependencies for testing
 @MainActor
-private func makeTestableViewModel(
-    keychain injectedKeychain: MockKeychain? = nil,
-    panicMediaWipe: (() throws -> Void)? = nil,
-    panicRecoveryOperations: PanicRecoveryOperations? = nil,
-    panicNetworkLifecycle: PanicNetworkLifecycle = .noop
-) -> (viewModel: ChatViewModel, transport: MockTransport) {
-    let keychain = injectedKeychain ?? MockKeychain()
+private func makeTestableViewModel() -> (viewModel: ChatViewModel, transport: MockTransport) {
+    let keychain = MockKeychain()
     let keychainHelper = MockKeychainHelper()
     let idBridge = NostrIdentityBridge(keychain: keychainHelper)
     let identityManager = MockIdentityManager(keychain)
@@ -31,10 +26,7 @@ private func makeTestableViewModel(
         keychain: keychain,
         idBridge: idBridge,
         identityManager: identityManager,
-        transport: transport,
-        panicMediaWipe: panicMediaWipe,
-        panicRecoveryOperations: panicRecoveryOperations,
-        panicNetworkLifecycle: panicNetworkLifecycle
+        transport: transport
     )
 
     return (viewModel, transport)
@@ -654,25 +646,6 @@ struct ChatViewModelFormattingTests {
         #expect(String(formatted.characters) == "<@Alice#a1b2> hello #mesh [\(message.formattedTimestamp)]")
     }
 
-    @Test @MainActor
-    func formatMessageAsText_longCashuFallsBackToPlain() async {
-        let (viewModel, _) = makeTestableViewModel()
-        let cashu = "cashuA" + String(repeating: "a", count: 40)
-        let longContent = "hi @bob " + cashu + " " + String(repeating: "x", count: 4_100)
-        let message = BitchatMessage(
-            id: "fmt-long-cashu",
-            sender: "Alice#a1b2",
-            content: longContent,
-            timestamp: Date(timeIntervalSince1970: 1_700_010_123),
-            isRelay: false,
-            senderPeerID: PeerID(str: "00000000000000b3")
-        )
-
-        let formatted = viewModel.formatMessageAsText(message, colorScheme: .light)
-
-        #expect(String(formatted.characters) == "<@Alice#a1b2> \(longContent) [\(message.formattedTimestamp)]")
-    }
-
     @Test @MainActor
     func formatMessageHeader_formatsSenderHeader() async {
         let (viewModel, _) = makeTestableViewModel()
@@ -1124,159 +1097,6 @@ struct ChatViewModelBluetoothTests {
 
 struct ChatViewModelPanicTests {
 
-    @Test @MainActor
-    func panicClearAllData_finishesMediaWipeBeforeReturning() {
-        var wipeFinished = false
-        let (viewModel, _) = makeTestableViewModel(panicMediaWipe: {
-            wipeFinished = true
-        })
-
-        viewModel.panicClearAllData()
-
-        #expect(wipeFinished)
-    }
-
-    @Test @MainActor
-    func panicClearAllData_stopsNetworkBeforeWipeAndRestartsAfterCommit() {
-        var events: [String] = []
-        let lifecycle = PanicNetworkLifecycle(
-            stop: { events.append("stop") },
-            restart: { events.append("restart") }
-        )
-        let (viewModel, _) = makeTestableViewModel(
-            panicMediaWipe: { events.append("wipe") },
-            panicNetworkLifecycle: lifecycle
-        )
-
-        let completed = viewModel.panicClearAllData()
-
-        #expect(completed)
-        #expect(events == ["stop", "wipe", "restart"])
-        #expect(viewModel.networkActivationAllowed)
-    }
-
-    @Test @MainActor
-    func panicKeychainFailureKeepsRecoveryPendingAndServicesStopped() {
-        let keychain = MockKeychain()
-        keychain.simulatedDeleteAllResult = false
-        var events: [String] = []
-        let operations = PanicRecoveryOperations(
-            isPending: { false },
-            begin: {
-                events.append("begin")
-                return PanicRecoveryIntent(
-                    fileMarkerEstablished: true,
-                    externalMarkerEstablished: false
-                )
-            },
-            wipeMedia: { _ in events.append("wipe") },
-            complete: { events.append("complete") }
-        )
-        let lifecycle = PanicNetworkLifecycle(
-            stop: { events.append("stop") },
-            restart: { events.append("restart") }
-        )
-        let (viewModel, transport) = makeTestableViewModel(
-            keychain: keychain,
-            panicRecoveryOperations: operations,
-            panicNetworkLifecycle: lifecycle
-        )
-        let startsBeforePanic = transport.startServicesCallCount
-
-        let completed = viewModel.panicClearAllData()
-
-        #expect(!completed)
-        #expect(events == ["stop", "begin", "wipe"])
-        #expect(keychain.deleteAllCallCount == 1)
-        #expect(transport.startServicesCallCount == startsBeforePanic)
-        #expect(!viewModel.networkActivationAllowed)
-    }
-
-    @Test @MainActor
-    func pendingPanicRecoveryCompletesBeforeTransportBootstrap() {
-        var events: [String] = []
-        let operations = PanicRecoveryOperations(
-            isPending: {
-                events.append("read")
-                return true
-            },
-            begin: {
-                events.append("begin")
-                return PanicRecoveryIntent(
-                    fileMarkerEstablished: true,
-                    externalMarkerEstablished: false
-                )
-            },
-            wipeMedia: { _ in events.append("wipe") },
-            complete: { events.append("complete") }
-        )
-
-        let (viewModel, transport) = makeTestableViewModel(
-            panicRecoveryOperations: operations
-        )
-
-        #expect(events == ["read", "begin", "wipe", "complete"])
-        #expect(transport.emergencyDisconnectCallCount == 1)
-        #expect(transport.startServicesCallCount == 1)
-        #expect(viewModel.networkActivationAllowed)
-    }
-
-    @Test @MainActor
-    func failedStartupRecoveryLeavesTransportAndNetworkBlocked() {
-        enum WipeFailure: Error { case failed }
-        var completedMarker = false
-        let operations = PanicRecoveryOperations(
-            isPending: { true },
-            begin: {
-                PanicRecoveryIntent(
-                    fileMarkerEstablished: true,
-                    externalMarkerEstablished: false
-                )
-            },
-            wipeMedia: { _ in throw WipeFailure.failed },
-            complete: { completedMarker = true }
-        )
-
-        let (viewModel, transport) = makeTestableViewModel(
-            panicRecoveryOperations: operations
-        )
-
-        #expect(!completedMarker)
-        #expect(transport.emergencyDisconnectCallCount == 1)
-        #expect(transport.startServicesCallCount == 0)
-        #expect(!viewModel.networkActivationAllowed)
-    }
-
-    @Test @MainActor
-    func failedStartupKeychainRecoveryLeavesIntentAndTransportBlocked() {
-        let keychain = MockKeychain()
-        keychain.simulatedDeleteAllResult = false
-        var events: [String] = []
-        let operations = PanicRecoveryOperations(
-            isPending: { true },
-            begin: {
-                events.append("begin")
-                return PanicRecoveryIntent(
-                    fileMarkerEstablished: true,
-                    externalMarkerEstablished: true
-                )
-            },
-            wipeMedia: { _ in events.append("wipe") },
-            complete: { events.append("complete") }
-        )
-
-        let (viewModel, transport) = makeTestableViewModel(
-            keychain: keychain,
-            panicRecoveryOperations: operations
-        )
-
-        #expect(events == ["begin", "wipe"])
-        #expect(keychain.deleteAllCallCount == 1)
-        #expect(transport.emergencyDisconnectCallCount == 1)
-        #expect(transport.startServicesCallCount == 0)
-        #expect(!viewModel.networkActivationAllowed)
-    }
-
     @Test @MainActor
     func panicClearAllData_delegatesToTransport() async {
         let (viewModel, transport) = makeTestableViewModel()

bitchatTests/MessageFormattingEngineTests.swift

@@ -323,32 +323,6 @@ struct MessageFormattingEngineTests {
         // Exactly at threshold DOES trigger (uses >= comparison)
         #expect(content.hasVeryLongToken(threshold: 50))
     }
-
-    @Test func isLongForDisplay_doesNotIgnoreCashuLinks() {
-        let cashu = "cashuA" + String(repeating: "a", count: 40)
-        let content = String(repeating: "a", count: TransportConfig.uiLongMessageLengthThreshold + 1) + " " + cashu
-
-        #expect(content.extractCashuLinks().count == 1)
-        #expect(content.isLongForDisplay())
-    }
-
-    @MainActor
-    @Test func formatMessage_longCashuMessageFallsBackToPlainContentPath() {
-        let context = MockMessageFormattingContext(nickname: "carol")
-        let cashu = "cashuA" + String(repeating: "a", count: 40)
-        let longContent = "hi @bob " + cashu + " " + String(repeating: "x", count: 4_100)
-        let message = BitchatMessage(
-            id: "long-cashu",
-            sender: "alice",
-            content: longContent,
-            timestamp: Date(timeIntervalSince1970: 1_700_000_999),
-            isRelay: false
-        )
-
-        let formatted = MessageFormattingEngine.formatMessage(message, context: context, colorScheme: .light)
-
-        #expect(String(formatted.characters) == "<@alice> \(longContent) [\(message.formattedTimestamp)]")
-    }
 }
 
 @MainActor

bitchatTests/MessageRateLimiterTests.swift

@@ -116,87 +116,4 @@ struct MessageRateLimiterTests {
         #expect(plain)
         #expect(!plainExhausted)
     }
-
-    @Test("Content buckets do not grow when sender is rate limited")
-    func contentBucketsDoNotGrowAfterSenderLimit() {
-        var limiter = MessageRateLimiter(
-            senderCapacity: 1,
-            senderRefillPerSec: 0,
-            contentCapacity: 1,
-            contentRefillPerSec: 0,
-            maxSenderBuckets: 10,
-            maxContentBuckets: 10,
-            bucketIdleTTL: 60
-        )
-        let now = Date()
-
-        let first = limiter.allow(senderKey: "sender", contentKey: "content-0", now: now)
-        var rejected = true
-        for index in 1...100 {
-            if limiter.allow(senderKey: "sender", contentKey: "content-\(index)", now: now) {
-                rejected = false
-            }
-        }
-
-        #expect(first)
-        #expect(rejected)
-        #expect(limiter.bucketCountsForTesting.sender == 1)
-        #expect(limiter.bucketCountsForTesting.content == 1)
-    }
-
-    @Test("Bucket maps evict entries at configured caps")
-    func bucketMapsEvictAtConfiguredCaps() {
-        let maxEntries = 3
-        var limiter = MessageRateLimiter(
-            senderCapacity: 1,
-            senderRefillPerSec: 0,
-            contentCapacity: 1,
-            contentRefillPerSec: 0,
-            maxSenderBuckets: maxEntries,
-            maxContentBuckets: maxEntries,
-            bucketIdleTTL: 60
-        )
-        let now = Date()
-
-        for index in 0..<25 {
-            _ = limiter.allow(
-                senderKey: "sender-\(index)",
-                contentKey: "content-\(index)",
-                now: now.addingTimeInterval(TimeInterval(index))
-            )
-        }
-
-        #expect(limiter.bucketCountsForTesting.sender == maxEntries)
-        #expect(limiter.bucketCountsForTesting.content == maxEntries)
-    }
-
-    @Test("PoW bypass still creates content buckets under the cap")
-    func powBypassCreatesBoundedContentBuckets() {
-        let maxEntries = 3
-        var limiter = MessageRateLimiter(
-            senderCapacity: 1,
-            senderRefillPerSec: 0,
-            contentCapacity: 100,
-            contentRefillPerSec: 0,
-            maxSenderBuckets: maxEntries,
-            maxContentBuckets: maxEntries,
-            bucketIdleTTL: 60
-        )
-        let now = Date()
-
-        var allAllowed = true
-        for index in 0..<10 {
-            let allowed = limiter.allow(
-                senderKey: "sender",
-                contentKey: "content-\(index)",
-                powBits: NostrPoW.rateLimitBypassBits,
-                now: now.addingTimeInterval(TimeInterval(index))
-            )
-            if !allowed { allAllowed = false }
-        }
-
-        #expect(allAllowed)
-        #expect(limiter.bucketCountsForTesting.sender == 0)
-        #expect(limiter.bucketCountsForTesting.content == maxEntries)
-    }
 }

bitchatTests/Mocks/MockKeychain.swift

@@ -18,8 +18,6 @@ final class MockKeychain: KeychainManagerProtocol {
     var simulatedReadError: KeychainReadResult?
     var simulatedSaveError: KeychainSaveResult?
     var simulatedGenericReadError: KeychainReadResult?
-    var simulatedDeleteAllResult = true
-    private(set) var deleteAllCallCount = 0
 
     func saveIdentityKey(_ keyData: Data, forKey key: String) -> Bool {
         storage[key] = keyData
@@ -36,8 +34,6 @@ final class MockKeychain: KeychainManagerProtocol {
     }
 
     func deleteAllKeychainData() -> Bool {
-        deleteAllCallCount += 1
-        guard simulatedDeleteAllResult else { return false }
         storage.removeAll()
         serviceStorage.removeAll()
         return true

bitchatTests/Noise/NoiseCoverageTests.swift

@@ -12,15 +12,8 @@ struct NoiseCoverageTests {
     private let bobStaticKey = Curve25519.KeyAgreement.PrivateKey()
     private let charlieStaticKey = Curve25519.KeyAgreement.PrivateKey()
 
-    // Manager test dictionaries are keyed by the remote peer. Keep the
-    // historical names, but derive each wire ID from the static key that the
-    // corresponding manager authenticates during the handshake.
-    private var alicePeerID: PeerID {
-        PeerID(publicKey: bobStaticKey.publicKey.rawRepresentation)
-    }
-    private var bobPeerID: PeerID {
-        PeerID(publicKey: aliceStaticKey.publicKey.rawRepresentation)
-    }
+    private let alicePeerID = PeerID(str: "0011223344556677")
+    private let bobPeerID = PeerID(str: "8899aabbccddeeff")
     private let charliePeerID = PeerID(str: "fedcba9876543210")
 
     @Test("Protocol metadata and handshake patterns expose expected values")

bitchatTests/Nostr/GeoRelayDirectoryTests.swift

@@ -5,19 +5,25 @@ import XCTest
 
 @MainActor
 final class GeoRelayDirectoryTests: XCTestCase {
-    func test_parseCSV_normalizesRelaySchemesAndDeduplicatesEntries() {
+    private func parse(_ csv: String) -> [GeoRelayDirectory.Entry] {
+        GeoRelayDirectory.validatedEntries(
+            from: Data(csv.utf8),
+            policy: .live,
+            minimumEntries: 1
+        ) ?? []
+    }
+
+    func test_parseCSV_normalizesSecureRelaySchemesAndDeduplicatesEntries() {
         let csv = """
         relay url,lat,lon
         wss://one.example/,10,20
         https://one.example,10,20
         wss://one.example:443/,10,20
-        http://two.example/,11,21
+        two.example,11,21
         wss://two.example:443,11,21
-        invalid row
-        ws://three.example,not-a-lat,22
         """
 
-        let parsed = Set(GeoRelayDirectory.parseCSV(csv))
+        let parsed = Set(parse(csv))
 
         XCTAssertEqual(
             parsed,
@@ -28,6 +34,136 @@ final class GeoRelayDirectoryTests: XCTestCase {
         )
     }
 
+    func test_parseCSV_rejectsWholeDatasetWhenAnyRowOrHeaderIsUnsafe() {
+        let invalidCSVs = [
+            "relay,lat,lon\nrelay.example,1,2\n",
+            "relay url,lat,lon\nrelay.example,1\n",
+            "relay url,lat,lon\nhttp://relay.example,1,2\n",
+            "relay url,lat,lon\nwss://user@relay.example,1,2\n",
+            "relay url,lat,lon\nwss://relay.example/path,1,2\n",
+            "relay url,lat,lon\nwss://relay.example?,1,2\n",
+            "relay url,lat,lon\nwss://relay.example#,1,2\n",
+            "relay url,lat,lon\nrelay.example:0,1,2\n",
+            "relay url,lat,lon\nrelay.example:99999,1,2\n",
+            "relay url,lat,lon\nlocalhost,1,2\n",
+            "relay url,lat,lon\nr\u{00e9}lay.example,1,2\n",
+            "relay url,lat,lon\nrelay\u{202e}.example,1,2\n",
+            "relay url,lat,lon\nrelay.example,NaN,2\n",
+            "relay url,lat,lon\nrelay.example,1_0,2\n",
+            "relay url,lat,lon\nrelay.example,\u{0661}\u{0660},2\n",
+            "relay url,lat,lon\nrelay.example,\u{ff11}\u{ff10},2\n",
+            "relay url,lat,lon\nrelay.example,91,2\n",
+            "relay url,lat,lon\nrelay.example,1,181\n",
+            "relay url,lat,lon\nrelay.example,1,2\nrelay.example,3,4\n"
+        ]
+
+        for csv in invalidCSVs {
+            XCTAssertTrue(parse(csv).isEmpty, csv)
+        }
+    }
+
+    func test_validatedEntries_enforcesByteRowEntryAndRetentionLimits() {
+        let restrictive = GeoRelayDirectoryValidationPolicy(
+            maximumBytes: 100,
+            maximumRows: 2,
+            maximumEntries: 2,
+            minimumRemoteEntries: 1,
+            minimumRetainedFraction: 0.5
+        )
+        let one = Data("relay url,lat,lon\none.example,1,2\n".utf8)
+        let three = Data("relay url,lat,lon\none.example,1,2\ntwo.example,3,4\nthree.example,5,6\n".utf8)
+
+        XCTAssertNil(GeoRelayDirectory.validatedEntries(
+            from: one,
+            policy: restrictive,
+            minimumEntries: 2
+        ))
+        XCTAssertNil(GeoRelayDirectory.validatedEntries(
+            from: Data(repeating: 0x41, count: 101),
+            policy: restrictive,
+            minimumEntries: 1
+        ))
+        XCTAssertNil(GeoRelayDirectory.validatedEntries(
+            from: three,
+            policy: restrictive,
+            minimumEntries: 1
+        ))
+    }
+
+    func test_validatedEntries_requiresExactBaselineEntryOverlap() throws {
+        let policy = GeoRelayDirectoryValidationPolicy(
+            maximumBytes: 1_000,
+            maximumRows: 10,
+            maximumEntries: 10,
+            minimumRemoteEntries: 1,
+            minimumRetainedFraction: 0.5
+        )
+        let baseline = Set(try XCTUnwrap(GeoRelayDirectory.validatedEntries(
+            from: Data("""
+            relay url,lat,lon
+            one.example,1,1
+            two.example,2,2
+            three.example,3,3
+            """.utf8),
+            policy: policy,
+            minimumEntries: 1
+        )))
+        let disjoint = Data("""
+        relay url,lat,lon
+        four.example,1,1
+        five.example,2,2
+        six.example,3,3
+        """.utf8)
+        let rewrittenCoordinates = Data("""
+        relay url,lat,lon
+        one.example,11,11
+        two.example,12,12
+        three.example,13,13
+        """.utf8)
+        let halfRetained = Data("""
+        relay url,lat,lon
+        wss://one.example:443/,1,1
+        https://two.example/,2,2
+        replacement.example,4,4
+        """.utf8)
+
+        XCTAssertNil(GeoRelayDirectory.validatedEntries(
+            from: disjoint,
+            policy: policy,
+            minimumEntries: 1,
+            baselineEntries: baseline
+        ))
+        XCTAssertNil(GeoRelayDirectory.validatedEntries(
+            from: rewrittenCoordinates,
+            policy: policy,
+            minimumEntries: 1,
+            baselineEntries: baseline
+        ))
+        XCTAssertNotNil(GeoRelayDirectory.validatedEntries(
+            from: halfRetained,
+            policy: policy,
+            minimumEntries: 1,
+            baselineEntries: baseline
+        ))
+    }
+
+    func test_bundledReviewedCSV_passesStrictProductionValidation() throws {
+        let repositoryRoot = URL(fileURLWithPath: #filePath)
+            .deletingLastPathComponent()
+            .deletingLastPathComponent()
+            .deletingLastPathComponent()
+        let data = try Data(
+            contentsOf: repositoryRoot.appendingPathComponent("relays/online_relays_gps.csv")
+        )
+
+        let entries = try XCTUnwrap(GeoRelayDirectory.validatedEntries(
+            from: data,
+            policy: .live,
+            minimumEntries: GeoRelayDirectoryValidationPolicy.live.minimumRemoteEntries
+        ))
+        XCTAssertGreaterThan(entries.count, 250)
+    }
+
     func test_closestRelays_sortsByDistanceForLatLonAndGeohash() {
         let harness = makeHarness(
             cacheCSV: """
@@ -243,6 +379,53 @@ final class GeoRelayDirectoryTests: XCTestCase {
         XCTAssertFalse(directory.debugHasRetryTask)
     }
 
+    func test_prefetchIfNeeded_rejectsSharpValidLookingTruncationBeforeCaching() async {
+        let cached = """
+        relay url,lat,lon
+        old-one.example,1,1
+        old-two.example,2,2
+        old-three.example,3,3
+        """
+        let truncated = """
+        relay url,lat,lon
+        attacker.example,9,9
+        """
+        let recovered = """
+        relay url,lat,lon
+        old-one.example,1,1
+        old-two.example,2,2
+        new-three.example,6,6
+        """
+        let harness = makeHarness(
+            cacheCSV: cached,
+            fetchResults: [
+                .success(Data(truncated.utf8)),
+                .success(Data(recovered.utf8))
+            ],
+            validationPolicy: GeoRelayDirectoryValidationPolicy(
+                maximumBytes: 64 * 1024,
+                maximumRows: 1_000,
+                maximumEntries: 1_000,
+                minimumRemoteEntries: 1,
+                minimumRetainedFraction: 0.5
+            )
+        )
+        let directory = GeoRelayDirectory(dependencies: harness.dependencies)
+
+        directory.prefetchIfNeeded()
+
+        let refreshed = await waitUntil {
+            directory.entries.contains(where: { $0.host == "new-three.example" })
+        }
+        XCTAssertTrue(refreshed)
+        XCTAssertFalse(directory.entries.contains(where: { $0.host == "attacker.example" }))
+        let requestCount = await harness.fetcher.recordedRequestCount()
+        let retryDelays = await harness.retryRecorder.recordedDelays()
+        XCTAssertEqual(requestCount, 2)
+        XCTAssertEqual(retryDelays, [5])
+        XCTAssertEqual(harness.fileStore.dataByURL[harness.cacheURL], Data(recovered.utf8))
+    }
+
     func test_observers_triggerPrefetchesForTorReadyAndAppActivation() async {
         let activeNotification = Notification.Name("GeoRelayDirectoryTests.didBecomeActive")
         let harness = makeHarness(
@@ -289,7 +472,14 @@ final class GeoRelayDirectoryTests: XCTestCase {
         fetchFactoryObserver: (@MainActor @Sendable () -> Void)? = nil,
         fetchObserver: (@Sendable () async -> Void)? = nil,
         autoStart: Bool = false,
-        activeNotificationName: Notification.Name? = nil
+        activeNotificationName: Notification.Name? = nil,
+        validationPolicy: GeoRelayDirectoryValidationPolicy = GeoRelayDirectoryValidationPolicy(
+            maximumBytes: 64 * 1024,
+            maximumRows: 1_000,
+            maximumEntries: 1_000,
+            minimumRemoteEntries: 1,
+            minimumRetainedFraction: 0
+        )
     ) -> GeoRelayHarness {
         let userDefaultsSuite = "GeoRelayDirectoryTests.\(UUID().uuidString)"
         let userDefaults = UserDefaults(suiteName: userDefaultsSuite)!
@@ -347,7 +537,8 @@ final class GeoRelayDirectoryTests: XCTestCase {
                 await retryRecorder.record(delay)
             },
             activeNotificationName: activeNotificationName,
-            autoStart: autoStart
+            autoStart: autoStart,
+            validationPolicy: validationPolicy
         )
 
         return GeoRelayHarness(

bitchatTests/NostrProtocolTests.swift

@@ -290,65 +290,7 @@ struct NostrProtocolTests {
         #expect(object["limit"] as? Int == 42)
     }
 
-
-    @Test func inboundNostrEventRejectsTooManyTags() throws {
-        var eventDict = Self.validInboundEventDict()
-        eventDict["tags"] = Array(
-            repeating: ["g", "u4pruyd"],
-            count: TransportConfig.nostrMaxEventTags + 1
-        )
-
-        #expect(throws: NostrError.invalidEvent) {
-            _ = try NostrEvent(from: eventDict)
-        }
-    }
-
-    @Test func inboundNostrEventRejectsTooManyTagValues() throws {
-        var eventDict = Self.validInboundEventDict()
-        eventDict["tags"] = [Array(
-            repeating: "value",
-            count: TransportConfig.nostrMaxEventTagValues + 1
-        )]
-
-        #expect(throws: NostrError.invalidEvent) {
-            _ = try NostrEvent(from: eventDict)
-        }
-    }
-
-    @Test func inboundNostrEventRejectsOversizedTagValues() throws {
-        var eventDict = Self.validInboundEventDict()
-        eventDict["tags"] = [[
-            "g",
-            String(repeating: "a", count: TransportConfig.nostrMaxEventTagValueBytes + 1)
-        ]]
-
-        #expect(throws: NostrError.invalidEvent) {
-            _ = try NostrEvent(from: eventDict)
-        }
-    }
-
-    @Test func inboundNostrEventAcceptsTagsWithinLimits() throws {
-        var eventDict = Self.validInboundEventDict()
-        eventDict["tags"] = [["g", "u4pruyd"], ["t", "teleport"]]
-
-        let event = try NostrEvent(from: eventDict)
-
-        #expect(event.tags.count == 2)
-    }
-
     // MARK: - Helpers
-    private static func validInboundEventDict() -> [String: Any] {
-        [
-            "id": String(repeating: "0", count: 64),
-            "pubkey": String(repeating: "1", count: 64),
-            "created_at": 1_234_567,
-            "kind": NostrProtocol.EventKind.ephemeralEvent.rawValue,
-            "tags": [["g", "u4pruyd"]],
-            "content": "hello",
-            "sig": String(repeating: "2", count: 128)
-        ]
-    }
-
     private static func base64URLDecode(_ s: String) -> Data? {
         var str = s.replacingOccurrences(of: "-", with: "+").replacingOccurrences(of: "_", with: "/")
         let rem = str.count % 4

bitchatTests/PreviewKeychainManagerTests.swift

@@ -1,103 +1,10 @@
 import Foundation
-import Security
 import Testing
-import BitFoundation
 @testable import bitchat
 
 @Suite("PreviewKeychainManager Tests")
 struct PreviewKeychainManagerTests {
 
-    @Test("Install lifecycle distinguishes upgrade, reinstall, bootstrap, and unreadable keychain")
-    func installLifecycleDecision() {
-        #expect(KeychainManager.installLifecycleAction(
-            containerKnowsMarker: true,
-            markerRead: .success(Data([1]))
-        ) == .markerPresent)
-        #expect(KeychainManager.installLifecycleAction(
-            containerKnowsMarker: false,
-            markerRead: .success(Data([1]))
-        ) == .clearStaleKeys)
-        #expect(KeychainManager.installLifecycleAction(
-            containerKnowsMarker: false,
-            markerRead: .itemNotFound
-        ) == .bootstrapMarker)
-        #expect(KeychainManager.installLifecycleAction(
-            containerKnowsMarker: false,
-            markerRead: .deviceLocked
-        ) == .retryLater)
-        #expect(KeychainManager.installLifecycleAction(
-            containerKnowsMarker: false,
-            cleanupPending: true,
-            markerRead: .itemNotFound
-        ) == .clearStaleKeys)
-    }
-
-    @Test("Accessibility migration covers custom services and retries after any incomplete update")
-    func accessibilityMigrationCoversEveryApplicationOwnedService() {
-        let primaryService = "chat.bitchat.test-primary"
-        var visitedServices: [String] = []
-
-        let completed = KeychainManager
-            .migrateAccessibilityForApplicationOwnedServices(
-                primaryService: primaryService
-            ) { service in
-                visitedServices.append(service)
-                return service == "chat.bitchat.favorites"
-                    ? errSecInteractionNotAllowed
-                    : errSecItemNotFound
-            }
-
-        #expect(!completed)
-        #expect(visitedServices.first == primaryService)
-        #expect(Set(visitedServices).isSuperset(of: [
-            "chat.bitchat.nostr",
-            "chat.bitchat.favorites",
-            "chat.bitchat.outbox"
-        ]))
-        #expect(Set(visitedServices).count == visitedServices.count)
-
-        let retryCompleted = KeychainManager
-            .migrateAccessibilityForApplicationOwnedServices(
-                primaryService: primaryService
-            ) { _ in errSecSuccess }
-        #expect(retryCompleted)
-    }
-
-    @Test("Keychain cleanup is complete only when every owned scope is clean")
-    func keychainCleanupRequiresEveryApplicationOwnedService() {
-        let primaryService = "chat.bitchat.test-primary"
-        var visitedServices: [String] = []
-
-        let partialCleanup = KeychainManager
-            .deleteApplicationOwnedKeychainServices(
-                primaryService: primaryService
-            ) { service in
-                visitedServices.append(service)
-                return service == "chat.bitchat.outbox"
-                    ? errSecInteractionNotAllowed
-                    : errSecSuccess
-            }
-
-        #expect(!partialCleanup)
-        #expect(visitedServices.first == primaryService)
-        #expect(Set(visitedServices).isSuperset(of: [
-            "chat.bitchat.nostr",
-            "chat.bitchat.favorites",
-            "chat.bitchat.outbox"
-        ]))
-        #expect(Set(visitedServices).count == visitedServices.count)
-
-        let emptyCleanup = KeychainManager
-            .deleteApplicationOwnedKeychainServices(
-                primaryService: primaryService
-            ) { _ in errSecItemNotFound }
-        #expect(emptyCleanup)
-        #expect(KeychainManager.completedApplicationGroupDelete(status: -34018))
-        #expect(!KeychainManager.completedApplicationGroupDelete(
-            status: errSecInteractionNotAllowed
-        ))
-    }
-
     @Test("Preview keychain manager stores identity and service-scoped data in memory")
     func previewKeychainManagerRoundTripsData() {
         let manager = PreviewKeychainManager()
@@ -144,132 +51,4 @@ struct PreviewKeychainManagerTests {
             Issue.record("Expected preview keychain to be empty after deleteAllKeychainData")
         }
     }
-
-    @Test("Failed reinstall cleanup blocks stale data until a successful retry")
-    func failedReinstallCleanupBlocksEveryNamespaceUntilSuccessfulRetry() {
-        let gate = KeychainInstallAccessGate()
-        var cleanupCanComplete = false
-        var reconciliationAttempts = 0
-        var manager: PreviewKeychainManager!
-        manager = PreviewKeychainManager(
-            installAccessGate: gate
-        ) {
-            reconciliationAttempts += 1
-            guard cleanupCanComplete else { return false }
-            return manager.deleteAllKeychainData()
-        }
-
-        let staleIdentity = Data([1, 2, 3])
-        let staleFavorite = Data([4, 5, 6])
-        let staleOutbox = Data([7, 8, 9])
-        let staleCustom = Data([10, 11, 12])
-        #expect(manager.saveIdentityKey(
-            staleIdentity,
-            forKey: "noiseStaticKey"
-        ))
-        #expect(manager.saveIdentityKey(
-            staleIdentity,
-            forKey: "identity_noiseStaticKey"
-        ))
-        #expect(manager.verifyIdentityKeyExists())
-        manager.save(
-            key: "favorite",
-            data: staleFavorite,
-            service: "chat.bitchat.favorites",
-            accessible: nil
-        )
-        manager.save(
-            key: "outbox",
-            data: staleOutbox,
-            service: "chat.bitchat.outbox",
-            accessible: nil
-        )
-        manager.save(
-            key: "custom",
-            data: staleCustom,
-            service: "chat.bitchat.future-custom",
-            accessible: nil
-        )
-
-        gate.block()
-
-        #expect(manager.getIdentityKey(forKey: "noiseStaticKey") == nil)
-        #expect(!manager.verifyIdentityKeyExists())
-        if case .accessDenied = manager.getIdentityKeyWithResult(
-            forKey: "noiseStaticKey"
-        ) {
-        } else {
-            Issue.record("Expected blocked identity read to fail closed")
-        }
-
-        for (key, service) in [
-            ("favorite", "chat.bitchat.favorites"),
-            ("outbox", "chat.bitchat.outbox"),
-            ("custom", "chat.bitchat.future-custom")
-        ] {
-            #expect(manager.load(key: key, service: service) == nil)
-            if case .accessDenied = manager.loadWithResult(
-                key: key,
-                service: service
-            ) {
-            } else {
-                Issue.record(
-                    "Expected blocked \(service) read to fail closed"
-                )
-            }
-        }
-
-        #expect(!manager.saveIdentityKey(
-            Data([13]),
-            forKey: "replacement"
-        ))
-        if case .accessDenied = manager.saveIdentityKeyWithResult(
-            Data([14]),
-            forKey: "replacement"
-        ) {
-        } else {
-            Issue.record("Expected blocked identity save to fail closed")
-        }
-
-        let failedAttempts = reconciliationAttempts
-        #expect(failedAttempts > 0)
-        cleanupCanComplete = true
-
-        // The first access retries cleanup synchronously. It must not return
-        // any surviving value from before the reinstall.
-        #expect(manager.getIdentityKey(forKey: "noiseStaticKey") == nil)
-        #expect(reconciliationAttempts == failedAttempts + 1)
-        #expect(manager.load(
-            key: "favorite",
-            service: "chat.bitchat.favorites"
-        ) == nil)
-        #expect(manager.load(
-            key: "outbox",
-            service: "chat.bitchat.outbox"
-        ) == nil)
-        #expect(manager.load(
-            key: "custom",
-            service: "chat.bitchat.future-custom"
-        ) == nil)
-
-        let replacementIdentity = Data([21, 22, 23])
-        let replacementCustom = Data([24, 25, 26])
-        #expect(manager.saveIdentityKey(
-            replacementIdentity,
-            forKey: "noiseStaticKey"
-        ))
-        #expect(manager.getIdentityKey(
-            forKey: "noiseStaticKey"
-        ) == replacementIdentity)
-        manager.save(
-            key: "custom",
-            data: replacementCustom,
-            service: "chat.bitchat.future-custom",
-            accessible: nil
-        )
-        #expect(manager.load(
-            key: "custom",
-            service: "chat.bitchat.future-custom"
-        ) == replacementCustom)
-    }
 }

bitchatTests/Services/BLEFileTransferHandlerTests.swift

@@ -370,132 +370,6 @@ struct BLEFileTransferHandlerTests {
         #expect(!FileManager.default.fileExists(atPath: evictable.path))
     }
 
-    @Test
-    func panicWipeDeletesEveryManagedMediaFileAndRecreatesEmptyDirectories() throws {
-        let base = FileManager.default.temporaryDirectory
-            .appendingPathComponent("panic-media-wipe-\(UUID().uuidString)", isDirectory: true)
-        defer { try? FileManager.default.removeItem(at: base) }
-        let store = BLEIncomingFileStore(baseDirectory: base)
-        let subdirectories = [
-            "voicenotes/incoming",
-            "voicenotes/outgoing",
-            "images/incoming",
-            "images/outgoing",
-            "files/incoming",
-            "files/outgoing"
-        ]
-
-        for subdirectory in subdirectories {
-            let directory = base
-                .appendingPathComponent("files", isDirectory: true)
-                .appendingPathComponent(subdirectory, isDirectory: true)
-            try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)
-            try Data("secret".utf8).write(to: directory.appendingPathComponent("artifact.bin"))
-        }
-        let unmanaged = base.appendingPathComponent("files/legacy/secret.bin")
-        try FileManager.default.createDirectory(at: unmanaged.deletingLastPathComponent(), withIntermediateDirectories: true)
-        try Data("legacy".utf8).write(to: unmanaged)
-
-        try store.panicWipe()
-
-        #expect(!FileManager.default.fileExists(atPath: unmanaged.path))
-        for subdirectory in subdirectories {
-            let directory = base
-                .appendingPathComponent("files", isDirectory: true)
-                .appendingPathComponent(subdirectory, isDirectory: true)
-            var isDirectory: ObjCBool = false
-            #expect(FileManager.default.fileExists(atPath: directory.path, isDirectory: &isDirectory))
-            #expect(isDirectory.boolValue)
-            #expect(try FileManager.default.contentsOfDirectory(atPath: directory.path).isEmpty)
-        }
-    }
-
-    @Test
-    func panicWipeAttemptsDeletionWhenMarkerPersistenceFails() throws {
-        enum MarkerFailure: Error { case unavailable }
-
-        let base = FileManager.default.temporaryDirectory
-            .appendingPathComponent(
-                "panic-marker-failure-\(UUID().uuidString)",
-                isDirectory: true
-            )
-        defer { try? FileManager.default.removeItem(at: base) }
-        let secret = base
-            .appendingPathComponent("files/images/outgoing", isDirectory: true)
-            .appendingPathComponent("secret.jpg")
-        try FileManager.default.createDirectory(
-            at: secret.deletingLastPathComponent(),
-            withIntermediateDirectories: true
-        )
-        try Data("secret".utf8).write(to: secret)
-        let store = BLEIncomingFileStore(
-            baseDirectory: base,
-            panicMarkerWriter: { _, _ in throw MarkerFailure.unavailable }
-        )
-
-        do {
-            try store.panicWipe(hasDurablePendingMarker: false)
-            Issue.record("Expected the missing durable marker to fail closed")
-        } catch {
-            // The marker error is reported only after the deletion attempt.
-        }
-
-        #expect(!FileManager.default.fileExists(atPath: secret.path))
-        #expect(
-            FileManager.default.fileExists(
-                atPath: secret.deletingLastPathComponent().path
-            )
-        )
-    }
-
-    @Test
-    func externalMarkerAllowsDeletionToCommitWhenFileMarkerFails() throws {
-        enum MarkerFailure: Error { case unavailable }
-
-        let base = FileManager.default.temporaryDirectory
-            .appendingPathComponent(
-                "panic-external-marker-\(UUID().uuidString)",
-                isDirectory: true
-            )
-        defer { try? FileManager.default.removeItem(at: base) }
-        let secret = base
-            .appendingPathComponent("files/voicenotes/incoming", isDirectory: true)
-            .appendingPathComponent("secret.m4a")
-        try FileManager.default.createDirectory(
-            at: secret.deletingLastPathComponent(),
-            withIntermediateDirectories: true
-        )
-        try Data("secret".utf8).write(to: secret)
-        let store = BLEIncomingFileStore(
-            baseDirectory: base,
-            panicMarkerWriter: { _, _ in throw MarkerFailure.unavailable }
-        )
-
-        try store.panicWipe(hasDurablePendingMarker: true)
-
-        #expect(!FileManager.default.fileExists(atPath: secret.path))
-    }
-
-    @Test
-    func panicRecoveryMarkerPersistsUntilExplicitCommit() throws {
-        let base = FileManager.default.temporaryDirectory
-            .appendingPathComponent(
-                "panic-recovery-marker-\(UUID().uuidString)",
-                isDirectory: true
-            )
-        defer { try? FileManager.default.removeItem(at: base) }
-        let store = BLEIncomingFileStore(baseDirectory: base)
-
-        try store.markPanicRecoveryPending()
-        #expect(try store.isPanicRecoveryPending())
-        try store.panicWipe(hasDurablePendingMarker: true)
-        #expect(try store.isPanicRecoveryPending())
-
-        try store.completePanicRecovery()
-
-        #expect(try !store.isPanicRecoveryPending())
-    }
-
     private func expectNoSideEffects(_ recorder: Recorder) {
         #expect(recorder.signedNameQueries.isEmpty)
         #expect(recorder.trackedPackets.isEmpty)

bitchatTests/Services/BLENoisePacketHandlerTests.swift

@@ -8,7 +8,6 @@ struct BLENoisePacketHandlerTests {
 
     private final class Recorder {
         var handshakeResult: Result<Data?, Error> = .success(nil)
-        var handshakeAuthenticated = false
         var hasSession = false
         var decryptResult: Result<Data, Error> = .success(Data())
 
@@ -39,11 +38,7 @@ struct BLENoisePacketHandlerTests {
             now: { now },
             processHandshakeMessage: { peerID, message in
                 recorder.processedHandshakes.append((peerID, message))
-                return NoiseHandshakeProcessingResult(
-                    response: try recorder.handshakeResult.get(),
-                    didEstablishAuthenticatedSession:
-                        recorder.handshakeAuthenticated
-                )
+                return try recorder.handshakeResult.get()
             },
             hasNoiseSession: { peerID in
                 recorder.hasSessionQueries.append(peerID)
@@ -115,24 +110,6 @@ struct BLENoisePacketHandlerTests {
         #expect(recorder.initiatedHandshakes.isEmpty)
     }
 
-    @Test
-    func handshakeResultPreservesExactCandidateAuthentication() {
-        let recorder = Recorder()
-        recorder.handshakeAuthenticated = true
-        let handler = makeHandler(recorder: recorder)
-        let packet = makeHandshakePacket(
-            recipientID: Data(hexString: localPeerID.id)
-        )
-
-        let result = handler.handleHandshakeWithResult(
-            packet,
-            from: remotePeerID
-        )
-
-        #expect(result.processed)
-        #expect(result.didEstablishAuthenticatedSession)
-    }
-
     @Test
     func handshakeForAnotherPeerIsIgnored() {
         let recorder = Recorder()
@@ -175,21 +152,6 @@ struct BLENoisePacketHandlerTests {
         #expect(recorder.initiatedHandshakes.isEmpty)
     }
 
-    @Test
-    func peerIdentityMismatchDoesNotRecreateHandshakeState() {
-        let recorder = Recorder()
-        recorder.handshakeResult = .failure(NoiseSessionError.peerIdentityMismatch)
-        recorder.hasSession = false
-        let handler = makeHandler(recorder: recorder)
-        let packet = makeHandshakePacket(recipientID: Data(hexString: localPeerID.id))
-
-        #expect(!handler.handleHandshake(packet, from: remotePeerID))
-
-        #expect(recorder.hasSessionQueries.isEmpty)
-        #expect(recorder.initiatedHandshakes.isEmpty)
-        #expect(recorder.broadcastPackets.isEmpty)
-    }
-
     // MARK: Encrypted
 
     @Test

bitchatTests/Services/GeohashPresenceServiceTests.swift

@@ -76,7 +76,6 @@ final class GeohashPresenceServiceTests: XCTestCase {
             burstMaxDelay: 0
         )
 
-        service.start()
         service.performHeartbeat()
 
         let sentAllAllowedChannels = await waitUntil { sentGeohashes.count == 3 }
@@ -84,7 +83,7 @@ final class GeohashPresenceServiceTests: XCTestCase {
         XCTAssertEqual(Set(sentGeohashes), Set(["9q", "9q8y", "9q8yy"]))
         XCTAssertEqual(Set(lookedUpGeohashes), Set(["9q", "9q8y", "9q8yy"]))
         XCTAssertEqual(sleptNanoseconds.count, 3)
-        XCTAssertEqual(scheduler.intervals, [17, 17])
+        XCTAssertEqual(scheduler.intervals, [17])
     }
 
     func test_performHeartbeat_skipsBroadcastWhenTorIsNotReady() async {
@@ -98,12 +97,11 @@ final class GeohashPresenceServiceTests: XCTestCase {
             loopMaxInterval: 21
         )
 
-        service.start()
         service.performHeartbeat()
         try? await Task.sleep(nanoseconds: 20_000_000)
 
         XCTAssertEqual(sendCount, 0)
-        XCTAssertEqual(scheduler.intervals, [21, 21])
+        XCTAssertEqual(scheduler.intervals, [21])
     }
 
     func test_performHeartbeat_skipsBroadcastWhenAppIsBackgrounded() async {
@@ -117,45 +115,11 @@ final class GeohashPresenceServiceTests: XCTestCase {
             loopMaxInterval: 22
         )
 
-        service.start()
         service.performHeartbeat()
         try? await Task.sleep(nanoseconds: 20_000_000)
 
         XCTAssertEqual(sendCount, 0)
-        XCTAssertEqual(scheduler.intervals, [22, 22])
-    }
-
-    func test_stopForPanic_cancelsTimerAndSuppressesDelayedBroadcast() async throws {
-        let identity = try NostrIdentity.generate()
-        let scheduler = MockGeohashPresenceScheduler()
-        var sleeperContinuation: CheckedContinuation<Void, Never>?
-        var sendCount = 0
-        let service = makeService(
-            scheduler: scheduler,
-            deriveIdentity: { _ in identity },
-            relaySender: { _, _ in sendCount += 1 },
-            sleeper: { _ in
-                await withCheckedContinuation { continuation in
-                    sleeperContinuation = continuation
-                }
-            },
-            burstMinDelay: 1,
-            burstMaxDelay: 1
-        )
-
-        service.start()
-        service.performHeartbeat()
-        let delayStarted = await waitUntil {
-            sleeperContinuation != nil
-        }
-        XCTAssertTrue(delayStarted)
-
-        service.stopForPanic()
-        sleeperContinuation?.resume()
-        try? await Task.sleep(nanoseconds: 20_000_000)
-
-        XCTAssertEqual(sendCount, 0)
-        XCTAssertEqual(scheduler.timers.first?.invalidateCallCount, 1)
+        XCTAssertEqual(scheduler.intervals, [22])
     }
 
     func test_broadcastPresence_skipsSendWhenNoRelaysAreAvailable() async throws {

bitchatTests/Services/NetworkActivationServiceTests.swift

@@ -91,53 +91,6 @@ final class NetworkActivationServiceTests: XCTestCase {
         XCTAssertGreaterThanOrEqual(context.relayController.connectCallCount, 1)
     }
 
-    func test_stopForPanic_synchronouslyStopsAndIgnoresPublisherUpdates() async {
-        let context = makeService(permission: .authorized, favorites: [])
-
-        context.service.start()
-        context.service.stopForPanic()
-        let connectCountAfterStop = context.relayController.connectCallCount
-        let startCountAfterStop = context.torController.startIfNeededCallCount
-
-        context.favoritesSubject.send([Data([0x01])])
-        context.reachability.set(false)
-        context.reachability.set(true)
-        try? await Task.sleep(nanoseconds: 30_000_000)
-
-        XCTAssertFalse(context.service.activationAllowed)
-        XCTAssertEqual(context.reachability.stopCallCount, 1)
-        XCTAssertEqual(context.torController.autoStartAllowedValues.last, false)
-        XCTAssertEqual(context.proxyController.proxyModes.last, false)
-        XCTAssertGreaterThanOrEqual(
-            context.torController.shutdownCompletelyCallCount,
-            1
-        )
-        XCTAssertGreaterThanOrEqual(
-            context.relayController.disconnectCallCount,
-            1
-        )
-        XCTAssertEqual(
-            context.relayController.connectCallCount,
-            connectCountAfterStop
-        )
-        XCTAssertEqual(
-            context.torController.startIfNeededCallCount,
-            startCountAfterStop
-        )
-    }
-
-    func test_start_afterPanicStop_reestablishesSubscriptions() {
-        let context = makeService(permission: .authorized, favorites: [])
-
-        context.service.start()
-        context.service.stopForPanic()
-        context.service.start()
-
-        XCTAssertTrue(context.service.activationAllowed)
-        XCTAssertEqual(context.reachability.startCallCount, 2)
-        XCTAssertEqual(context.relayController.connectCallCount, 2)
-    }
-
     private func makeService(
         permission: LocationChannelManager.PermissionState,
         favorites: Set<Data>
@@ -151,7 +104,6 @@ final class NetworkActivationServiceTests: XCTestCase {
         let torController = MockNetworkActivationTorController()
         let relayController = MockNetworkActivationRelayController()
         let proxyController = MockNetworkActivationProxyController()
-        let reachability = MockNetworkActivationReachability()
         let notificationCenter = NotificationCenter()
         let service = NetworkActivationService(
             storage: storage,
@@ -159,7 +111,7 @@ final class NetworkActivationServiceTests: XCTestCase {
             mutualFavoritesPublisher: favoritesSubject.eraseToAnyPublisher(),
             permissionProvider: { permissionSubject.value },
             mutualFavoritesProvider: { favoritesSubject.value },
-            reachabilityMonitor: reachability,
+            reachabilityMonitor: AlwaysReachableMonitor(),
             torController: torController,
             relayController: relayController,
             proxyController: proxyController,
@@ -169,7 +121,6 @@ final class NetworkActivationServiceTests: XCTestCase {
             service: service,
             storage: storage,
             favoritesSubject: favoritesSubject,
-            reachability: reachability,
             torController: torController,
             relayController: relayController,
             proxyController: proxyController,
@@ -197,38 +148,12 @@ private struct NetworkActivationTestContext {
     let service: NetworkActivationService
     let storage: UserDefaults
     let favoritesSubject: CurrentValueSubject<Set<Data>, Never>
-    let reachability: MockNetworkActivationReachability
     let torController: MockNetworkActivationTorController
     let relayController: MockNetworkActivationRelayController
     let proxyController: MockNetworkActivationProxyController
     let notificationCenter: NotificationCenter
 }
 
-@MainActor
-private final class MockNetworkActivationReachability:
-    NetworkReachabilityMonitoring {
-    private let subject = CurrentValueSubject<Bool, Never>(true)
-    private(set) var startCallCount = 0
-    private(set) var stopCallCount = 0
-
-    var isReachable: Bool { subject.value }
-    var reachabilityPublisher: AnyPublisher<Bool, Never> {
-        subject.removeDuplicates().dropFirst().eraseToAnyPublisher()
-    }
-
-    func start() {
-        startCallCount += 1
-    }
-
-    func stop() {
-        stopCallCount += 1
-    }
-
-    func set(_ reachable: Bool) {
-        subject.send(reachable)
-    }
-}
-
 @MainActor
 private final class MockNetworkActivationTorController: NetworkActivationTorControlling {
     private(set) var autoStartAllowedValues: [Bool] = []

bitchatTests/Services/NetworkReachabilityGateTests.swift

@@ -213,7 +213,6 @@ private final class ControllableReachabilityMonitor: NetworkReachabilityMonitori
         subject.removeDuplicates().dropFirst().eraseToAnyPublisher()
     }
     func start() { startCalled = true }
-    func stop() { startCalled = false }
     func set(_ reachable: Bool) { subject.send(reachable) }
 }
 

bitchatTests/Services/NoiseEncryptionServiceTests.swift

@@ -91,150 +91,39 @@ struct NoiseEncryptionServiceTests {
     func handshakeEncryptionAndFingerprintLifecycle() async throws {
         let alice = NoiseEncryptionService(keychain: MockKeychain())
         let bob = NoiseEncryptionService(keychain: MockKeychain())
-        let alicePeerID = PeerID(publicKey: alice.getStaticPublicKeyData())
-        let bobPeerID = PeerID(publicKey: bob.getStaticPublicKeyData())
+        let alicePeerID = PeerID(str: "0011223344556677")
+        let bobPeerID = PeerID(str: "8899aabbccddeeff")
         let recorder = AuthenticationRecorder()
 
         #expect(alice.onPeerAuthenticated == nil)
         alice.addOnPeerAuthenticatedHandler(recorder.record(peerID:fingerprint:))
         bob.onPeerAuthenticated = recorder.record(peerID:fingerprint:)
 
-        try establishSessions(alice: alice, bob: bob)
+        try establishSessions(alice: alice, bob: bob, alicePeerID: alicePeerID, bobPeerID: bobPeerID)
 
         let authenticated = await TestHelpers.waitUntil({ recorder.count >= 2 }, timeout: 5.0)
         #expect(authenticated)
-        #expect(alice.hasEstablishedSession(with: bobPeerID))
-        #expect(bob.hasEstablishedSession(with: alicePeerID))
-        #expect(alice.hasSession(with: bobPeerID))
-        #expect(bob.hasSession(with: alicePeerID))
-        #expect(alice.getPeerPublicKeyData(bobPeerID)?.count == 32)
-        #expect(bob.getPeerPublicKeyData(alicePeerID)?.count == 32)
-        #expect(alice.getPeerFingerprint(bobPeerID) != nil)
-        #expect(bob.getPeerFingerprint(alicePeerID) != nil)
+        #expect(alice.hasEstablishedSession(with: alicePeerID))
+        #expect(bob.hasEstablishedSession(with: bobPeerID))
+        #expect(alice.hasSession(with: alicePeerID))
+        #expect(bob.hasSession(with: bobPeerID))
+        #expect(alice.getPeerPublicKeyData(alicePeerID)?.count == 32)
+        #expect(bob.getPeerPublicKeyData(bobPeerID)?.count == 32)
+        #expect(alice.getPeerFingerprint(alicePeerID) != nil)
+        #expect(bob.getPeerFingerprint(bobPeerID) != nil)
 
         let plaintext = Data("secret payload".utf8)
-        let ciphertext = try alice.encrypt(plaintext, for: bobPeerID)
-        let decrypted = try bob.decrypt(ciphertext, from: alicePeerID)
+        let ciphertext = try alice.encrypt(plaintext, for: alicePeerID)
+        let decrypted = try bob.decrypt(ciphertext, from: bobPeerID)
         #expect(decrypted == plaintext)
 
-        alice.clearSession(for: bobPeerID)
-        #expect(!alice.hasSession(with: bobPeerID))
-        #expect(alice.getPeerFingerprint(bobPeerID) == nil)
+        alice.clearSession(for: alicePeerID)
+        #expect(!alice.hasSession(with: alicePeerID))
+        #expect(alice.getPeerFingerprint(alicePeerID) == nil)
 
         bob.clearEphemeralStateForPanic()
-        #expect(!bob.hasSession(with: alicePeerID))
-        #expect(bob.getPeerFingerprint(alicePeerID) == nil)
-    }
-
-    @Test("Handshake rejects a claimed peer ID that does not match the authenticated static key")
-    func handshakeRejectsClaimedPeerIDStaticKeyMismatch() async throws {
-        let receiver = NoiseEncryptionService(keychain: MockKeychain())
-        let claimedAlice = NoiseEncryptionService(keychain: MockKeychain())
-        let mallory = NoiseEncryptionService(keychain: MockKeychain())
-        let receiverPeerID = PeerID(publicKey: receiver.getStaticPublicKeyData())
-        let claimedAlicePeerID = PeerID(publicKey: claimedAlice.getStaticPublicKeyData())
-        let recorder = AuthenticationRecorder()
-        receiver.addOnPeerAuthenticatedHandler(recorder.record(peerID:fingerprint:))
-
-        let message1 = try mallory.initiateHandshake(with: receiverPeerID)
-        let message2 = try #require(
-            try receiver.processHandshakeMessage(from: claimedAlicePeerID, message: message1)
-        )
-        let message3 = try #require(
-            try mallory.processHandshakeMessage(from: receiverPeerID, message: message2)
-        )
-
-        do {
-            _ = try receiver.processHandshakeMessage(from: claimedAlicePeerID, message: message3)
-            Issue.record("Expected the authenticated Mallory key to be rejected for Alice's peer ID")
-        } catch let error as NoiseSessionError {
-            #expect(error == .peerIdentityMismatch)
-        } catch {
-            Issue.record("Unexpected mismatch error: \(error)")
-        }
-
-        #expect(!receiver.hasSession(with: claimedAlicePeerID))
-        let emittedAuthentication = await TestHelpers.waitUntil(
-            { recorder.count > 0 },
-            timeout: TestConstants.shortTimeout
-        )
-        #expect(!emittedAuthentication)
-    }
-
-    @Test("Failed forged replacement preserves the established peer session")
-    func forgedReplacementPreservesEstablishedSession() async throws {
-        let alice = NoiseEncryptionService(keychain: MockKeychain())
-        let receiver = NoiseEncryptionService(keychain: MockKeychain())
-        let mallory = NoiseEncryptionService(keychain: MockKeychain())
-        let alicePeerID = PeerID(publicKey: alice.getStaticPublicKeyData())
-        let receiverPeerID = PeerID(publicKey: receiver.getStaticPublicKeyData())
-        let recorder = AuthenticationRecorder()
-        receiver.addOnPeerAuthenticatedHandler(recorder.record(peerID:fingerprint:))
-
-        try establishSessions(alice: alice, bob: receiver)
-        let initialAuthentication = await TestHelpers.waitUntil(
-            { recorder.count == 1 },
-            timeout: TestConstants.longTimeout
-        )
-        #expect(initialAuthentication)
-
-        let before = try alice.encrypt(Data("before".utf8), for: receiverPeerID)
-        #expect(try receiver.decrypt(before, from: alicePeerID) == Data("before".utf8))
-
-        let forgedMessage1 = try mallory.initiateHandshake(with: receiverPeerID)
-        let forgedMessage2 = try #require(
-            try receiver.processHandshakeMessage(from: alicePeerID, message: forgedMessage1)
-        )
-        // The replacement has not authenticated yet; the working Alice
-        // transport session must remain available throughout the candidate.
-        #expect(receiver.hasEstablishedSession(with: alicePeerID))
-        let forgedMessage3 = try #require(
-            try mallory.processHandshakeMessage(from: receiverPeerID, message: forgedMessage2)
-        )
-
-        do {
-            _ = try receiver.processHandshakeMessage(from: alicePeerID, message: forgedMessage3)
-            Issue.record("Expected forged replacement to fail peer binding")
-        } catch let error as NoiseSessionError {
-            #expect(error == .peerIdentityMismatch)
-        } catch {
-            Issue.record("Unexpected replacement error: \(error)")
-        }
-
-        #expect(receiver.hasEstablishedSession(with: alicePeerID))
-        let after = try alice.encrypt(Data("after".utf8), for: receiverPeerID)
-        #expect(try receiver.decrypt(after, from: alicePeerID) == Data("after".utf8))
-        let emittedReplacementAuthentication = await TestHelpers.waitUntil(
-            { recorder.count > 1 },
-            timeout: TestConstants.shortTimeout
-        )
-        #expect(!emittedReplacementAuthentication)
-    }
-
-    @Test("Valid rehandshake atomically replaces the established session")
-    func validRehandshakeReplacesEstablishedSession() throws {
-        let alice = NoiseEncryptionService(keychain: MockKeychain())
-        let receiver = NoiseEncryptionService(keychain: MockKeychain())
-        let alicePeerID = PeerID(publicKey: alice.getStaticPublicKeyData())
-        let receiverPeerID = PeerID(publicKey: receiver.getStaticPublicKeyData())
-
-        try establishSessions(alice: alice, bob: receiver)
-        alice.clearSession(for: receiverPeerID)
-
-        let message1 = try alice.initiateHandshake(with: receiverPeerID)
-        let message2 = try #require(
-            try receiver.processHandshakeMessage(from: alicePeerID, message: message1)
-        )
-        #expect(receiver.hasEstablishedSession(with: alicePeerID))
-        let message3 = try #require(
-            try alice.processHandshakeMessage(from: receiverPeerID, message: message2)
-        )
-        _ = try receiver.processHandshakeMessage(from: alicePeerID, message: message3)
-
-        #expect(alice.hasEstablishedSession(with: receiverPeerID))
-        #expect(receiver.hasEstablishedSession(with: alicePeerID))
-        let ciphertext = try alice.encrypt(Data("new session".utf8), for: receiverPeerID)
-        #expect(try receiver.decrypt(ciphertext, from: alicePeerID) == Data("new session".utf8))
+        #expect(!bob.hasSession(with: bobPeerID))
+        #expect(bob.getPeerFingerprint(bobPeerID) == nil)
     }
 
     @Test("Encrypt without a session requests handshake and decrypt without session fails")
@@ -311,16 +200,16 @@ struct NoiseEncryptionServiceTests {
 
     private func establishSessions(
         alice: NoiseEncryptionService,
-        bob: NoiseEncryptionService
+        bob: NoiseEncryptionService,
+        alicePeerID: PeerID,
+        bobPeerID: PeerID
     ) throws {
-        let alicePeerID = PeerID(publicKey: alice.getStaticPublicKeyData())
-        let bobPeerID = PeerID(publicKey: bob.getStaticPublicKeyData())
-        let message1 = try alice.initiateHandshake(with: bobPeerID)
-        let response = try bob.processHandshakeMessage(from: alicePeerID, message: message1)
+        let message1 = try alice.initiateHandshake(with: alicePeerID)
+        let response = try bob.processHandshakeMessage(from: bobPeerID, message: message1)
         let message2 = try #require(response, "Expected handshake response")
-        let final = try alice.processHandshakeMessage(from: bobPeerID, message: message2)
+        let final = try alice.processHandshakeMessage(from: alicePeerID, message: message2)
         let message3 = try #require(final, "Expected handshake final")
-        let finalMessage = try bob.processHandshakeMessage(from: alicePeerID, message: message3)
+        let finalMessage = try bob.processHandshakeMessage(from: bobPeerID, message: message3)
         #expect(finalMessage == nil)
     }
 }

bitchatTests/VoiceCaptureSessionTests.swift

@@ -61,7 +61,6 @@ private final class GatedVoiceCaptureSession: VoiceCaptureSession {
     private let startError: Error?
     private(set) var finishStarted = false
     private(set) var cancelCount = 0
-    private(set) var panicCancelCount = 0
     private var finishContinuation: CheckedContinuation<URL?, Never>?
 
     init(startError: Error? = nil) {
@@ -84,10 +83,6 @@ private final class GatedVoiceCaptureSession: VoiceCaptureSession {
         cancelCount += 1
     }
 
-    func panicCancelSynchronously() {
-        panicCancelCount += 1
-    }
-
     func resolveFinish(with url: URL?) {
         let continuation = finishContinuation
         finishContinuation = nil
@@ -209,57 +204,4 @@ struct VoiceCaptureSessionTests {
         }
         #expect(viewModel.state == .idle)
     }
-
-    @Test func panicSynchronouslyCancelsActiveCaptureAndResetsUI() async {
-        let session = GatedVoiceCaptureSession()
-        let viewModel = VoiceRecordingViewModel()
-        viewModel.sessionProvider = { session }
-
-        viewModel.start(shouldShow: true)
-        await waitUntil { self.isRecording(viewModel.state) }
-
-        viewModel.panicWipe()
-
-        #expect(session.panicCancelCount == 1)
-        #expect(viewModel.state == .idle)
-        #expect(!viewModel.isLiveStreaming)
-    }
-
-    @Test func panicInvalidatesARecordingAlreadyFinalizing() async throws {
-        let session = GatedVoiceCaptureSession()
-        let viewModel = VoiceRecordingViewModel()
-        viewModel.sessionProvider = { session }
-        let url = FileManager.default.temporaryDirectory
-            .appendingPathComponent("voice-panic-\(UUID().uuidString).m4a")
-        try Data([0x01]).write(to: url)
-        var delivered = false
-
-        viewModel.start(shouldShow: true)
-        await waitUntil { self.isRecording(viewModel.state) }
-        viewModel.finish { _ in delivered = true }
-        await waitUntil { session.finishStarted }
-
-        viewModel.panicWipe()
-        session.resolveFinish(with: url)
-        await waitUntil {
-            !FileManager.default.fileExists(atPath: url.path)
-        }
-
-        #expect(!delivered)
-        #expect(viewModel.state == .idle)
-    }
-
-    @Test func liveSessionPanicStopsCaptureWithoutSendingControl() {
-        let capture = StubPTTCapture(stopResult: (nil, 0))
-        var sentPackets: [Data] = []
-        let session = PTTLiveVoiceSession(
-            sendPacket: { sentPackets.append($0) },
-            capture: capture
-        )
-
-        session.panicCancelSynchronously()
-
-        #expect(capture.cancelCount == 1)
-        #expect(sentPackets.isEmpty)
-    }
 }

bitchatTests/VoiceRecorderTests.swift

@@ -360,35 +360,6 @@ struct VoiceRecorderTests {
         #expect(FileManager.default.fileExists(atPath: secondURL.path))
     }
 
-    @Test func classicSessionPanicStopsRecorderAndDeletesFileBeforeReturning() async throws {
-        let directory = try makeTemporaryDirectory()
-        defer { try? FileManager.default.removeItem(at: directory) }
-
-        let rawSession = VoiceRecorderTestSession()
-        let coordinator = AudioSessionCoordinator(session: rawSession)
-        let factory = TestVoiceAudioRecorderFactory(plans: [.success])
-        let voiceRecorder = VoiceRecorder(
-            sessionCoordinator: coordinator,
-            recorderFactory: factory,
-            permissionGranted: { true },
-            paddingInterval: 0,
-            outputDirectory: directory
-        )
-        let capture = VoiceNoteCaptureSession(recorder: voiceRecorder)
-
-        try await capture.start()
-        let url = try #require(factory.urls.first)
-        let recorder = try #require(factory.recorders.first)
-
-        capture.panicCancelSynchronously()
-
-        #expect(recorder.stopCallCount == 1)
-        #expect(!recorder.isRecording)
-        #expect(!FileManager.default.fileExists(atPath: url.path))
-        await coordinator.drain()
-        #expect(rawSession.activationCalls == [true, false])
-    }
-
     private func verifyFailedStart(
         firstPlan: TestVoiceAudioRecorderFactory.Plan,
         expectedPrepareCalls: Int,

docs/privacy-assessment.md

@@ -48,7 +48,7 @@ Residual risk: private-message metadata such as timing, radio adjacency, ciphert
 - Recent signed public mesh messages are archived in Application Support for up to 15 minutes so gossip sync survives a relaunch and can cross mesh partitions.
 - Signed public board posts and tombstones persist until author-selected expiry, at most seven days. Stores are bounded by global and per-author quotas.
 - Group metadata (name, roster, creator, epoch) persists as protected JSON; group keys live in the keychain until leave/removal/wipe.
-- Voice notes and images are stored in Application Support. Incoming media has a 100 MB oldest-first quota; outgoing media does not have an equivalent automatic lifetime and remains until cleanup, panic wipe, or app removal. Panic wipe invalidates detached preparation work, cancels active transfers, closes live capture files, and removes the managed media tree before returning.
+- Voice notes and images are stored in Application Support. Incoming media has a 100 MB oldest-first quota; outgoing media does not have an equivalent automatic lifetime and remains until cleanup, panic wipe, or app removal.
 
 Public archives contain content already intended for public mesh/board distribution, but a seized unlocked device can reveal it. Group metadata and media can reveal relationships or content even when the in-memory chat timeline has gone away.
 
@@ -88,7 +88,7 @@ Residual risk: Nostr relay retention and logging are outside project control. Pu
 
 ## Panic Wipe Coverage
 
-The panic action clears identity/session state, preferences, location state, groups, prekeys, outbox mail, courier mail, bridge dedup state, gossip archive, board data, managed media, and active subscriptions/transports. Managed media deletion completes synchronously, after active media work has been invalidated. Keychain secrets use device-only accessibility, and an install marker detects and clears app keys that survive uninstall before a later reinstall can use them. New persistent stores must add an explicit wipe hook and a regression test.
+The panic action clears identity/session state, preferences, location state, groups, prekeys, outbox mail, courier mail, bridge dedup state, gossip archive, board data, managed media, and active subscriptions/transports. New persistent stores must add an explicit wipe hook and a regression test.
 
 ## Release Review Checklist
 

scripts/tests/test_fetch_georelays_workflow.py

@@ -0,0 +1,61 @@
+import re
+from pathlib import Path
+import unittest
+
+
+REPOSITORY_ROOT = Path(__file__).resolve().parents[2]
+WORKFLOW_PATH = REPOSITORY_ROOT / ".github/workflows/fetch_georelays.yml"
+
+
+class FetchGeoRelaysWorkflowTests(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls) -> None:
+        cls.workflow = WORKFLOW_PATH.read_text(encoding="utf-8")
+
+    def test_write_capable_checkout_action_is_immutable(self) -> None:
+        checkout = re.search(r"uses: actions/checkout@([0-9a-f]+)", self.workflow)
+        self.assertIsNotNone(checkout)
+        self.assertRegex(checkout.group(1), r"^[0-9a-f]{40}$")
+        self.assertIn("persist-credentials: false", self.workflow)
+
+    def test_pr_failure_has_single_issue_fallback_with_review_metadata(self) -> None:
+        required_fragments = [
+            "issues: write",
+            "TRACKING_ISSUE_TITLE: GeoRelay update awaiting pull request",
+            "gh pr create",
+            "gh issue create",
+            "gh issue edit",
+            "compare/main...${UPDATE_BRANCH}?expand=1",
+            "Upstream commit: $SOURCE_COMMIT",
+            "Data rows: $DATA_ROWS",
+            "Unique normalized relays: $UNIQUE_RELAYS",
+            "SHA-256: $DATA_SHA256",
+            '[[ -n "$issue_url" ]]',
+        ]
+        for fragment in required_fragments:
+            with self.subTest(fragment=fragment):
+                self.assertIn(fragment, self.workflow)
+
+        confirmed = self.workflow.index('[[ -n "$issue_url" ]]')
+        success_summary = self.workflow.index(
+            "Published GeoRelay tracking issue fallback: $issue_url"
+        )
+        self.assertLess(confirmed, success_summary)
+
+    def test_obsolete_review_state_is_cleaned_without_pushing_main(self) -> None:
+        self.assertIn("gh pr close", self.workflow)
+        self.assertIn("gh issue close", self.workflow)
+        self.assertIn('git push origin --delete "$UPDATE_BRANCH"', self.workflow)
+        self.assertIn('git switch -C "$UPDATE_BRANCH"', self.workflow)
+        self.assertNotIn("git push origin main", self.workflow)
+        self.assertNotIn("git push --force origin main", self.workflow)
+
+    def test_workflow_runs_all_validator_tests(self) -> None:
+        self.assertIn(
+            'python3 -m unittest discover -s scripts/tests -p "test_*.py" -v',
+            self.workflow,
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()

scripts/tests/test_validate_georelays.py

@@ -0,0 +1,186 @@
+import tempfile
+from pathlib import Path
+import sys
+import unittest
+
+sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
+import validate_georelays as validator
+
+
+def csv_bytes(rows: list[str]) -> bytes:
+    return ("Relay URL,Latitude,Longitude\n" + "\n".join(rows) + "\n").encode()
+
+
+class ValidateGeoRelaysTests(unittest.TestCase):
+    def test_validates_and_deduplicates_secure_relay_addresses(self) -> None:
+        data = csv_bytes(
+            [
+                "relay.example.com,10,20",
+                "wss://relay.example.com:443/,10,20",
+                "https://second.example.org,11,21",
+            ]
+        )
+
+        summary = validator.validate_bytes(data, minimum_unique_relays=2)
+
+        self.assertEqual(summary.data_rows, 3)
+        self.assertEqual(summary.unique_relays, 2)
+
+    def test_rejects_insecure_or_non_host_relay_urls(self) -> None:
+        bad_addresses = [
+            "http://relay.example.com",
+            "ws://relay.example.com",
+            "wss://user@relay.example.com",
+            "wss://relay.example.com/path",
+            "wss://relay.example.com?",
+            "wss://relay.example.com#",
+            "relay.example.com:0",
+            "relay.example.com:99999",
+            "localhost",
+            "127.0.0.1",
+            "relay_example.com",
+            "relay\u202e.example.com",
+        ]
+
+        for address in bad_addresses:
+            with self.subTest(address=address):
+                with self.assertRaises(validator.ValidationError):
+                    validator.validate_bytes(
+                        csv_bytes([f"{address},10,20"]),
+                        minimum_unique_relays=1,
+                    )
+
+    def test_rejects_malformed_rows_and_unsafe_coordinates(self) -> None:
+        bad_rows = [
+            "relay.example.com,10",
+            "relay.example.com,NaN,20",
+            "relay.example.com,1_0,20",
+            "relay.example.com,\u0661\u0660,20",
+            "relay.example.com,\uff11\uff10,20",
+            "relay.example.com,91,20",
+            "relay.example.com,10,-181",
+            "relay.example.com,10,20,extra",
+            '"relay.example.com",10,20',
+        ]
+
+        for row in bad_rows:
+            with self.subTest(row=row):
+                with self.assertRaises(validator.ValidationError):
+                    validator.validate_bytes(csv_bytes([row]), minimum_unique_relays=1)
+
+    def test_accepts_ascii_coordinate_forms_supported_by_swift_double(self) -> None:
+        summary = validator.validate_bytes(
+            csv_bytes(
+                [
+                    "one.example.com,+1,-.5",
+                    "two.example.com,1.e1,2E+1",
+                    "three.example.com,01,20.",
+                ]
+            ),
+            minimum_unique_relays=3,
+        )
+
+        self.assertEqual(summary.unique_relays, 3)
+
+    def test_rejects_conflicts_limits_and_large_baseline_deltas(self) -> None:
+        with self.assertRaises(validator.ValidationError):
+            validator.validate_bytes(
+                csv_bytes(["relay.example.com,10,20", "relay.example.com,11,21"]),
+                minimum_unique_relays=1,
+            )
+        with self.assertRaises(validator.ValidationError):
+            validator.validate_bytes(b"x" * 20, maximum_bytes=10, minimum_unique_relays=1)
+        with self.assertRaises(validator.ValidationError):
+            validator.validate_bytes(
+                csv_bytes(["one.example.com,1,1", "two.example.com,2,2"]),
+                minimum_unique_relays=3,
+            )
+
+        baseline = csv_bytes(
+            [f"relay-{index}.example.com,{index % 80},{index % 170}" for index in range(120)]
+        )
+        shrunken = csv_bytes(
+            [f"relay-{index}.example.com,{index % 80},{index % 170}" for index in range(59)]
+        )
+        with self.assertRaises(validator.ValidationError):
+            validator.validate_update(shrunken, baseline)
+
+        smaller_baseline = csv_bytes(
+            [f"relay-{index}.example.com,{index % 80},{index % 170}" for index in range(60)]
+        )
+        expanded = csv_bytes(
+            [f"relay-{index}.example.com,{index % 80},{index % 170}" for index in range(121)]
+        )
+        with self.assertRaises(validator.ValidationError):
+            validator.validate_update(expanded, smaller_baseline)
+
+    def test_update_requires_exact_normalized_baseline_entry_overlap(self) -> None:
+        baseline_rows = [
+            f"relay-{index}.example.com,{index % 80},{index % 170}"
+            for index in range(60)
+        ]
+        baseline = csv_bytes(baseline_rows)
+        disjoint = csv_bytes(
+            [
+                f"attacker-{index}.example.com,{index % 80},{index % 170}"
+                for index in range(60)
+            ]
+        )
+        rewritten_coordinates = csv_bytes(
+            [
+                f"relay-{index}.example.com,{(index % 80) + 0.5},{index % 170}"
+                for index in range(60)
+            ]
+        )
+
+        for candidate in (disjoint, rewritten_coordinates):
+            with self.subTest(candidate=candidate[:80]):
+                with self.assertRaisesRegex(
+                    validator.ValidationError,
+                    "exact relay-coordinate entries",
+                ):
+                    validator.validate_update(candidate, baseline)
+
+        half_retained = csv_bytes(
+            [
+                f"wss://relay-{index}.example.com:443/,{index % 80},{index % 170}"
+                for index in range(30)
+            ]
+            + [
+                f"replacement-{index}.example.com,{index % 80},{index % 170}"
+                for index in range(30)
+            ]
+        )
+        summary = validator.validate_update(half_retained, baseline)
+        self.assertEqual(summary.unique_relays, 60)
+
+    def test_cli_copies_only_validated_data_and_emits_review_metadata(self) -> None:
+        rows = [f"relay-{index}.example.com,{index % 80},{index % 170}" for index in range(60)]
+        data = csv_bytes(rows)
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            candidate = root / "candidate.csv"
+            baseline = root / "baseline.csv"
+            output = root / "output.csv"
+            github_output = root / "github-output.txt"
+            candidate.write_bytes(data)
+            baseline.write_bytes(data)
+
+            result = validator.main(
+                [
+                    "--input", str(candidate),
+                    "--baseline", str(baseline),
+                    "--output", str(output),
+                    "--github-output", str(github_output),
+                ]
+            )
+
+            self.assertEqual(result, 0)
+            self.assertEqual(output.read_bytes(), data)
+            metadata = github_output.read_text()
+            self.assertIn("unique_relays=60", metadata)
+            self.assertIn("sha256=", metadata)
+
+
+if __name__ == "__main__":
+    unittest.main()

scripts/validate_georelays.py

@@ -0,0 +1,271 @@
+#!/usr/bin/env python3
+"""Strict validator for the reviewed georelay CSV update workflow."""
+
+from __future__ import annotations
+
+import argparse
+import csv
+import hashlib
+import io
+import math
+import re
+from dataclasses import dataclass
+from pathlib import Path
+import sys
+import unicodedata
+from urllib.parse import urlsplit
+
+
+MAX_BYTES = 512 * 1024
+MAX_ROWS = 5_000
+MAX_UNIQUE_RELAYS = 5_000
+MIN_UNIQUE_RELAYS = 50
+MIN_BASELINE_FRACTION = 0.5
+MAX_BASELINE_MULTIPLIER = 2.0
+EXPECTED_HEADER = ("relay url", "latitude", "longitude")
+ASCII_DECIMAL_PATTERN = re.compile(
+    r"[+-]?(?:[0-9]+(?:\.[0-9]*)?|\.[0-9]+)(?:[eE][+-]?[0-9]+)?\Z"
+)
+
+
+class ValidationError(ValueError):
+    pass
+
+
+@dataclass(frozen=True)
+class ValidationSummary:
+    data_rows: int
+    unique_relays: int
+    sha256: str
+
+
+@dataclass(frozen=True)
+class _ValidatedDataset:
+    summary: ValidationSummary
+    entries: frozenset[tuple[str, float, float]]
+
+
+def _has_disallowed_control(value: str) -> bool:
+    return any(
+        unicodedata.category(character) in {"Cc", "Cf"}
+        and character not in {"\r", "\n", "\t"}
+        for character in value
+    )
+
+
+def normalize_relay_address(raw_value: str) -> str:
+    value = raw_value.strip()
+    if not value or _has_disallowed_control(value):
+        raise ValidationError("relay address is empty or contains control characters")
+    # urlsplit cannot distinguish an absent query/fragment from an explicitly
+    # empty one. Reject the delimiters themselves so this validator matches
+    # URLComponents in the client and reviewed data cannot fail closed there.
+    if "?" in value or "#" in value:
+        raise ValidationError(f"relay query or fragment is not allowed: {value}")
+
+    candidate = value if "://" in value else f"wss://{value}"
+    try:
+        parsed = urlsplit(candidate)
+        port = parsed.port
+    except ValueError as error:
+        raise ValidationError(f"invalid relay URL: {value}") from error
+
+    if parsed.scheme.lower() not in {"wss", "https"}:
+        raise ValidationError(f"relay must use wss/https or a bare hostname: {value}")
+    if parsed.username is not None or parsed.password is not None:
+        raise ValidationError(f"relay credentials are not allowed: {value}")
+    if parsed.path not in {"", "/"} or parsed.query or parsed.fragment:
+        raise ValidationError(f"relay path, query, or fragment is not allowed: {value}")
+
+    host = (parsed.hostname or "").lower()
+    if not host or len(host) > 253 or not host.isascii():
+        raise ValidationError(f"relay hostname is missing or non-ASCII: {value}")
+    if host.endswith(".") or host == "localhost" or host.endswith((".localhost", ".local", ".internal")):
+        raise ValidationError(f"local or absolute relay hostname is not allowed: {value}")
+
+    labels = host.split(".")
+    if len(labels) < 2 or all(label.isdigit() for label in labels):
+        raise ValidationError(f"relay must use a public DNS hostname: {value}")
+    for label in labels:
+        if not 1 <= len(label) <= 63:
+            raise ValidationError(f"invalid DNS label length: {value}")
+        if label[0] == "-" or label[-1] == "-":
+            raise ValidationError(f"DNS labels cannot start or end with '-': {value}")
+        if any(character not in "abcdefghijklmnopqrstuvwxyz0123456789-" for character in label):
+            raise ValidationError(f"invalid DNS hostname character: {value}")
+
+    if port is not None and not 1 <= port <= 65_535:
+        raise ValidationError(f"invalid relay port: {value}")
+    if port in {None, 443}:
+        return host
+    return f"{host}:{port}"
+
+
+def _validated_dataset(
+    data: bytes,
+    *,
+    minimum_unique_relays: int = MIN_UNIQUE_RELAYS,
+    maximum_bytes: int = MAX_BYTES,
+    maximum_rows: int = MAX_ROWS,
+    maximum_unique_relays: int = MAX_UNIQUE_RELAYS,
+) -> _ValidatedDataset:
+    if not data or len(data) > maximum_bytes:
+        raise ValidationError(f"CSV must contain 1..{maximum_bytes} bytes")
+
+    try:
+        text = data.decode("utf-8")
+    except UnicodeDecodeError as error:
+        raise ValidationError("CSV is not valid UTF-8") from error
+    if text.startswith("\ufeff"):
+        raise ValidationError("UTF-8 BOM is not allowed")
+    if _has_disallowed_control(text):
+        raise ValidationError("CSV contains disallowed control characters")
+    # Runtime intentionally implements the fixed three-field schema without
+    # general CSV quoting. Reject quoted variants here so reviewed workflow
+    # output and client-side validation cannot disagree.
+    if '"' in text:
+        raise ValidationError("quoted CSV fields are not allowed")
+
+    reader = csv.reader(io.StringIO(text, newline=""), strict=True)
+    try:
+        header = next(reader)
+    except (StopIteration, csv.Error) as error:
+        raise ValidationError("CSV header is missing") from error
+    normalized_header = tuple(field.strip().lower() for field in header)
+    if normalized_header != EXPECTED_HEADER:
+        raise ValidationError(f"unexpected CSV header: {header!r}")
+
+    data_rows = 0
+    relays: dict[str, tuple[float, float]] = {}
+    try:
+        for row in reader:
+            if not row or all(not field.strip() for field in row):
+                continue
+            data_rows += 1
+            if data_rows > maximum_rows:
+                raise ValidationError(f"CSV exceeds {maximum_rows} data rows")
+            if len(row) != 3:
+                raise ValidationError(f"row {reader.line_num} must contain exactly 3 columns")
+
+            address = normalize_relay_address(row[0])
+            latitude_text = row[1].strip()
+            longitude_text = row[2].strip()
+            if not ASCII_DECIMAL_PATTERN.fullmatch(latitude_text) or not ASCII_DECIMAL_PATTERN.fullmatch(longitude_text):
+                raise ValidationError(
+                    f"row {reader.line_num} coordinates must be ASCII decimal numbers"
+                )
+            latitude = float(latitude_text)
+            longitude = float(longitude_text)
+            if not math.isfinite(latitude) or not -90 <= latitude <= 90:
+                raise ValidationError(f"row {reader.line_num} latitude is out of range")
+            if not math.isfinite(longitude) or not -180 <= longitude <= 180:
+                raise ValidationError(f"row {reader.line_num} longitude is out of range")
+
+            coordinates = (latitude, longitude)
+            previous = relays.get(address)
+            if previous is not None and previous != coordinates:
+                raise ValidationError(f"relay {address} has conflicting coordinates")
+            relays[address] = coordinates
+            if len(relays) > maximum_unique_relays:
+                raise ValidationError(f"CSV exceeds {maximum_unique_relays} unique relays")
+    except csv.Error as error:
+        raise ValidationError(f"malformed CSV near line {reader.line_num}") from error
+
+    if len(relays) < minimum_unique_relays:
+        raise ValidationError(
+            f"CSV has {len(relays)} unique relays; minimum is {minimum_unique_relays}"
+        )
+
+    return _ValidatedDataset(
+        summary=ValidationSummary(
+            data_rows=data_rows,
+            unique_relays=len(relays),
+            sha256=hashlib.sha256(data).hexdigest(),
+        ),
+        entries=frozenset(
+            (address, coordinates[0], coordinates[1])
+            for address, coordinates in relays.items()
+        ),
+    )
+
+
+def validate_bytes(
+    data: bytes,
+    *,
+    minimum_unique_relays: int = MIN_UNIQUE_RELAYS,
+    maximum_bytes: int = MAX_BYTES,
+    maximum_rows: int = MAX_ROWS,
+    maximum_unique_relays: int = MAX_UNIQUE_RELAYS,
+) -> ValidationSummary:
+    return _validated_dataset(
+        data,
+        minimum_unique_relays=minimum_unique_relays,
+        maximum_bytes=maximum_bytes,
+        maximum_rows=maximum_rows,
+        maximum_unique_relays=maximum_unique_relays,
+    ).summary
+
+
+def validate_update(candidate: bytes, baseline: bytes) -> ValidationSummary:
+    baseline_dataset = _validated_dataset(baseline, minimum_unique_relays=1)
+    candidate_dataset = _validated_dataset(candidate)
+    baseline_summary = baseline_dataset.summary
+    candidate_summary = candidate_dataset.summary
+
+    minimum_from_baseline = math.ceil(
+        baseline_summary.unique_relays * MIN_BASELINE_FRACTION
+    )
+    maximum_from_baseline = math.floor(
+        baseline_summary.unique_relays * MAX_BASELINE_MULTIPLIER
+    )
+    if candidate_summary.unique_relays < minimum_from_baseline:
+        raise ValidationError(
+            "candidate loses more than half of the baseline's unique relays "
+            f"({candidate_summary.unique_relays} < {minimum_from_baseline})"
+        )
+    if candidate_summary.unique_relays > maximum_from_baseline:
+        raise ValidationError(
+            "candidate more than doubles the baseline's unique relays "
+            f"({candidate_summary.unique_relays} > {maximum_from_baseline})"
+        )
+
+    retained_entries = len(baseline_dataset.entries & candidate_dataset.entries)
+    if retained_entries < minimum_from_baseline:
+        raise ValidationError(
+            "candidate retains fewer than half of the baseline's exact relay-coordinate entries "
+            f"({retained_entries} < {minimum_from_baseline})"
+        )
+    return candidate_summary
+
+
+def main(argv: list[str] | None = None) -> int:
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--input", required=True, type=Path)
+    parser.add_argument("--baseline", required=True, type=Path)
+    parser.add_argument("--output", required=True, type=Path)
+    parser.add_argument("--github-output", type=Path)
+    args = parser.parse_args(argv)
+
+    try:
+        candidate = args.input.read_bytes()
+        baseline = args.baseline.read_bytes()
+        summary = validate_update(candidate, baseline)
+        args.output.write_bytes(candidate)
+        if args.github_output is not None:
+            with args.github_output.open("a", encoding="utf-8") as output:
+                output.write(f"data_rows={summary.data_rows}\n")
+                output.write(f"unique_relays={summary.unique_relays}\n")
+                output.write(f"sha256={summary.sha256}\n")
+    except (OSError, ValidationError) as error:
+        print(f"georelay validation failed: {error}", file=sys.stderr)
+        return 1
+
+    print(
+        f"validated {summary.unique_relays} unique relays across "
+        f"{summary.data_rows} rows (sha256 {summary.sha256})"
+    )
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())