fix: keep device approval guidance request-bound

Author: steipete

src/OpenClaw.Connection/GatewayConnectionManager.cs

@@ -298,11 +298,6 @@ tunnel.SshPort is < 1 or > 65535 ||
                 if (Interlocked.Read(ref _generation) != gen) return;
                 _ = HandleNodePairListUpdatedAsync(list, gen);
             };
-            lifecycle.DataClient.DevicePairListUpdated += (s, list) =>
-            {
-                if (Interlocked.Read(ref _generation) != gen) return;
-                _ = HandleDevicePairListUpdatedAsync(list, gen);
-            };
             lifecycle.DataClient.V2SignatureFallback += (s, _) =>
             {
                 if (Interlocked.Read(ref _generation) != gen) return;
@@ -1468,11 +1463,6 @@ private Task HandleNodePairListUpdatedAsync(PairingListInfo list, long gen)
         return Task.CompletedTask;
     }
 
-    private async Task HandleDevicePairListUpdatedAsync(DevicePairingListInfo list, long gen)
-    {
-        await Task.CompletedTask;
-    }
-
     // Auto-approve only explicitly typed device-pair role upgrades. Gateway-owned
     // node command trust always remains pending for explicit operator approval.
     // _devicePairAutoApproveInFlight is a CAS guard scoped to JUST the approve RPC —

src/OpenClaw.Shared/Models.cs

@@ -1243,11 +1243,30 @@ public static string BuildNodeApprovalRepairCommand(string? pendingRequestId)
             : "openclaw nodes pending";
     }
 
+    public static string BuildDeviceApprovalRepairCommand(string? pendingRequestId)
+    {
+        return TryBuildPairingApprovalCommand(
+            pendingRequestId,
+            "openclaw devices approve",
+            out var approvalCommand)
+            ? approvalCommand
+            : "openclaw devices list";
+    }
+
     public static string BuildUnknownPairingDiscoveryCommands() =>
         string.Join(Environment.NewLine, "openclaw nodes pending", "openclaw devices list");
 
     public static bool TryBuildNodeApprovalCommand(
         string? pendingRequestId,
+        out string approvalCommand) =>
+        TryBuildPairingApprovalCommand(
+            pendingRequestId,
+            "openclaw nodes approve",
+            out approvalCommand);
+
+    private static bool TryBuildPairingApprovalCommand(
+        string? pendingRequestId,
+        string commandPrefix,
         out string approvalCommand)
     {
         var requestId = pendingRequestId?.Trim();
@@ -1262,7 +1281,7 @@ public static bool TryBuildNodeApprovalCommand(
             return false;
         }
 
-        approvalCommand = $"openclaw nodes approve {requestId}";
+        approvalCommand = $"{commandPrefix} {requestId}";
         return true;
     }
 

src/OpenClaw.Tray.WinUI/Pages/ConnectionPagePlan.cs

@@ -633,14 +633,7 @@ _ when CountEnabledCapabilities(settings) == 0 => NodeCardState.OnPermissionsInc
         // Windows-cmd users.
         if (snap.NodePairingApprovalKind == PairingApprovalKind.DevicePair)
         {
-            var deviceId = !string.IsNullOrEmpty(snap.NodeDeviceId)
-                ? ConnectionCardPlanSanitizer.Sanitize(snap.NodeDeviceId!, maxLen: 128)
-                : null;
-            return reqId != null
-                ? $"openclaw devices approve {reqId}"
-                : deviceId != null
-                    ? $"openclaw devices approve {deviceId}"
-                    : "openclaw devices list";
+            return CommandCenterDiagnostics.BuildDeviceApprovalRepairCommand(reqId);
         }
 
         if (snap.NodePairingApprovalKind == PairingApprovalKind.NodePair)

src/OpenClaw.Tray.WinUI/Services/CommandCenterStateBuilder.cs

