fix(ios): preserve pre-upgrade Watch replies

steipete · web-flow · commit ff74edbb40b5 · 2026-07-05T09:01:45.000-07:00
Bind shipped notification prompts without routing metadata to the current Gateway once, while keeping explicit and persisted Gateway owners fail-closed.
diff --git a/apps/ios/Sources/Model/NodeAppModel.swift b/apps/ios/Sources/Model/NodeAppModel.swift
@@ -3293,10 +3293,23 @@ extension NodeAppModel {
             return
         }
         let payloadGatewayID = event.gatewayStableID?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        let sourceGatewayID = payloadGatewayID.isEmpty
-            ? (self.watchMessageOutbox.gatewayStableID(forPromptID: event.promptId) ?? "")
-            : payloadGatewayID
         let currentGatewayID = self.currentWatchChatGatewayStableID()
+        let routedGatewayID = self.watchMessageOutbox.gatewayStableID(forPromptID: event.promptId) ?? ""
+        let sourceGatewayID: String
+        if !payloadGatewayID.isEmpty {
+            sourceGatewayID = payloadGatewayID
+        } else if !routedGatewayID.isEmpty {
+            sourceGatewayID = routedGatewayID
+        } else if let currentGatewayID {
+            // Shipped prompts predate gateway routing metadata and cannot be migrated after delivery.
+            // Bind that prompt once; explicit or persisted owners never use this fallback.
+            sourceGatewayID = currentGatewayID
+            self.watchMessageOutbox.recordPromptRoute(
+                promptID: event.promptId,
+                gatewayStableID: currentGatewayID)
+        } else {
+            sourceGatewayID = ""
+        }
         if !sourceGatewayID.isEmpty, let currentGatewayID, currentGatewayID != sourceGatewayID {
             self.watchReplyLogger.info("watch reply dropped: stale gateway target")
             return
diff --git a/apps/ios/Tests/NodeAppModelInvokeTests.swift b/apps/ios/Tests/NodeAppModelInvokeTests.swift
@@ -2124,6 +2124,33 @@ private final class MockBootstrapNotificationCenter: NotificationCentering, @unc
         #expect(appModel._test_queuedWatchReplyCount() == 0)
     }
 
+    @Test @MainActor func watchReplyBindsLegacyPromptToCurrentGateway() async {
+        NodeAppModel._test_resetPersistedWatchReplyQueueState()
+        defer { NodeAppModel._test_resetPersistedWatchReplyQueueState() }
+        let watchService = MockWatchMessagingService()
+        let appModel = NodeAppModel(watchMessagingService: watchService)
+        appModel.enterAppleReviewDemoMode()
+        let initialOpenChatRequestID = appModel.openChatRequestID
+        let event = WatchQuickReplyEvent(
+            replyId: "reply-legacy-prompt",
+            promptId: "prompt-from-previous-release",
+            actionId: "approve",
+            actionLabel: "Approve",
+            sessionKey: "main",
+            gatewayStableID: nil,
+            note: nil,
+            sentAtMs: 1238,
+            transport: "sendMessage")
+
+        watchService.emitReply(event)
+        await Task.yield()
+        watchService.emitReply(event)
+        await Task.yield()
+
+        #expect(appModel.openChatRequestID == initialOpenChatRequestID + 1)
+        #expect(appModel._test_queuedWatchReplyCount() == 0)
+    }
+
     @Test @MainActor func handleDeepLinkSetsErrorWhenNotConnected() async throws {
         let appModel = NodeAppModel()
         let url = try #require(URL(string: "openclaw://agent?message=hello"))
