fix(android): preserve retryable pairing guidance

steipete · steipete · commit 5a7b5c44deef · 2026-07-02T13:24:28.000+01:00
diff --git a/apps/.i18n/native-source.json b/apps/.i18n/native-source.json
@@ -67,31 +67,31 @@
     },
     {
       "kind": "ui-state-text",
-      "line": 353,
+      "line": 360,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/NodeRuntime.kt",
       "source": "Offline",
       "surface": "android",
       "id": "native.android.c65b61de70a063e7"
     },
     {
       "kind": "conditional-branch",
-      "line": 1757,
+      "line": 1764,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/NodeRuntime.kt",
       "source": "Failed: this host requires wss:// or Tailscale Serve. No TLS endpoint detected.",
       "surface": "android",
       "id": "native.android.81009c40eed2216d"
     },
     {
       "kind": "conditional-branch",
-      "line": 1759,
+      "line": 1766,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/NodeRuntime.kt",
       "source": "Failed: secure endpoint reached, but TLS fingerprint verification timed out. Check Tailscale Serve or gateway TLS and retry.",
       "surface": "android",
       "id": "native.android.467899bb510b8e34"
     },
     {
       "kind": "conditional-branch",
-      "line": 1761,
+      "line": 1768,
       "path": "apps/android/app/src/main/java/ai/openclaw/app/NodeRuntime.kt",
       "source": "Failed: couldn't reach the secure gateway endpoint for this host.",
       "surface": "android",
diff --git a/apps/android/app/src/main/java/ai/openclaw/app/NodeRuntime.kt b/apps/android/app/src/main/java/ai/openclaw/app/NodeRuntime.kt
@@ -112,6 +112,13 @@ data class GatewayConnectionDisplay(
   val problem: GatewayConnectionProblem?,
 )
 
+private fun gatewayProblemAfterDisconnect(
+  problem: GatewayConnectionProblem?,
+  statusText: String,
+): GatewayConnectionProblem? =
+  // Automatic bootstrap pairing retries need their approval guidance until success or a different failure.
+  problem?.takeIf { statusText == "Reconnecting…" && it.canAutoRetry }
+
 internal fun gatewayConnectionDisplay(
   operatorConnected: Boolean,
   nodeConnected: Boolean,
@@ -547,7 +554,7 @@ class NodeRuntime(
         updateStatus {
           operatorConnected = false
           operatorStatusText = message
-          operatorConnectionProblem = null
+          operatorConnectionProblem = gatewayProblemAfterDisconnect(operatorConnectionProblem, message)
         }
         micCapture.onGatewayConnectionChanged(false)
       },
@@ -603,7 +610,7 @@ class NodeRuntime(
         updateStatus {
           _nodeConnected.value = false
           nodeStatusText = message
-          nodeConnectionProblem = null
+          nodeConnectionProblem = gatewayProblemAfterDisconnect(nodeConnectionProblem, message)
         }
         showLocalCanvasOnDisconnect()
       },
diff --git a/apps/android/app/src/test/java/ai/openclaw/app/GatewayBootstrapAuthTest.kt b/apps/android/app/src/test/java/ai/openclaw/app/GatewayBootstrapAuthTest.kt
@@ -83,6 +83,42 @@ class GatewayBootstrapAuthTest {
     assertNull(runtime.gatewayConnectionDisplay.value.problem)
   }
 
+  @Test
+  fun retryableNodePairingProblemSurvivesReconnectStatus() {
+    val runtime = NodeRuntime(RuntimeEnvironment.getApplication())
+    val session = readField<GatewaySession>(runtime, "nodeSession")
+    val onDisconnected = readField<(String) -> Unit>(session, "onDisconnected")
+    val onConnectFailure = readField<(GatewaySession.ErrorShape, Boolean) -> Unit>(session, "onConnectFailure")
+
+    onDisconnected("Gateway error: pairing required")
+    onConnectFailure(
+      GatewaySession.ErrorShape(
+        code = "NOT_PAIRED",
+        message = "pairing required",
+        details =
+          GatewayConnectErrorDetails(
+            code = "PAIRING_REQUIRED",
+            canRetryWithDeviceToken = false,
+            recommendedNextStep = "wait_then_retry",
+            reason = "not-paired",
+            requestId = "request-1",
+            retryable = true,
+          ),
+      ),
+      false,
+    )
+
+    onDisconnected("Reconnecting…")
+
+    val reconnectDisplay = runtime.gatewayConnectionDisplay.value
+    assertEquals("Reconnecting…", reconnectDisplay.statusText)
+    assertEquals("PAIRING_REQUIRED", reconnectDisplay.problem?.code)
+    assertEquals("request-1", reconnectDisplay.problem?.requestId)
+
+    onDisconnected("Gateway error: timeout")
+    assertNull(runtime.gatewayConnectionDisplay.value.problem)
+  }
+
   @Test
   fun doesNotConnectOperatorSessionWhenOnlyBootstrapAuthExists() {
     assertFalse(
