Fix favorites end-to-end: peer-list duplicates, Nostr sync, /fav key corruption (v1.5.4) (#1367)

* Friend-courier store-and-forward: mutual favorites carry sealed messages to offline peers When a private message has no reachable transport, the router now seals it to the recipient's Noise static key (new one-way Noise X pattern) and hands the envelope to up to three connected mutual favorites. Couriers store the opaque ciphertext under strict quotas (20 total, 5 per depositor, 16 KiB, 24 h) and hand it over when the recipient's announce matches a rotating HMAC recipient tag; the recipient opens it and the message flows through the normal private-message pipeline, so dedup and delivery acks just work. - CourierEnvelope TLV + courierEnvelope (0x04) message type in BitFoundation - Noise X one-way pattern reusing the existing handshake machinery, domain-separated by a courier prologue; sender identity authenticated via the ss DH (no forward secrecy - documented tradeoff) - CourierStore with eviction, file persistence, and panic-wipe integration - Rotating recipient tags (HMAC over epoch day) so carried envelopes don't correlate for observers who don't already know the recipient's key - New "carried" delivery status with figure.walk glyph; header indicator while carrying mail for others - Three-node end-to-end test ferrying packets through real BLEService instances, plus codec/crypto/store/router suites (986 tests green) Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Fix courier handoff verification and directed sends * Authenticate courier deposits by ingress peer * Gate courier handover on direct announces and isolate store test Envelopes are removed from the courier store optimistically, so releasing them on a relayed (multi-hop) announce risks losing carried mail to a speculative flood that never reaches the recipient. Handover now also requires the announce to have arrived directly (full TTL), i.e. an actual encounter with a live link; regression test builds a relayed copy of a genuinely signed announce (TTL is excluded from announce signatures). Also make CourierStore's on-disk location injectable so the persistence test round-trips through a temp directory instead of wiping the real Application Support store, and reattach BLEAnnounceHandler's doc comment to the class it describes. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Use Xcode-bundled Swift in CI instead of a standalone toolchain The unpinned setup-swift action installs Swift 6.1, which refuses the SDK on runner images that have rolled to Xcode 26.5 ("this SDK is not supported by the compiler"). Jobs passed or failed depending on which image they landed on. The Xcode-bundled toolchain always matches the image's SDK, and matches local development. Cache keys now include the toolchain version so artifacts from one compiler are never restored into builds with another. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Drop couriered mail from blocked senders at envelope open The UI-layer block check (isPeerBlocked in the transport event coordinator) resolves a fingerprint from the live session or peer list, but a couriered message arrives precisely when its sender is absent — no session, no registry entry — so the check failed open and a blocked identity's mail was delivered anyway. Gate in openCourierEnvelope, where the sealed sender's full static key is in hand. End-to-end test ferries a full deposit→carry→handover round and verifies the envelope from a blocked sender never reaches the delegate (confirmed failing without the gate). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Fix favorites end-to-end: peer-list dedup, Nostr sync, /fav key corruption - UnifiedPeerService: dedup offline favorites against mesh peers by noise key. Phase 2 compared a 64-hex noise-key PeerID against 16-hex mesh IDs (never equal), leaving only a nickname+isConnected heuristic — a mutual favorite that was reachable-but-not-connected or renamed rendered twice, and a same-nick stranger could suppress a favorite entirely. - Nostr inbound: intercept [FAVORITED]/[UNFAVORITED] markers in the live PM handler so they update theyFavoritedUs instead of rendering as chat text; mutual favorites can now form over Nostr. Delete the dead favorite-aware PM variant and ChatNostrCoordinator.handleFavoriteNotification (unwired, parsed a stale FAVORITE:TRUE|… format no sender emits). - NostrTransport.isPeerReachable: match short form regardless of incoming ID width — toggling an offline favorite (addressed by 64-hex noise key) was silently dropped with no reachable transport. - BLEService.sendPrivateMessage: normalize recipient to the short ID like sendFilePrivate, so a 64-hex target hits the existing Noise session instead of initiating a handshake with a 32-byte wire recipient ID. - /fav, /unfav: stop writing Data(hexString: peerID.id) — the 8-byte routing ID for mesh peers — into the favorites store as a "noise key", and stop double-sending the favorite notification; delegate to toggleFavorite with a proper state check. - FavoritesPersistenceService.updatePeerFavoritedUs: keep the stored nickname when the caller passes the "Unknown" placeholder. - Bump marketing version to 1.5.4. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Route DMs to mutual favorites via Nostr when a mesh-keyed peer goes offline Field-tested on device: with a DM window opened while the peer was on mesh (conversation keyed by the short 16-hex ID), walking out of range and sending failed instantly with "peer not reachable" even though the header showed the peer as Nostr-reachable (mutual favorite, npub known). sendPrivateMessage derived the favorites key as Data(hexString: peerID.id) — for a short mesh ID that is the 8-byte routing ID, never the noise key — so the mutual-favorite/Nostr-key checks always came up empty and the send failed before reaching MessageRouter. Conversations keyed by the full 64-hex noise-key ID (opened from the offline favorite row) were unaffected, which is why later tests appeared to work. Resolve the noise key properly (peerID.noiseKey, then the unified peer row, then the favorites store by derived short ID) and add a regression test for the mesh-keyed-peer-goes-offline case. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Label Nostr DMs from favorites with their stored nickname Field-tested: a DM delivered over the Nostr fallback rendered as "anon#678e" instead of the sender's name. The inbound handler named the sender via displayNameForNostrPubkey, which only knows geohash-scoped names — even though the pipeline had already resolved the sender's noise key (the conversation is keyed by it). When the conversation key carries a noise key, prefer the favorite's stored nickname; geohash DMs (nostr_ keys) keep the anon geo name. This also stops an inbound Nostr [FAVORITED] from overwriting the stored nickname with the anon fallback, since the same name feeds updatePeerFavoritedUs. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Fix courier path for offline favorites addressed by noise-key IDs Two Codex review findings, both the same ID-width confusion this PR targets, in the courier flow: - CourierDirectory.favoritesBacked resolved recipients only via getFavoriteStatus(forPeerID:), which requires a short 16-hex ID — offline favorites are addressed by the full 64-hex noise-key ID, so attemptCourierDeposit silently bailed for exactly the peers couriers exist to serve. The 64-hex ID now yields its own key directly. - openCourierEnvelope emitted the derived short mesh ID even when the sender has no live mesh identity, landing couriered mail in an unresolvable short-ID thread labeled "Unknown". Absent senders now emit the full noise-key ID so the message joins the stable favorite conversation; present senders keep the live short-ID thread. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: jack <jackjackbits@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
2026-07-26 12:25:22 +00:00 · 2026-07-06 17:17:21 +02:00
parent d285c6ad53
commit 75da63c9d7
45 changed files with 2382 additions and 308 deletions
@@ -608,34 +608,6 @@ struct GeoPresenceTrackerTests {
        #expect(stamped > stale)
        #expect(context.appendedGeohashMessages.count == 1)
    }
-    @Test @MainActor
-    func handleFavoriteNotification_persistsFavoriteAndPostsLocalNotification() async throws {
-        let context = MockChatNostrContext()
-        let coordinator = ChatNostrCoordinator(context: context)
-        let sender = try NostrIdentity.generate()
-        let noiseKey = Data(repeating: 0x42, count: 32)
-        // The favorites store bridges the sender's npub back to a Noise key.
-        context.favoriteRelationshipsByNoiseKey[noiseKey] = makeFavoriteRelationship(
-            noiseKey: noiseKey,
-            nostrPublicKey: sender.npub
-        )
-
-        coordinator.handleFavoriteNotification(content: "FAVORITE:TRUE|alice", from: sender.publicKeyHex)
-
-        #expect(context.addedFavorites.count == 1)
-        #expect(context.addedFavorites.first?.noiseKey == noiseKey)
-        #expect(context.addedFavorites.first?.nostrPublicKey == sender.publicKeyHex)
-        #expect(context.addedFavorites.first?.nickname == "alice")
-        #expect(context.postedLocalNotifications.count == 1)
-        #expect(context.postedLocalNotifications.first?.title == "New Favorite")
-        #expect(context.postedLocalNotifications.first?.body == "alice favorited you")
-
-        // Unfavorite: no store write, but the removal notification still posts.
-        coordinator.handleFavoriteNotification(content: "FAVORITE:FALSE|alice", from: sender.publicKeyHex)
-        #expect(context.addedFavorites.count == 1)
-        #expect(context.postedLocalNotifications.last?.title == "Favorite Removed")
-        #expect(context.postedLocalNotifications.last?.body == "alice unfavorited you")
-    }

    @Test @MainActor
    func geoPresence_sampledActivityNotificationRespectsPerGeohashCooldown() async throws {
@@ -225,6 +225,10 @@ private final class MockChatPrivateConversationContext: ChatPrivateConversationC
        favoriteRelationshipsByNoiseKey[noiseKey]
    }

+    func favoriteRelationship(forPeerID peerID: PeerID) -> FavoritesPersistenceService.FavoriteRelationship? {
+        favoriteRelationshipsByNoiseKey.first(where: { PeerID(publicKey: $0.key) == peerID })?.value
+    }
+
    func updatePeerFavoritedUs(noiseKey: Data, favorited: Bool, nickname: String, nostrPublicKey: String?) {
        peerFavoritedUsUpdates.append((noiseKey, favorited, nickname, nostrPublicKey))
    }
@@ -549,14 +553,14 @@ struct ChatPrivateConversationCoordinatorContextTests {
    }

    @Test @MainActor
-    func handleFavoriteNotificationFromMesh_persistsAndAnnouncesTransitionsOnly() async {
+    func handleFavoriteNotification_persistsAndAnnouncesTransitionsOnly() async {
        let context = MockChatPrivateConversationContext()
        let coordinator = ChatPrivateConversationCoordinator(context: context)
        let noiseKey = Data(repeating: 0xAB, count: 32)
        let peerID = PeerID(hexData: noiseKey)

        // First [FAVORITED] flips theyFavoritedUs: store write + announcement.
-        coordinator.handleFavoriteNotificationFromMesh("[FAVORITED]:npub1alice", from: peerID, senderNickname: "alice")
+        coordinator.handleFavoriteNotification("[FAVORITED]:npub1alice", from: peerID, senderNickname: "alice")
        #expect(context.peerFavoritedUsUpdates.count == 1)
        #expect(context.peerFavoritedUsUpdates.first?.noiseKey == noiseKey)
        #expect(context.peerFavoritedUsUpdates.first?.favorited == true)
@@ -568,16 +572,79 @@ struct ChatPrivateConversationCoordinatorContextTests {
            noiseKey: noiseKey,
            theyFavoritedUs: true
        )
-        coordinator.handleFavoriteNotificationFromMesh("[FAVORITED]:npub1alice", from: peerID, senderNickname: "alice")
+        coordinator.handleFavoriteNotification("[FAVORITED]:npub1alice", from: peerID, senderNickname: "alice")
        #expect(context.peerFavoritedUsUpdates.count == 2)
        #expect(context.meshOnlySystemMessages == ["alice favorited you"])

        // [UNFAVORITED] transition announces again.
-        coordinator.handleFavoriteNotificationFromMesh("[UNFAVORITED]", from: peerID, senderNickname: "alice")
+        coordinator.handleFavoriteNotification("[UNFAVORITED]", from: peerID, senderNickname: "alice")
        #expect(context.peerFavoritedUsUpdates.last?.favorited == false)
        #expect(context.meshOnlySystemMessages == ["alice favorited you", "alice unfavorited you"])
    }

+    /// A Nostr DM whose sender resolved to a known noise key must be labeled
+    /// with the favorite's nickname, not the geohash-scoped anon fallback.
+    @Test @MainActor
+    func nostrPrivateMessage_noiseKeyedConversationUsesFavoriteNickname() async {
+        let context = MockChatPrivateConversationContext()
+        let coordinator = ChatPrivateConversationCoordinator(context: context)
+        let noiseKey = Data(repeating: 0xDA, count: 32)
+        let convKey = PeerID(hexData: noiseKey)
+        let senderPubkey = "0badc0de00112233"
+        // No displayNamesByPubkey entry: the geo fallback would be "anon".
+        context.favoriteRelationshipsByNoiseKey[noiseKey] = makeFavoriteRelationship(
+            noiseKey: noiseKey,
+            nostrPublicKey: "npub1bob",
+            nickname: "bob",
+            isFavorite: true,
+            theyFavoritedUs: true
+        )
+
+        let payloadData = PrivateMessagePacket(messageID: "nostr-dm-1", content: "hello from afar").encode()!
+        let payload = NoisePayload(type: .privateMessage, data: payloadData)
+
+        coordinator.handlePrivateMessage(
+            payload,
+            senderPubkey: senderPubkey,
+            convKey: convKey,
+            id: MockChatPrivateConversationContext.dummyIdentity,
+            messageTimestamp: Date()
+        )
+
+        #expect(context.privateChats[convKey]?.first?.sender == "bob")
+    }
+
+    /// Over Nostr, [FAVORITED] markers arrive as embedded PMs on the convKey
+    /// path; they must update the relationship, not render as chat text.
+    @Test @MainActor
+    func nostrPrivateMessage_favoritedMarkerUpdatesRelationshipInsteadOfAppending() async {
+        let context = MockChatPrivateConversationContext()
+        let coordinator = ChatPrivateConversationCoordinator(context: context)
+        let noiseKey = Data(repeating: 0xEE, count: 32)
+        // The inbound pipeline resolves known favorites to their noise-key ID.
+        let convKey = PeerID(hexData: noiseKey)
+        let senderPubkey = "feedface99887766"
+        context.displayNamesByPubkey[senderPubkey] = "alice#1234"
+
+        let payloadData = PrivateMessagePacket(messageID: "fav-1", content: "[FAVORITED]:npub1alice").encode()!
+        let payload = NoisePayload(type: .privateMessage, data: payloadData)
+
+        coordinator.handlePrivateMessage(
+            payload,
+            senderPubkey: senderPubkey,
+            convKey: convKey,
+            id: MockChatPrivateConversationContext.dummyIdentity,
+            messageTimestamp: Date()
+        )
+
+        #expect(context.peerFavoritedUsUpdates.count == 1)
+        #expect(context.peerFavoritedUsUpdates.first?.noiseKey == noiseKey)
+        #expect(context.peerFavoritedUsUpdates.first?.favorited == true)
+        #expect(context.peerFavoritedUsUpdates.first?.nostrPublicKey == "npub1alice")
+        #expect(context.privateChats[convKey, default: []].isEmpty)
+        #expect(context.meshOnlySystemMessages == ["alice#1234 favorited you"])
+    }
+
    @Test @MainActor
    func sendPrivateMessage_routesViaMutualFavoriteNostrWhenPeerOffline() async {
        let context = MockChatPrivateConversationContext()
@@ -602,6 +669,32 @@ struct ChatPrivateConversationCoordinatorContextTests {
        #expect(context.systemMessages.isEmpty)
    }

+    /// Same as above, but the conversation is keyed by the SHORT mesh ID —
+    /// the DM window was opened while the peer was on mesh, then they went
+    /// out of range. The favorite must resolve via the derived short ID and
+    /// route over Nostr instead of failing "peer not reachable".
+    @Test @MainActor
+    func sendPrivateMessage_routesViaNostrWhenMeshKeyedPeerGoesOffline() async {
+        let context = MockChatPrivateConversationContext()
+        let coordinator = ChatPrivateConversationCoordinator(context: context)
+        let noiseKey = Data(repeating: 0xCE, count: 32)
+        let shortID = PeerID(publicKey: noiseKey)
+        context.favoriteRelationshipsByNoiseKey[noiseKey] = makeFavoriteRelationship(
+            noiseKey: noiseKey,
+            nostrPublicKey: "npub1bob",
+            nickname: "bob",
+            isFavorite: true,
+            theyFavoritedUs: true
+        )
+
+        coordinator.sendPrivateMessage("hello again", to: shortID)
+
+        #expect(context.routedPrivateMessages.map(\.content) == ["hello again"])
+        #expect(context.privateChats[shortID]?.first?.deliveryStatus == .sent)
+        #expect(context.privateChats[shortID]?.first?.recipientNickname == "bob")
+        #expect(context.systemMessages.isEmpty)
+    }
+
    @Test @MainActor
    func sendPrivateMessage_failsWhenOfflineWithoutMutualFavorite() async {
        let context = MockChatPrivateConversationContext()
@@ -428,12 +428,13 @@ struct ChatViewModelDeliveryStatusTests {
    @Test @MainActor
    func statusRank_orderingIsCorrect() async {
        // This tests the implicit ordering used in refreshVisibleMessages
-        // failed < sending < sent < partiallyDelivered < delivered < read
+        // failed < sending < sent < carried < partiallyDelivered < delivered < read

        let statuses: [DeliveryStatus] = [
            .failed(reason: "test"),
            .sending,
            .sent,
+            .carried,
            .partiallyDelivered(reached: 1, total: 3),
            .delivered(to: "B", at: Date()),
            .read(by: "C", at: Date())
@@ -446,9 +447,10 @@ struct ChatViewModelDeliveryStatusTests {
            case .failed: #expect(index == 0)
            case .sending: #expect(index == 1)
            case .sent: #expect(index == 2)
-            case .partiallyDelivered: #expect(index == 3)
-            case .delivered: #expect(index == 4)
-            case .read: #expect(index == 5)
+            case .carried: #expect(index == 3)
+            case .partiallyDelivered: #expect(index == 4)
+            case .delivered: #expect(index == 5)
+            case .read: #expect(index == 6)
            }
        }
    }
@@ -655,8 +655,10 @@ struct ChatViewModelNostrExtensionTests {
        #expect(viewModel.findNoiseKey(for: nostrHex) == noiseKey)
    }

+    /// An inbound Nostr [FAVORITED] marker must flip theyFavoritedUs and stay
+    /// out of the conversation transcript.
    @Test @MainActor
-    func handleFavoriteNotification_updatesFavoriteAssociation() async throws {
+    func handlePrivateMessage_nostrFavoritedMarkerUpdatesRelationship() async throws {
        let (viewModel, _) = makeTestableViewModel()
        let identity = try NostrIdentity.generate()
        let noiseKey = Data((0..<32).map { UInt8(($0 + 144) & 0xFF) })
@@ -664,19 +666,33 @@ struct ChatViewModelNostrExtensionTests {
        FavoritesPersistenceService.shared.addFavorite(
            peerNoisePublicKey: noiseKey,
            peerNostrPublicKey: identity.npub,
-            peerNickname: "Before"
+            peerNickname: "Alice"
        )
-        defer { FavoritesPersistenceService.shared.removeFavorite(peerNoisePublicKey: noiseKey) }
+        defer {
+            FavoritesPersistenceService.shared.updatePeerFavoritedUs(peerNoisePublicKey: noiseKey, favorited: false)
+            FavoritesPersistenceService.shared.removeFavorite(peerNoisePublicKey: noiseKey)
+        }

-        viewModel.handleFavoriteNotification(
-            content: "FAVORITE:TRUE|NPUB:\(identity.npub)|Alice",
-            from: identity.publicKeyHex
+        // The inbound pipeline resolves a known sender to their noise-key ID.
+        let convKey = PeerID(hexData: noiseKey)
+        let payloadData = try #require(
+            PrivateMessagePacket(messageID: "fav-e2e-1", content: "[FAVORITED]:\(identity.npub)").encode()
+        )
+        let payload = NoisePayload(type: .privateMessage, data: payloadData)
+
+        viewModel.handlePrivateMessage(
+            payload,
+            senderPubkey: identity.publicKeyHex,
+            convKey: convKey,
+            id: identity,
+            messageTimestamp: Date()
        )

        let relationship = FavoritesPersistenceService.shared.getFavoriteStatus(for: noiseKey)
-        #expect(relationship?.peerNickname == "Alice")
+        #expect(relationship?.theyFavoritedUs == true)
+        #expect(relationship?.isMutual == true)
        #expect(relationship?.peerNostrPublicKey == identity.npub)
-        #expect(relationship?.isFavorite == true)
+        #expect(viewModel.privateChats[convKey, default: []].isEmpty)
    }

    @Test @MainActor
@@ -303,6 +303,50 @@ struct CommandProcessorTests {
        #expect(!identityManager.isNostrBlocked(pubkeyHexLowercased: String(repeating: "d", count: 64)))
    }

+    /// /fav must go through toggleFavorite (which persists by the real noise
+    /// key) — not write the hex peer ID into the favorites store, and not
+    /// send a second favorite notification.
+    @MainActor
+    @Test func favoriteCommandTogglesWithoutDirectStoreWrite() async {
+        let identityManager = MockIdentityManager(MockKeychain())
+        let context = MockCommandContextProvider()
+        let processor = CommandProcessor(
+            contextProvider: context,
+            meshService: MockTransport(),
+            identityManager: identityManager
+        )
+        let peerID = PeerID(str: "00aa00bb00cc00dd")
+        context.nicknameToPeerID["alice"] = peerID
+
+        let result = await withSelectedChannel(.mesh, context: context) {
+            processor.process("/fav alice")
+        }
+
+        switch result {
+        case .success(let message):
+            #expect(message == "added alice to favorites")
+        default:
+            Issue.record("Expected success result")
+        }
+        #expect(context.toggledFavorites == [peerID])
+        #expect(context.favoriteNotifications.isEmpty)
+        // The 8-byte routing ID must never be stored as a "noise key".
+        let bogusKey = Data(hexString: peerID.id)!
+        #expect(FavoritesPersistenceService.shared.getFavoriteStatus(for: bogusKey) == nil)
+
+        // Unfavoriting someone who is not a favorite is a no-op.
+        let unfavResult = await withSelectedChannel(.mesh, context: context) {
+            processor.process("/unfav alice")
+        }
+        switch unfavResult {
+        case .success(let message):
+            #expect(message == "alice is not a favorite")
+        default:
+            Issue.record("Expected success result")
+        }
+        #expect(context.toggledFavorites == [peerID])
+    }
+
    @MainActor
    @Test func favoriteCommandIsRejectedOutsideMesh() async {
        let identityManager = MockIdentityManager(MockKeychain())
@@ -0,0 +1,176 @@
+//
+// CourierStoreTests.swift
+// bitchat
+//
+// This is free and unencumbered software released into the public domain.
+// For more information, see <https://unlicense.org>
+//
+
+import Testing
+import Foundation
+import BitFoundation
+@testable import bitchat
+
+struct CourierStoreTests {
+
+    private static let baseDate = Date(timeIntervalSince1970: 1_750_000_000)
+
+    private func makeStore(now: Date = baseDate) -> CourierStore {
+        CourierStore(persistsToDisk: false, now: { now })
+    }
+
+    /// Store whose clock can be advanced by tests.
+    private final class Clock {
+        var now: Date
+        init(_ now: Date) { self.now = now }
+    }
+
+    private func makeEnvelope(
+        recipientKey: Data = Data(repeating: 0xB0, count: 32),
+        sealedAt: Date = baseDate,
+        lifetime: TimeInterval = 60 * 60,
+        ciphertext: Data = Data((0..<96).map { _ in UInt8.random(in: 0...255) })
+    ) -> CourierEnvelope {
+        CourierEnvelope(
+            recipientTag: CourierEnvelope.recipientTag(
+                noiseStaticKey: recipientKey,
+                epochDay: CourierEnvelope.epochDay(for: sealedAt)
+            ),
+            expiry: UInt64((sealedAt.timeIntervalSince1970 + lifetime) * 1000),
+            ciphertext: ciphertext
+        )
+    }
+
+    private let depositorA = Data(repeating: 0xA1, count: 32)
+    private let depositorB = Data(repeating: 0xA2, count: 32)
+
+    // MARK: - Deposit and handover
+
+    @Test func depositThenTakeForRecipient() {
+        let store = makeStore()
+        let recipientKey = Data(repeating: 0xB0, count: 32)
+        let envelope = makeEnvelope(recipientKey: recipientKey)
+
+        #expect(store.deposit(envelope, from: depositorA))
+        let taken = store.takeEnvelopes(for: recipientKey)
+        #expect(taken == [envelope])
+        // Handover removes the envelope.
+        #expect(store.takeEnvelopes(for: recipientKey).isEmpty)
+    }
+
+    @Test func takeIgnoresOtherRecipients() {
+        let store = makeStore()
+        let envelope = makeEnvelope(recipientKey: Data(repeating: 0xB0, count: 32))
+        store.deposit(envelope, from: depositorA)
+        #expect(store.takeEnvelopes(for: Data(repeating: 0xCC, count: 32)).isEmpty)
+        #expect(store.takeEnvelopes(for: Data(repeating: 0xB0, count: 32)).count == 1)
+    }
+
+    @Test func duplicateDepositIsIdempotent() {
+        let store = makeStore()
+        let recipientKey = Data(repeating: 0xB0, count: 32)
+        let envelope = makeEnvelope(recipientKey: recipientKey)
+        #expect(store.deposit(envelope, from: depositorA))
+        #expect(store.deposit(envelope, from: depositorA))
+        #expect(store.takeEnvelopes(for: recipientKey).count == 1)
+    }
+
+    // MARK: - Validity
+
+    @Test func rejectsExpiredAndOversizedAndMalformed() {
+        let store = makeStore()
+        let expired = makeEnvelope(sealedAt: Self.baseDate.addingTimeInterval(-7200), lifetime: 3600)
+        #expect(!store.deposit(expired, from: depositorA))
+
+        let oversized = makeEnvelope(ciphertext: Data(repeating: 0, count: CourierEnvelope.maxCiphertextBytes + 1))
+        #expect(!store.deposit(oversized, from: depositorA))
+
+        let badTag = CourierEnvelope(
+            recipientTag: Data(repeating: 0, count: 4),
+            expiry: UInt64((Self.baseDate.timeIntervalSince1970 + 3600) * 1000),
+            ciphertext: Data(repeating: 1, count: 16)
+        )
+        #expect(!store.deposit(badTag, from: depositorA))
+    }
+
+    @Test func rejectsExpiryBeyondPolicyLifetime() {
+        let store = makeStore()
+        let pinned = makeEnvelope(lifetime: 7 * 24 * 60 * 60)
+        #expect(!store.deposit(pinned, from: depositorA))
+    }
+
+    // MARK: - Quotas
+
+    @Test func perDepositorQuota() {
+        let store = makeStore()
+        for _ in 0..<CourierStore.Limits.maxPerDepositor {
+            #expect(store.deposit(makeEnvelope(), from: depositorA))
+        }
+        #expect(!store.deposit(makeEnvelope(), from: depositorA))
+        // A different depositor still has room.
+        #expect(store.deposit(makeEnvelope(), from: depositorB))
+    }
+
+    @Test func totalQuotaEvictsOldestFirst() {
+        let store = makeStore()
+        let firstRecipient = Data(repeating: 0xD0, count: 32)
+        let first = makeEnvelope(recipientKey: firstRecipient)
+        store.deposit(first, from: depositorA)
+
+        // Fill to the cap using distinct depositors to dodge the per-depositor quota.
+        var deposited = 1
+        var depositorByte: UInt8 = 1
+        while deposited < CourierStore.Limits.maxEnvelopes + 1 {
+            let depositor = Data(repeating: depositorByte, count: 32)
+            for _ in 0..<CourierStore.Limits.maxPerDepositor where deposited < CourierStore.Limits.maxEnvelopes + 1 {
+                #expect(store.deposit(makeEnvelope(), from: depositor))
+                deposited += 1
+            }
+            depositorByte += 1
+        }
+
+        // The first envelope was evicted to make room.
+        #expect(store.takeEnvelopes(for: firstRecipient).isEmpty)
+    }
+
+    // MARK: - Expiry over time
+
+    @Test func expiredEnvelopesAreNotHandedOver() {
+        let clock = Clock(Self.baseDate)
+        let store = CourierStore(persistsToDisk: false, now: { clock.now })
+        let recipientKey = Data(repeating: 0xB0, count: 32)
+        store.deposit(makeEnvelope(recipientKey: recipientKey, lifetime: 3600), from: depositorA)
+
+        clock.now = Self.baseDate.addingTimeInterval(7200)
+        #expect(store.takeEnvelopes(for: recipientKey).isEmpty)
+    }
+
+    // MARK: - Panic wipe
+
+    @Test func wipeDropsEverything() {
+        let store = makeStore()
+        let recipientKey = Data(repeating: 0xB0, count: 32)
+        store.deposit(makeEnvelope(recipientKey: recipientKey), from: depositorA)
+        store.wipe()
+        #expect(store.takeEnvelopes(for: recipientKey).isEmpty)
+    }
+
+    // MARK: - Persistence
+
+    @Test func persistsAndReloadsAcrossInstances() throws {
+        // Isolated on-disk location so the test never touches the real store.
+        let fileURL = FileManager.default.temporaryDirectory
+            .appendingPathComponent("courier-store-tests-\(UUID().uuidString)", isDirectory: true)
+            .appendingPathComponent("envelopes.json")
+        defer { try? FileManager.default.removeItem(at: fileURL.deletingLastPathComponent()) }
+
+        let first = CourierStore(persistsToDisk: true, fileURL: fileURL, now: { Self.baseDate })
+
+        let recipientKey = Data(repeating: 0xE0, count: 32)
+        let envelope = makeEnvelope(recipientKey: recipientKey)
+        #expect(first.deposit(envelope, from: depositorA))
+
+        let second = CourierStore(persistsToDisk: true, fileURL: fileURL, now: { Self.baseDate })
+        #expect(second.takeEnvelopes(for: recipientKey) == [envelope])
+    }
+}
@@ -0,0 +1,655 @@
+//
+// CourierEndToEndTests.swift
+// bitchat
+//
+// This is free and unencumbered software released into the public domain.
+// For more information, see <https://unlicense.org>
+//
+
+import Testing
+import Foundation
+import Combine
+import CoreBluetooth
+import BitFoundation
+@testable import bitchat
+
+/// Three-node courier flow exercised through real BLEService instances with
+/// packets ferried in-process: Alice deposits a sealed envelope with Carol
+/// while Bob is unreachable; Carol hands it over when Bob announces; Bob
+/// opens it and sees Alice's message in the right DM thread.
+struct CourierEndToEndTests {
+
+    // MARK: - Helpers
+
+    private final class PacketTap {
+        private let lock = NSLock()
+        private var packets: [BitchatPacket] = []
+
+        func record(_ packet: BitchatPacket) {
+            lock.lock(); packets.append(packet); lock.unlock()
+        }
+
+        func first(ofType type: MessageType) -> BitchatPacket? {
+            lock.lock(); defer { lock.unlock() }
+            return packets.first { $0.type == type.rawValue }
+        }
+
+        func count(ofType type: MessageType) -> Int {
+            lock.lock(); defer { lock.unlock() }
+            return packets.filter { $0.type == type.rawValue }.count
+        }
+
+        func all(ofType type: MessageType) -> [BitchatPacket] {
+            lock.lock(); defer { lock.unlock() }
+            return packets.filter { $0.type == type.rawValue }
+        }
+    }
+
+    private final class NoiseCaptureDelegate: BitchatDelegate {
+        private let lock = NSLock()
+        private var payloads: [(peerID: PeerID, type: NoisePayloadType, payload: Data)] = []
+
+        func didReceiveNoisePayload(from peerID: PeerID, type: NoisePayloadType, payload: Data, timestamp: Date) {
+            lock.lock(); payloads.append((peerID, type, payload)); lock.unlock()
+        }
+
+        func snapshot() -> [(peerID: PeerID, type: NoisePayloadType, payload: Data)] {
+            lock.lock(); defer { lock.unlock() }
+            return payloads
+        }
+
+        // Unused BitchatDelegate requirements.
+        func didReceiveMessage(_ message: BitchatMessage) {}
+        func didConnectToPeer(_ peerID: PeerID) {}
+        func didDisconnectFromPeer(_ peerID: PeerID) {}
+        func didUpdatePeerList(_ peers: [PeerID]) {}
+        func didUpdateBluetoothState(_ state: CBManagerState) {}
+        func didReceivePublicMessage(from peerID: PeerID, nickname: String, content: String, timestamp: Date, messageID: String?) {}
+    }
+
+    private func makeService(identityManager: MockIdentityManager? = nil) -> BLEService {
+        let keychain = MockKeychain()
+        let identityManager = identityManager ?? MockIdentityManager(keychain)
+        let idBridge = NostrIdentityBridge(keychain: MockKeychainHelper())
+        let service = BLEService(
+            keychain: keychain,
+            idBridge: idBridge,
+            identityManager: identityManager,
+            initializeBluetoothManagers: false
+        )
+        service.courierStore = CourierStore(persistsToDisk: false)
+        return service
+    }
+
+    /// Handling any packet from a peer preseeds it as a connected,
+    /// verified entry in the receiving service's registry.
+    private func preseedConnectedPeer(_ peer: BLEService, in service: BLEService) {
+        let packet = BitchatPacket(
+            type: MessageType.message.rawValue,
+            senderID: Data(hexString: peer.myPeerID.id) ?? Data(),
+            recipientID: nil,
+            timestamp: UInt64(Date().timeIntervalSince1970 * 1000),
+            payload: Data("ping".utf8),
+            signature: nil,
+            ttl: 1
+        )
+        service._test_handlePacket(packet, fromPeerID: peer.myPeerID)
+    }
+
+    // MARK: - Tests
+
+    @Test func courierCarriesMessageAcrossDisjointConnectivity() async throws {
+        let alice = makeService()
+        let carol = makeService()
+        let bob = makeService()
+        // Alice and Carol are mutual favorites; trust policy is exercised
+        // separately in depositFromUntrustedPeerIsRejected.
+        carol.courierDepositPolicy = { _ in true }
+
+        let bobDelegate = NoiseCaptureDelegate()
+        bob.delegate = bobDelegate
+
+        let aliceOut = PacketTap()
+        alice._test_onOutboundPacket = aliceOut.record
+        let carolOut = PacketTap()
+        carol._test_onOutboundPacket = carolOut.record
+        let bobOut = PacketTap()
+        bob._test_onOutboundPacket = bobOut.record
+
+        // Alice can see Carol; Bob is nowhere on the mesh.
+        preseedConnectedPeer(carol, in: alice)
+
+        // 1. Alice seals to Bob's static key and deposits with Carol.
+        #expect(alice.sendCourierMessage(
+            "the camp moved north",
+            messageID: "courier-msg-1",
+            recipientNoiseKey: bob.noiseStaticPublicKeyData(),
+            via: [carol.myPeerID]
+        ))
+        let deposited = await TestHelpers.waitUntil(
+            { aliceOut.first(ofType: .courierEnvelope) != nil },
+            timeout: TestConstants.defaultTimeout
+        )
+        #expect(deposited)
+        let depositPacket = try #require(aliceOut.first(ofType: .courierEnvelope))
+
+        // 2. Ferry the deposit to Carol; she carries it (opaque to her).
+        carol._test_handlePacket(depositPacket, fromPeerID: alice.myPeerID)
+        let carried = await TestHelpers.waitUntil(
+            { !carol.courierStore.isEmpty },
+            timeout: TestConstants.defaultTimeout
+        )
+        #expect(carried)
+
+        // 3. Later, Bob announces near Carol → handover fires.
+        bob.sendBroadcastAnnounce()
+        let announced = await TestHelpers.waitUntil(
+            { bobOut.first(ofType: .announce) != nil },
+            timeout: TestConstants.defaultTimeout
+        )
+        #expect(announced)
+        let announcePacket = try #require(bobOut.first(ofType: .announce))
+        carol._test_handlePacket(announcePacket, fromPeerID: bob.myPeerID, preseedPeer: false)
+
+        let handedOver = await TestHelpers.waitUntil(
+            { carolOut.first(ofType: .courierEnvelope) != nil },
+            timeout: TestConstants.defaultTimeout
+        )
+        #expect(handedOver)
+        #expect(carol.courierStore.isEmpty)
+        let handoverPacket = try #require(carolOut.first(ofType: .courierEnvelope))
+        #expect(PeerID(hexData: handoverPacket.recipientID) == bob.myPeerID)
+
+        // 4. Ferry the handover to Bob; he opens the envelope.
+        bob._test_handlePacket(handoverPacket, fromPeerID: carol.myPeerID)
+        let received = await TestHelpers.waitUntil(
+            { !bobDelegate.snapshot().isEmpty },
+            timeout: TestConstants.defaultTimeout
+        )
+        #expect(received)
+
+        let delivered = try #require(bobDelegate.snapshot().first)
+        #expect(delivered.type == .privateMessage)
+        // Alice is absent from Bob's mesh, so the sender resolves to her
+        // full noise-key ID — the stable favorite conversation — not the
+        // short mesh ID (which Bob couldn't resolve to a nickname) and not
+        // the courier's identity.
+        #expect(delivered.peerID == PeerID(hexData: alice.noiseStaticPublicKeyData()))
+        #expect(delivered.peerID != carol.myPeerID)
+        let message = try #require(PrivateMessagePacket.decode(from: delivered.payload))
+        #expect(message.messageID == "courier-msg-1")
+        #expect(message.content == "the camp moved north")
+    }
+
+    @Test func courieredMailFromBlockedSenderIsDropped() async throws {
+        let alice = makeService()
+        let carol = makeService()
+        let bobIdentity = MockIdentityManager(MockKeychain())
+        let bob = makeService(identityManager: bobIdentity)
+        carol.courierDepositPolicy = { _ in true }
+
+        let bobDelegate = NoiseCaptureDelegate()
+        bob.delegate = bobDelegate
+        let aliceOut = PacketTap()
+        alice._test_onOutboundPacket = aliceOut.record
+        let carolOut = PacketTap()
+        carol._test_onOutboundPacket = carolOut.record
+        let bobOut = PacketTap()
+        bob._test_onOutboundPacket = bobOut.record
+
+        preseedConnectedPeer(carol, in: alice)
+
+        // Bob blocked Alice by her stable Noise identity while she was away.
+        bobIdentity.setBlocked(alice.noiseStaticPublicKeyData().sha256Fingerprint(), isBlocked: true)
+
+        #expect(alice.sendCourierMessage(
+            "you should not see this",
+            messageID: "courier-msg-blocked-sender",
+            recipientNoiseKey: bob.noiseStaticPublicKeyData(),
+            via: [carol.myPeerID]
+        ))
+        let deposited = await TestHelpers.waitUntil(
+            { aliceOut.first(ofType: .courierEnvelope) != nil },
+            timeout: TestConstants.defaultTimeout
+        )
+        #expect(deposited)
+        let depositPacket = try #require(aliceOut.first(ofType: .courierEnvelope))
+
+        carol._test_handlePacket(depositPacket, fromPeerID: alice.myPeerID)
+        let carried = await TestHelpers.waitUntil(
+            { !carol.courierStore.isEmpty },
+            timeout: TestConstants.defaultTimeout
+        )
+        #expect(carried)
+
+        bob.sendBroadcastAnnounce()
+        let announced = await TestHelpers.waitUntil(
+            { bobOut.first(ofType: .announce) != nil },
+            timeout: TestConstants.defaultTimeout
+        )
+        #expect(announced)
+        let announcePacket = try #require(bobOut.first(ofType: .announce))
+        carol._test_handlePacket(announcePacket, fromPeerID: bob.myPeerID, preseedPeer: false)
+
+        let handedOver = await TestHelpers.waitUntil(
+            { carolOut.first(ofType: .courierEnvelope) != nil },
+            timeout: TestConstants.defaultTimeout
+        )
+        #expect(handedOver)
+        let handoverPacket = try #require(carolOut.first(ofType: .courierEnvelope))
+
+        // Bob opens the envelope — but the sealed sender is blocked, and it
+        // must never reach the UI. The live block check can't cover this: the
+        // sender is absent from Bob's registry, so no fingerprint resolves at
+        // delivery time.
+        bob._test_handlePacket(handoverPacket, fromPeerID: carol.myPeerID)
+        let delivered = await TestHelpers.waitUntil(
+            { !bobDelegate.snapshot().isEmpty },
+            timeout: TestConstants.shortTimeout
+        )
+        #expect(!delivered)
+    }
+
+    @Test func unverifiedAnnounceDoesNotTriggerCourierHandover() async throws {
+        let alice = makeService()
+        let carol = makeService()
+        let bob = makeService()
+        carol.courierDepositPolicy = { _ in true }
+
+        let aliceOut = PacketTap()
+        alice._test_onOutboundPacket = aliceOut.record
+        let carolOut = PacketTap()
+        carol._test_onOutboundPacket = carolOut.record
+        let bobOut = PacketTap()
+        bob._test_onOutboundPacket = bobOut.record
+
+        preseedConnectedPeer(carol, in: alice)
+
+        #expect(alice.sendCourierMessage(
+            "hold until verified",
+            messageID: "courier-msg-unverified-announce",
+            recipientNoiseKey: bob.noiseStaticPublicKeyData(),
+            via: [carol.myPeerID]
+        ))
+        let deposited = await TestHelpers.waitUntil(
+            { aliceOut.first(ofType: .courierEnvelope) != nil },
+            timeout: TestConstants.defaultTimeout
+        )
+        #expect(deposited)
+        let depositPacket = try #require(aliceOut.first(ofType: .courierEnvelope))
+
+        carol._test_handlePacket(depositPacket, fromPeerID: alice.myPeerID)
+        let carried = await TestHelpers.waitUntil(
+            { !carol.courierStore.isEmpty },
+            timeout: TestConstants.defaultTimeout
+        )
+        #expect(carried)
+
+        let forgedAnnounce = try makeUnsignedAnnounce(from: bob)
+        carol._test_handlePacket(forgedAnnounce, fromPeerID: bob.myPeerID, preseedPeer: false)
+
+        let leakedOnUnverifiedAnnounce = await TestHelpers.waitUntil(
+            { carolOut.count(ofType: .courierEnvelope) > 0 },
+            timeout: TestConstants.shortTimeout
+        )
+        #expect(!leakedOnUnverifiedAnnounce)
+        #expect(!carol.courierStore.isEmpty)
+
+        bob.sendBroadcastAnnounce()
+        let announced = await TestHelpers.waitUntil(
+            { bobOut.first(ofType: .announce) != nil },
+            timeout: TestConstants.defaultTimeout
+        )
+        #expect(announced)
+        let verifiedAnnounce = try #require(bobOut.first(ofType: .announce))
+        carol._test_handlePacket(verifiedAnnounce, fromPeerID: bob.myPeerID, preseedPeer: false)
+
+        let handedOver = await TestHelpers.waitUntil(
+            { carolOut.count(ofType: .courierEnvelope) == 1 },
+            timeout: TestConstants.defaultTimeout
+        )
+        #expect(handedOver)
+        #expect(carol.courierStore.isEmpty)
+    }
+
+    @Test func relayedAnnounceDoesNotTriggerCourierHandover() async throws {
+        let alice = makeService()
+        let carol = makeService()
+        let bob = makeService()
+        carol.courierDepositPolicy = { _ in true }
+
+        let aliceOut = PacketTap()
+        alice._test_onOutboundPacket = aliceOut.record
+        let carolOut = PacketTap()
+        carol._test_onOutboundPacket = carolOut.record
+        let bobOut = PacketTap()
+        bob._test_onOutboundPacket = bobOut.record
+
+        preseedConnectedPeer(carol, in: alice)
+
+        #expect(alice.sendCourierMessage(
+            "hold for a direct encounter",
+            messageID: "courier-msg-relayed-announce",
+            recipientNoiseKey: bob.noiseStaticPublicKeyData(),
+            via: [carol.myPeerID]
+        ))
+        let deposited = await TestHelpers.waitUntil(
+            { aliceOut.first(ofType: .courierEnvelope) != nil },
+            timeout: TestConstants.defaultTimeout
+        )
+        #expect(deposited)
+        let depositPacket = try #require(aliceOut.first(ofType: .courierEnvelope))
+
+        carol._test_handlePacket(depositPacket, fromPeerID: alice.myPeerID)
+        let carried = await TestHelpers.waitUntil(
+            { !carol.courierStore.isEmpty },
+            timeout: TestConstants.defaultTimeout
+        )
+        #expect(carried)
+
+        bob.sendBroadcastAnnounce()
+        let announced = await TestHelpers.waitUntil(
+            { bobOut.first(ofType: .announce) != nil },
+            timeout: TestConstants.defaultTimeout
+        )
+        #expect(announced)
+        let directAnnounce = try #require(bobOut.first(ofType: .announce))
+
+        // A relayed copy has a decremented TTL but a still-valid signature
+        // (TTL is excluded from announce signatures). Envelopes are removed
+        // from the store optimistically, so handover must wait for a direct
+        // encounter instead of chasing a multi-hop path.
+        var relayedAnnounce = directAnnounce
+        relayedAnnounce.ttl = directAnnounce.ttl - 1
+        carol._test_handlePacket(relayedAnnounce, fromPeerID: bob.myPeerID, preseedPeer: false)
+
+        let leakedOnRelayedAnnounce = await TestHelpers.waitUntil(
+            { carolOut.count(ofType: .courierEnvelope) > 0 },
+            timeout: TestConstants.shortTimeout
+        )
+        #expect(!leakedOnRelayedAnnounce)
+        #expect(!carol.courierStore.isEmpty)
+
+        // The relayed copy consumed the original announce's dedup key
+        // (sender/timestamp/payload — TTL excluded), so the direct handover
+        // needs a fresh announce. Wait out the 1s announce throttle first.
+        try await Task.sleep(nanoseconds: 1_100_000_000)
+        bob.sendBroadcastAnnounce()
+        let reannounced = await TestHelpers.waitUntil(
+            { bobOut.all(ofType: .announce).contains { $0.timestamp != directAnnounce.timestamp } },
+            timeout: TestConstants.defaultTimeout
+        )
+        #expect(reannounced)
+        let freshAnnounce = try #require(
+            bobOut.all(ofType: .announce).first { $0.timestamp != directAnnounce.timestamp }
+        )
+        carol._test_handlePacket(freshAnnounce, fromPeerID: bob.myPeerID, preseedPeer: false)
+
+        let handedOver = await TestHelpers.waitUntil(
+            { carolOut.count(ofType: .courierEnvelope) == 1 },
+            timeout: TestConstants.defaultTimeout
+        )
+        #expect(handedOver)
+        #expect(carol.courierStore.isEmpty)
+    }
+
+    @Test func sendCourierMessageRejectsInvalidRecipientKeyBeforeQueueing() async throws {
+        let alice = makeService()
+        let carol = makeService()
+        preseedConnectedPeer(carol, in: alice)
+
+        let aliceOut = PacketTap()
+        alice._test_onOutboundPacket = aliceOut.record
+
+        #expect(!alice.sendCourierMessage(
+            "this cannot be sealed",
+            messageID: "courier-msg-invalid-key",
+            recipientNoiseKey: Data(repeating: 0x01, count: 8),
+            via: [carol.myPeerID]
+        ))
+
+        let queuedPacket = await TestHelpers.waitUntil(
+            { aliceOut.first(ofType: .courierEnvelope) != nil },
+            timeout: TestConstants.shortTimeout
+        )
+        #expect(!queuedPacket)
+    }
+
+    @Test func depositFromUntrustedPeerIsRejected() async throws {
+        let carol = makeService()
+        carol.courierDepositPolicy = { _ in false } // depositor is not a mutual favorite
+
+        let alice = NoiseEncryptionService(keychain: MockKeychain())
+        let bobKey = NoiseEncryptionService(keychain: MockKeychain()).getStaticPublicKeyData()
+        let typedPayload = try #require(BLENoisePayloadFactory.privateMessage(content: "x", messageID: "m1"))
+        let sealed = try alice.sealCourierPayload(typedPayload, recipientStaticKey: bobKey)
+        let now = Date()
+        let envelope = CourierEnvelope(
+            recipientTag: CourierEnvelope.recipientTag(
+                noiseStaticKey: bobKey,
+                epochDay: CourierEnvelope.epochDay(for: now)
+            ),
+            expiry: UInt64((now.timeIntervalSince1970 + 3600) * 1000),
+            ciphertext: sealed
+        )
+        let alicePeerID = PeerID(publicKey: alice.getStaticPublicKeyData())
+        let packet = BitchatPacket(
+            type: MessageType.courierEnvelope.rawValue,
+            senderID: Data(hexString: alicePeerID.id) ?? Data(),
+            recipientID: Data(hexString: carol.myPeerID.id),
+            timestamp: UInt64(now.timeIntervalSince1970 * 1000),
+            payload: try #require(envelope.encode()),
+            signature: nil,
+            ttl: 1
+        )
+
+        carol._test_handlePacket(packet, fromPeerID: alicePeerID)
+        let stored = await TestHelpers.waitUntil(
+            { !carol.courierStore.isEmpty },
+            timeout: TestConstants.shortTimeout
+        )
+        #expect(!stored)
+    }
+
+    @Test func courierDepositTrustUsesIngressPeerNotClaimedSender() async throws {
+        let alice = makeService()
+        let carol = makeService()
+        let mallory = makeService()
+        preseedConnectedPeer(alice, in: carol)
+        preseedConnectedPeer(mallory, in: carol)
+
+        let trustedAliceKey = Data(hexString: alice.myPeerID.id) ?? Data()
+        carol.courierDepositPolicy = { depositorKey in
+            depositorKey == trustedAliceKey
+        }
+
+        let aliceNoise = NoiseEncryptionService(keychain: MockKeychain())
+        let bobKey = NoiseEncryptionService(keychain: MockKeychain()).getStaticPublicKeyData()
+        let typedPayload = try #require(BLENoisePayloadFactory.privateMessage(content: "spoofed", messageID: "m-spoof"))
+        let sealed = try aliceNoise.sealCourierPayload(typedPayload, recipientStaticKey: bobKey)
+        let now = Date()
+        let envelope = CourierEnvelope(
+            recipientTag: CourierEnvelope.recipientTag(
+                noiseStaticKey: bobKey,
+                epochDay: CourierEnvelope.epochDay(for: now)
+            ),
+            expiry: UInt64((now.timeIntervalSince1970 + 3600) * 1000),
+            ciphertext: sealed
+        )
+        let packet = BitchatPacket(
+            type: MessageType.courierEnvelope.rawValue,
+            senderID: Data(hexString: alice.myPeerID.id) ?? Data(),
+            recipientID: Data(hexString: carol.myPeerID.id),
+            timestamp: UInt64(now.timeIntervalSince1970 * 1000),
+            payload: try #require(envelope.encode()),
+            signature: nil,
+            ttl: 1
+        )
+
+        carol._test_handlePacket(packet, fromPeerID: mallory.myPeerID, preseedPeer: false)
+        let stored = await TestHelpers.waitUntil(
+            { !carol.courierStore.isEmpty },
+            timeout: TestConstants.shortTimeout
+        )
+        #expect(!stored)
+    }
+
+    private func makeUnsignedAnnounce(from service: BLEService) throws -> BitchatPacket {
+        let announcement = AnnouncementPacket(
+            nickname: "Unsigned",
+            noisePublicKey: service.noiseStaticPublicKeyData(),
+            signingPublicKey: service.noiseSigningPublicKeyData(),
+            directNeighbors: nil
+        )
+        let payload = try #require(announcement.encode())
+
+        return BitchatPacket(
+            type: MessageType.announce.rawValue,
+            senderID: Data(hexString: service.myPeerID.id) ?? Data(),
+            recipientID: nil,
+            timestamp: UInt64(Date().timeIntervalSince1970 * 1000),
+            payload: payload,
+            signature: nil,
+            ttl: TransportConfig.messageTTLDefault
+        )
+    }
+}
+
+// MARK: - Router courier selection
+
+/// Minimal transport stub for exercising MessageRouter's courier deposit
+/// logic without BLE plumbing.
+private final class CourierCaptureTransport: Transport {
+    weak var delegate: BitchatDelegate?
+    weak var eventDelegate: TransportEventDelegate?
+    weak var peerEventsDelegate: TransportPeerEventsDelegate?
+
+    var snapshots: [TransportPeerSnapshot] = []
+    private(set) var courierSends: [(messageID: String, recipientKey: Data, couriers: [PeerID])] = []
+    private(set) var directSends: [String] = []
+
+    var peerSnapshotPublisher: AnyPublisher<[TransportPeerSnapshot], Never> {
+        Just(snapshots).eraseToAnyPublisher()
+    }
+    func currentPeerSnapshots() -> [TransportPeerSnapshot] { snapshots }
+
+    var myPeerID = PeerID(str: "00000000000000aa")
+    var myNickname = "stub"
+    func setNickname(_ nickname: String) {}
+
+    func startServices() {}
+    func stopServices() {}
+    func emergencyDisconnectAll() {}
+
+    func isPeerConnected(_ peerID: PeerID) -> Bool {
+        snapshots.contains { $0.peerID == peerID && $0.isConnected }
+    }
+    func isPeerReachable(_ peerID: PeerID) -> Bool { isPeerConnected(peerID) }
+    func peerNickname(peerID: PeerID) -> String? { nil }
+    func getPeerNicknames() -> [PeerID: String] { [:] }
+
+    func getFingerprint(for peerID: PeerID) -> String? { nil }
+    func getNoiseSessionState(for peerID: PeerID) -> LazyHandshakeState { .none }
+    func triggerHandshake(with peerID: PeerID) {}
+
+    func sendMessage(_ content: String, mentions: [String]) {}
+    func sendPrivateMessage(_ content: String, to peerID: PeerID, recipientNickname: String, messageID: String) {
+        directSends.append(messageID)
+    }
+    func sendReadReceipt(_ receipt: ReadReceipt, to peerID: PeerID) {}
+    func sendFavoriteNotification(to peerID: PeerID, isFavorite: Bool) {}
+    func sendBroadcastAnnounce() {}
+    func sendDeliveryAck(for messageID: String, to peerID: PeerID) {}
+
+    func sendCourierMessage(_ content: String, messageID: String, recipientNoiseKey: Data, via couriers: [PeerID]) -> Bool {
+        courierSends.append((messageID, recipientNoiseKey, couriers))
+        return true
+    }
+}
+
+struct MessageRouterCourierTests {
+
+    @Test @MainActor
+    func unreachablePeerMessageGoesToTrustedCouriersOnly() {
+        let bobKey = Data(repeating: 0xB0, count: 32)
+        let bobID = PeerID(publicKey: bobKey)
+        let carolKey = Data(repeating: 0xC0, count: 32)
+        let carolID = PeerID(publicKey: carolKey)
+        let daveKey = Data(repeating: 0xD0, count: 32)
+        let daveID = PeerID(publicKey: daveKey)
+
+        let transport = CourierCaptureTransport()
+        transport.snapshots = [
+            // Carol: connected mutual favorite → eligible courier.
+            TransportPeerSnapshot(peerID: carolID, nickname: "carol", isConnected: true, noisePublicKey: carolKey, lastSeen: Date()),
+            // Dave: connected but not trusted → never a courier.
+            TransportPeerSnapshot(peerID: daveID, nickname: "dave", isConnected: true, noisePublicKey: daveKey, lastSeen: Date())
+        ]
+
+        let directory = CourierDirectory(
+            noiseKey: { peerID in peerID == bobID ? bobKey : nil },
+            isTrustedCourier: { $0 == carolKey }
+        )
+        let router = MessageRouter(transports: [transport], courierDirectory: directory)
+        var carried: [String] = []
+        router.onMessageCarried = { messageID, _ in carried.append(messageID) }
+
+        router.sendPrivate("hi bob", to: bobID, recipientNickname: "bob", messageID: "m1")
+
+        #expect(transport.directSends.isEmpty)
+        #expect(transport.courierSends.count == 1)
+        #expect(transport.courierSends.first?.messageID == "m1")
+        #expect(transport.courierSends.first?.recipientKey == bobKey)
+        #expect(transport.courierSends.first?.couriers == [carolID])
+        #expect(carried == ["m1"])
+    }
+
+    @Test @MainActor
+    func noCourierDepositWithoutKnownRecipientKey() {
+        let transport = CourierCaptureTransport()
+        transport.snapshots = [
+            TransportPeerSnapshot(peerID: PeerID(str: "00000000000000cc"), nickname: "carol", isConnected: true, noisePublicKey: Data(repeating: 0xC0, count: 32), lastSeen: Date())
+        ]
+        let directory = CourierDirectory(noiseKey: { _ in nil }, isTrustedCourier: { _ in true })
+        let router = MessageRouter(transports: [transport], courierDirectory: directory)
+        var carried: [String] = []
+        router.onMessageCarried = { messageID, _ in carried.append(messageID) }
+
+        router.sendPrivate("hi", to: PeerID(str: "00000000000000bb"), recipientNickname: "bob", messageID: "m2")
+
+        #expect(transport.courierSends.isEmpty)
+        #expect(carried.isEmpty)
+    }
+
+    /// The production directory must resolve both ID forms: a 64-hex
+    /// noise-key ID (offline favorite row) carries the key itself, and a
+    /// short 16-hex ID resolves through the favorites store.
+    @Test @MainActor
+    func favoritesBackedDirectoryResolvesBothIDForms() {
+        let directory = CourierDirectory.favoritesBacked()
+        let bobKey = Data(repeating: 0xB7, count: 32)
+
+        #expect(directory.noiseKey(PeerID(hexData: bobKey)) == bobKey)
+
+        FavoritesPersistenceService.shared.addFavorite(peerNoisePublicKey: bobKey, peerNickname: "bob")
+        defer { FavoritesPersistenceService.shared.removeFavorite(peerNoisePublicKey: bobKey) }
+        #expect(directory.noiseKey(PeerID(publicKey: bobKey)) == bobKey)
+    }
+
+    @Test @MainActor
+    func reachablePeerSkipsCourier() {
+        let bobKey = Data(repeating: 0xB0, count: 32)
+        let bobID = PeerID(publicKey: bobKey)
+        let transport = CourierCaptureTransport()
+        transport.snapshots = [
+            TransportPeerSnapshot(peerID: bobID, nickname: "bob", isConnected: true, noisePublicKey: bobKey, lastSeen: Date())
+        ]
+        let directory = CourierDirectory(noiseKey: { _ in bobKey }, isTrustedCourier: { _ in true })
+        let router = MessageRouter(transports: [transport], courierDirectory: directory)
+
+        router.sendPrivate("hi", to: bobID, recipientNickname: "bob", messageID: "m3")
+
+        #expect(transport.directSends == ["m3"])
+        #expect(transport.courierSends.isEmpty)
+    }
+}
@@ -0,0 +1,107 @@
+//
+// NoiseCourierTests.swift
+// bitchat
+//
+// This is free and unencumbered software released into the public domain.
+// For more information, see <https://unlicense.org>
+//
+
+import Testing
+import Foundation
+@testable import bitchat
+
+/// One-way Noise X envelopes: encryption to a known static key without an
+/// interactive handshake, used by the courier store-and-forward path.
+struct NoiseCourierTests {
+
+    @Test func sealAndOpenRoundTrip() throws {
+        let alice = NoiseEncryptionService(keychain: MockKeychain())
+        let bob = NoiseEncryptionService(keychain: MockKeychain())
+
+        let payload = Data("meet at the north gate".utf8)
+        let sealed = try alice.sealCourierPayload(payload, recipientStaticKey: bob.getStaticPublicKeyData())
+
+        let opened = try bob.openCourierPayload(sealed)
+        #expect(opened.payload == payload)
+        // The X pattern authenticates the sender: Bob learns Alice's real static key.
+        #expect(opened.senderStaticKey == alice.getStaticPublicKeyData())
+    }
+
+    @Test func wrongRecipientCannotOpen() throws {
+        let alice = NoiseEncryptionService(keychain: MockKeychain())
+        let bob = NoiseEncryptionService(keychain: MockKeychain())
+        let carol = NoiseEncryptionService(keychain: MockKeychain())
+
+        let sealed = try alice.sealCourierPayload(Data("secret".utf8), recipientStaticKey: bob.getStaticPublicKeyData())
+
+        #expect(throws: (any Error).self) {
+            _ = try carol.openCourierPayload(sealed)
+        }
+    }
+
+    @Test func tamperedEnvelopeFailsToOpen() throws {
+        let alice = NoiseEncryptionService(keychain: MockKeychain())
+        let bob = NoiseEncryptionService(keychain: MockKeychain())
+
+        var sealed = try alice.sealCourierPayload(Data("secret".utf8), recipientStaticKey: bob.getStaticPublicKeyData())
+        sealed[sealed.count - 1] ^= 0x01
+
+        #expect(throws: (any Error).self) {
+            _ = try bob.openCourierPayload(sealed)
+        }
+    }
+
+    @Test func senderIdentityCannotBeForged() throws {
+        // The encrypted static key inside the envelope is bound by the ss DH;
+        // splicing one envelope's ephemeral prefix onto another must fail.
+        let alice = NoiseEncryptionService(keychain: MockKeychain())
+        let mallory = NoiseEncryptionService(keychain: MockKeychain())
+        let bob = NoiseEncryptionService(keychain: MockKeychain())
+
+        let bobKey = bob.getStaticPublicKeyData()
+        let fromAlice = try alice.sealCourierPayload(Data("hi".utf8), recipientStaticKey: bobKey)
+        let fromMallory = try mallory.sealCourierPayload(Data("hi".utf8), recipientStaticKey: bobKey)
+
+        // e (32 bytes) from Mallory's envelope + rest from Alice's.
+        let spliced = fromMallory.prefix(32) + fromAlice.dropFirst(32)
+        #expect(throws: (any Error).self) {
+            _ = try bob.openCourierPayload(Data(spliced))
+        }
+    }
+
+    @Test func sealRejectsInvalidRecipientKey() {
+        let alice = NoiseEncryptionService(keychain: MockKeychain())
+        #expect(throws: (any Error).self) {
+            _ = try alice.sealCourierPayload(Data("x".utf8), recipientStaticKey: Data(repeating: 0, count: 32))
+        }
+        #expect(throws: (any Error).self) {
+            _ = try alice.sealCourierPayload(Data("x".utf8), recipientStaticKey: Data(repeating: 1, count: 8))
+        }
+    }
+
+    @Test func emptyAndLargePayloadsRoundTrip() throws {
+        let alice = NoiseEncryptionService(keychain: MockKeychain())
+        let bob = NoiseEncryptionService(keychain: MockKeychain())
+        let bobKey = bob.getStaticPublicKeyData()
+
+        let empty = try alice.sealCourierPayload(Data(), recipientStaticKey: bobKey)
+        #expect(try bob.openCourierPayload(empty).payload.isEmpty)
+
+        let large = Data((0..<8192).map { UInt8($0 % 251) })
+        let sealed = try alice.sealCourierPayload(large, recipientStaticKey: bobKey)
+        #expect(try bob.openCourierPayload(sealed).payload == large)
+    }
+
+    @Test func envelopesAreNotLinkableAcrossSends() throws {
+        // Fresh ephemeral per seal: same payload to the same recipient must
+        // produce entirely different ciphertexts.
+        let alice = NoiseEncryptionService(keychain: MockKeychain())
+        let bob = NoiseEncryptionService(keychain: MockKeychain())
+        let payload = Data("same message".utf8)
+
+        let a = try alice.sealCourierPayload(payload, recipientStaticKey: bob.getStaticPublicKeyData())
+        let b = try alice.sealCourierPayload(payload, recipientStaticKey: bob.getStaticPublicKeyData())
+        #expect(a != b)
+        #expect(a.prefix(32) != b.prefix(32))
+    }
+}
@@ -98,8 +98,12 @@ struct BLEAnnounceHandlerTests {
        recorder.upsertResult = BLEPeerAnnounceUpdate(isNewPeer: true, wasDisconnected: false, previousNickname: nil)
        let handler = makeHandler(recorder: recorder, now: now)

-        handler.handle(packet, from: peerID)
+        let result = handler.handle(packet, from: peerID)

+        #expect(result?.peerID == peerID)
+        #expect(result?.announcement.noisePublicKey == noiseKey)
+        #expect(result?.isDirectAnnounce == true)
+        #expect(result?.isVerified == true)
        #expect(recorder.verifySignatureCalls.count == 1)
        #expect(recorder.verifySignatureCalls.first?.signingPublicKey == Data(repeating: 0x99, count: 32))
        #expect(recorder.barrierCount == 1)
@@ -161,8 +165,11 @@ struct BLEAnnounceHandlerTests {
        let recorder = Recorder()
        let handler = makeHandler(recorder: recorder, now: now)

-        handler.handle(packet, from: peerID)
+        let result = handler.handle(packet, from: peerID)

+        #expect(result?.peerID == peerID)
+        #expect(result?.announcement.noisePublicKey == noiseKey)
+        #expect(result?.isVerified == false)
        #expect(recorder.verifySignatureCalls.isEmpty)
        #expect(recorder.barrierCount == 1)
        #expect(recorder.upsertCalls.isEmpty)
@@ -197,8 +204,9 @@ struct BLEAnnounceHandlerTests {
        recorder.signatureValid = false
        let handler = makeHandler(recorder: recorder, now: now)

-        handler.handle(packet, from: peerID)
+        let result = handler.handle(packet, from: peerID)

+        #expect(result?.isVerified == false)
        #expect(recorder.verifySignatureCalls.count == 1)
        #expect(recorder.upsertCalls.isEmpty)
        #expect(recorder.uiEventDeliveries.count == 1)
@@ -222,8 +230,9 @@ struct BLEAnnounceHandlerTests {
        let recorder = Recorder()
        let handler = makeHandler(recorder: recorder, now: now)

-        handler.handle(packet, from: peerID)
+        let result = handler.handle(packet, from: peerID)

+        #expect(result == nil)
        expectNoSideEffects(recorder)
    }

@@ -242,8 +251,9 @@ struct BLEAnnounceHandlerTests {
        let recorder = Recorder()
        let handler = makeHandler(recorder: recorder, localPeerID: peerID, now: now)

-        handler.handle(packet, from: peerID)
+        let result = handler.handle(packet, from: peerID)

+        #expect(result == nil)
        expectNoSideEffects(recorder)
    }

@@ -263,8 +273,9 @@ struct BLEAnnounceHandlerTests {
        let recorder = Recorder()
        let handler = makeHandler(recorder: recorder, now: now)

-        handler.handle(packet, from: peerID)
+        let result = handler.handle(packet, from: peerID)

+        #expect(result == nil)
        expectNoSideEffects(recorder)
    }

@@ -311,8 +322,10 @@ struct BLEAnnounceHandlerTests {
        recorder.upsertResult = BLEPeerAnnounceUpdate(isNewPeer: true, wasDisconnected: false, previousNickname: nil)
        let handler = makeHandler(recorder: recorder, now: now)

-        handler.handle(packet, from: peerID)
+        let result = handler.handle(packet, from: peerID)

+        #expect(result?.isDirectAnnounce == false)
+        #expect(result?.isVerified == true)
        #expect(recorder.upsertCalls.count == 1)
        #expect(recorder.upsertCalls.first?.isConnected == false)
        #expect(recorder.uiEventDeliveries.count == 1)
@@ -384,8 +397,9 @@ struct BLEAnnounceHandlerTests {
        recorder.existingNoisePublicKey = Data(repeating: 0xAA, count: 32)
        let handler = makeHandler(recorder: recorder, now: now)

-        handler.handle(packet, from: peerID)
+        let result = handler.handle(packet, from: peerID)

+        #expect(result?.isVerified == false)
        #expect(recorder.upsertCalls.isEmpty)
        #expect(recorder.uiEventDeliveries.count == 1)
        #expect(recorder.uiEventDeliveries.first?.notifyPeerConnected == false)
@@ -19,6 +19,79 @@ struct BLEFanoutSelectorTests {
        #expect(selection.centralIDs == Set(["c2"]))
    }

+    @Test
+    func directedSendUsesOnlyBoundPeripheralLinkWhenAvailable() {
+        let target = PeerID(str: "1122334455667788")
+        let bystander = PeerID(str: "8877665544332211")
+        let selection = BLEFanoutSelector.selectLinks(
+            peripheralIDs: ["target-p", "bystander-p"],
+            centralIDs: ["target-c", "bystander-c"],
+            ingressLink: nil,
+            peripheralPeerBindings: [
+                "target-p": target,
+                "bystander-p": bystander
+            ],
+            centralPeerBindings: [
+                "target-c": target,
+                "bystander-c": bystander
+            ],
+            directedPeerHint: target,
+            packetType: MessageType.courierEnvelope.rawValue,
+            messageID: "message-1"
+        )
+
+        #expect(selection.peripheralIDs == Set(["target-p"]))
+        #expect(selection.centralIDs.isEmpty)
+    }
+
+    @Test
+    func directedSendUsesBoundCentralLinkWhenNoPeripheralLinkExists() {
+        let target = PeerID(str: "1122334455667788")
+        let bystander = PeerID(str: "8877665544332211")
+        let selection = BLEFanoutSelector.selectLinks(
+            peripheralIDs: ["bystander-p"],
+            centralIDs: ["target-c", "bystander-c"],
+            ingressLink: nil,
+            peripheralPeerBindings: [
+                "bystander-p": bystander
+            ],
+            centralPeerBindings: [
+                "target-c": target,
+                "bystander-c": bystander
+            ],
+            directedPeerHint: target,
+            packetType: MessageType.courierEnvelope.rawValue,
+            messageID: "message-1"
+        )
+
+        #expect(selection.peripheralIDs.isEmpty)
+        #expect(selection.centralIDs == Set(["target-c"]))
+    }
+
+    @Test
+    func directedSendToKnownPeerDoesNotFallBackWhenOnlyDirectLinkIsExcluded() {
+        let target = PeerID(str: "1122334455667788")
+        let bystander = PeerID(str: "8877665544332211")
+        let selection = BLEFanoutSelector.selectLinks(
+            peripheralIDs: ["bystander-p"],
+            centralIDs: ["target-c", "bystander-c"],
+            ingressLink: .central("target-c"),
+            peripheralPeerBindings: [
+                "bystander-p": bystander
+            ],
+            centralPeerBindings: [
+                "target-c": target,
+                "bystander-c": bystander
+            ],
+            directedPeerHint: target,
+            packetType: MessageType.courierEnvelope.rawValue,
+            messageID: "message-1"
+        )
+
+        #expect(selection.peripheralIDs.isEmpty)
+        #expect(selection.centralIDs.isEmpty)
+    }
+
    @Test
    func directedSendExcludesAllLinksToIngressPeer() {
        let selection = BLEFanoutSelector.selectLinks(
@@ -49,6 +49,21 @@ final class FavoritesPersistenceServiceTests: XCTestCase {
        XCTAssertFalse(service.isMutualFavorite(peerKey))
    }

+    func test_updatePeerFavoritedUs_keepsStoredNicknameOverUnknownPlaceholder() {
+        let service = FavoritesPersistenceService(keychain: MockKeychain())
+        let peerKey = Data((128..<160).map(UInt8.init))
+
+        service.addFavorite(peerNoisePublicKey: peerKey, peerNickname: "Erin")
+
+        // A notification arriving before the peer is known passes "Unknown".
+        service.updatePeerFavoritedUs(peerNoisePublicKey: peerKey, favorited: true, peerNickname: "Unknown")
+        XCTAssertEqual(service.getFavoriteStatus(for: peerKey)?.peerNickname, "Erin")
+
+        // A real nickname still updates the stored one.
+        service.updatePeerFavoritedUs(peerNoisePublicKey: peerKey, favorited: true, peerNickname: "Erin2")
+        XCTAssertEqual(service.getFavoriteStatus(for: peerKey)?.peerNickname, "Erin2")
+    }
+
    func test_getFavoriteStatus_forPeerID_returnsMutualFavorite() {
        let service = FavoritesPersistenceService(keychain: MockKeychain())
        let peerKey = Data((96..<128).map(UInt8.init))
@@ -42,7 +42,9 @@ struct NostrTransportTests {
            )
        )

-        #expect(!transport.isPeerReachable(fullPeerID))
+        // Offline favorites are addressed by the full 64-hex noise key, so
+        // both forms must resolve to the same reachability answer.
+        #expect(transport.isPeerReachable(fullPeerID))
        #expect(transport.isPeerReachable(shortPeerID))
        #expect(!transport.isPeerReachable(PeerID(str: "feedfeedfeedfeed")))
    }
@@ -66,6 +66,117 @@ struct UnifiedPeerServiceTests {
        #expect(!service.isBlocked(peerID))
    }

+    // MARK: - Offline-favorite dedup (updatePeers phase 2)
+
+    /// A mutual favorite that is also on the mesh must collapse to a single
+    /// row keyed by the short mesh ID — even when the announced nickname no
+    /// longer matches the one stored with the favorite.
+    @Test @MainActor
+    func updatePeers_mutualFavoriteOnMeshYieldsSingleRow() async {
+        let favoritesService = FavoritesPersistenceService.shared
+
+        let transport = MockTransport()
+        let idBridge = NostrIdentityBridge(keychain: MockKeychainHelper())
+        let service = UnifiedPeerService(meshService: transport, idBridge: idBridge, identityManager: TestIdentityManager())
+
+        let noiseKey = Data(repeating: 0xAB, count: 32)
+        favoritesService.addFavorite(peerNoisePublicKey: noiseKey, peerNickname: "alice")
+        favoritesService.updatePeerFavoritedUs(peerNoisePublicKey: noiseKey, favorited: true)
+        defer {
+            favoritesService.updatePeerFavoritedUs(peerNoisePublicKey: noiseKey, favorited: false)
+            favoritesService.removeFavorite(peerNoisePublicKey: noiseKey)
+        }
+
+        let meshID = PeerID(publicKey: noiseKey)
+        let snapshots = [TransportPeerSnapshot(
+            peerID: meshID,
+            nickname: "alice-renamed",
+            isConnected: true,
+            noisePublicKey: noiseKey,
+            lastSeen: Date()
+        )]
+        transport.updatePeerSnapshots(snapshots)
+        service.didUpdatePeerSnapshots(snapshots)
+
+        let rows = service.peers.filter { $0.noisePublicKey == noiseKey }
+        #expect(rows.count == 1)
+        #expect(rows.first?.peerID == meshID)
+        #expect(rows.first?.isMutualFavorite == true)
+        #expect(service.favorites.filter { $0.noisePublicKey == noiseKey }.count == 1)
+    }
+
+    /// Same collapse must hold for a reachable-but-not-connected favorite
+    /// (relayed peers linger as "reachable" after their link drops).
+    @Test @MainActor
+    func updatePeers_reachableMutualFavoriteYieldsSingleRow() async {
+        let favoritesService = FavoritesPersistenceService.shared
+
+        let transport = MockTransport()
+        let idBridge = NostrIdentityBridge(keychain: MockKeychainHelper())
+        let service = UnifiedPeerService(meshService: transport, idBridge: idBridge, identityManager: TestIdentityManager())
+
+        let noiseKey = Data(repeating: 0xCD, count: 32)
+        favoritesService.addFavorite(peerNoisePublicKey: noiseKey, peerNickname: "bob")
+        favoritesService.updatePeerFavoritedUs(peerNoisePublicKey: noiseKey, favorited: true)
+        defer {
+            favoritesService.updatePeerFavoritedUs(peerNoisePublicKey: noiseKey, favorited: false)
+            favoritesService.removeFavorite(peerNoisePublicKey: noiseKey)
+        }
+
+        let otherKey = Data(repeating: 0x11, count: 32)
+        let snapshots = [
+            // A live link is required for anyone to count as reachable.
+            TransportPeerSnapshot(
+                peerID: PeerID(publicKey: otherKey),
+                nickname: "carol",
+                isConnected: true,
+                noisePublicKey: otherKey,
+                lastSeen: Date()
+            ),
+            TransportPeerSnapshot(
+                peerID: PeerID(publicKey: noiseKey),
+                nickname: "bob",
+                isConnected: false,
+                noisePublicKey: noiseKey,
+                lastSeen: Date()
+            )
+        ]
+        transport.updatePeerSnapshots(snapshots)
+        service.didUpdatePeerSnapshots(snapshots)
+
+        let bobRows = service.peers.filter { $0.noisePublicKey == noiseKey }
+        #expect(bobRows.count == 1)
+        #expect(bobRows.first?.peerID == PeerID(publicKey: noiseKey))
+        #expect(bobRows.first?.isReachable == true)
+    }
+
+    /// A mutual favorite with no mesh presence still gets its offline row,
+    /// keyed by the full noise-key PeerID.
+    @Test @MainActor
+    func updatePeers_offlineMutualFavoriteGetsOfflineRow() async {
+        let favoritesService = FavoritesPersistenceService.shared
+
+        let transport = MockTransport()
+        let idBridge = NostrIdentityBridge(keychain: MockKeychainHelper())
+        let service = UnifiedPeerService(meshService: transport, idBridge: idBridge, identityManager: TestIdentityManager())
+
+        let noiseKey = Data(repeating: 0xEF, count: 32)
+        favoritesService.addFavorite(peerNoisePublicKey: noiseKey, peerNickname: "dave")
+        favoritesService.updatePeerFavoritedUs(peerNoisePublicKey: noiseKey, favorited: true)
+        defer {
+            favoritesService.updatePeerFavoritedUs(peerNoisePublicKey: noiseKey, favorited: false)
+            favoritesService.removeFavorite(peerNoisePublicKey: noiseKey)
+        }
+
+        transport.updatePeerSnapshots([])
+        service.didUpdatePeerSnapshots([])
+
+        let rows = service.peers.filter { $0.noisePublicKey == noiseKey }
+        #expect(rows.count == 1)
+        #expect(rows.first?.peerID == PeerID(hexData: noiseKey))
+        #expect(rows.first?.isMutualFavorite == true)
+    }
+
    @Test @MainActor
    func setBlocked_unknownIdentityReturnsNil() async {
        let transport = MockTransport()