@@ -67,7 +67,8 @@ node.ApprovalState is GatewayNodeApprovalState.PendingApproval or
         {
             var approvalCommand = _snapshot.NodePairingApprovalKind switch
             {
-                PairingApprovalKind.DevicePair => $"openclaw devices approve {_snapshot.NodeService.FullDeviceId}",
+                PairingApprovalKind.DevicePair => CommandCenterDiagnostics.BuildDeviceApprovalRepairCommand(
+                    _snapshot.NodePairingRequestId),
                 PairingApprovalKind.NodePair => CommandCenterDiagnostics.BuildNodeApprovalRepairCommand(_snapshot.NodePairingRequestId),
                 _ => CommandCenterDiagnostics.BuildUnknownPairingDiscoveryCommands()
             };

tests/OpenClaw.Shared.Tests/ModelsTests.cs

@@ -1405,6 +1405,20 @@ public void BuildNodeApprovalRepairCommand_ValidatesRequestId(
         Assert.Equal(expected, CommandCenterDiagnostics.BuildNodeApprovalRepairCommand(requestId));
     }
 
+    [Theory]
+    [InlineData("request-123", "openclaw devices approve request-123")]
+    [InlineData(" request:123 ", "openclaw devices approve request:123")]
+    [InlineData(null, "openclaw devices list")]
+    [InlineData("", "openclaw devices list")]
+    [InlineData("request-1;whoami", "openclaw devices list")]
+    [InlineData("<requestId>", "openclaw devices list")]
+    public void BuildDeviceApprovalRepairCommand_ValidatesRequestId(
+        string? requestId,
+        string expected)
+    {
+        Assert.Equal(expected, CommandCenterDiagnostics.BuildDeviceApprovalRepairCommand(requestId));
+    }
+
     [Fact]
     public void BuildUnknownPairingDiscoveryCommands_IncludesBothApprovalQueues()
     {

tests/OpenClaw.Tray.Tests/ConnectionPageApproveCommandTests.cs

@@ -54,16 +54,14 @@ public void UnknownNodePairingKind_UsesBothDiscoveryQueuesEvenWithRequestId()
     }
 
     [Theory]
-    [InlineData(PairingApprovalKind.DevicePair, null, "openclaw devices list")]
-    [InlineData(PairingApprovalKind.DevicePair, "node-device-789", "openclaw devices approve node-device-789")]
-    public void MissingDevicePairRequestId_EmitsShellSafeDiscoveryCommand_NotBareApprove(
-        PairingApprovalKind approvalKind,
-        string? nodeDeviceId,
-        string expected)
+    [InlineData(null)]
+    [InlineData("node-device-789")]
+    public void MissingDevicePairRequestId_EmitsDiscoveryCommand_NotDeviceId(
+        string? nodeDeviceId)
     {
-        var plan = BuildNodePairingPlan(null, approvalKind, nodeDeviceId);
+        var plan = BuildNodePairingPlan(null, PairingApprovalKind.DevicePair, nodeDeviceId);
 
-        AssertShellSafeCommand(expected, plan.NodeApproveCommand);
+        AssertShellSafeCommand("openclaw devices list", plan.NodeApproveCommand);
     }
 
     [Fact]

tests/OpenClaw.Tray.Tests/ConnectionPageNodeApprovalSourceTests.cs

@@ -21,6 +21,9 @@ public void CommandCenterFallback_ProjectsLocalDeclarationsAsUnverified()
         Assert.Contains("!hasAuthoritativePendingLocalNodeTrust;", builderSource);
         Assert.Contains("if (shouldShowPendingLocalNodeApproval &&", builderSource);
         Assert.Contains("_snapshot.NodePairingApprovalKind switch", builderSource);
+        Assert.Contains(
+            "PairingApprovalKind.DevicePair => CommandCenterDiagnostics.BuildDeviceApprovalRepairCommand(",
+            builderSource);
         Assert.Contains(
             "PairingApprovalKind.NodePair => CommandCenterDiagnostics.BuildNodeApprovalRepairCommand(_snapshot.NodePairingRequestId)",
             builderSource);