@chrysb/alphaclaw 0.7.2-beta.4 → 0.7.2-beta.6

package/lib/public/js/components/file-viewer/use-file-viewer.js

@@ -272,7 +272,6 @@ export const useFileViewer = ({
       );
     } catch (saveError) {
       const message = saveError.message || "Could not save file";
-      setError(message);
       showToast(message, "error");
     } finally {
       setSaving(false);

package/lib/public/js/components/nodes-tab/connected-nodes/index.js

@@ -3,15 +3,17 @@ import htm from "https://esm.sh/htm";
 import { useCallback, useEffect, useRef, useState } from "https://esm.sh/preact/hooks";
 import { ActionButton } from "../../action-button.js";
 import { Badge } from "../../badge.js";
+import { ConfirmDialog } from "../../confirm-dialog.js";
 import { ComputerLineIcon, FileCopyLineIcon } from "../../icons.js";
 import { LoadingSpinner } from "../../loading-spinner.js";
 import { copyTextToClipboard } from "../../../lib/clipboard.js";
-import { fetchNodeBrowserStatusForNode } from "../../../lib/api.js";
+import { fetchNodeBrowserStatusForNode, removeNode } from "../../../lib/api.js";
+import { OverflowMenu, OverflowMenuItem } from "../../overflow-menu.js";
 import { readUiSettings, updateUiSettings } from "../../../lib/ui-settings.js";
 import { showToast } from "../../toast.js";
 
 const html = htm.bind(h);
-const kBrowserCheckTimeoutMs = 10000;
+const kBrowserCheckTimeoutMs = 15000;
 const kBrowserPollIntervalMs = 10000;
 const kBrowserAttachStateByNodeKey = "nodesBrowserAttachStateByNode";
 
@@ -108,6 +110,7 @@ export const ConnectedNodesCard = ({
   loading = false,
   error = "",
   connectInfo = null,
+  onRefreshNodes = async () => {},
 }) => {
   const [browserStatusByNodeId, setBrowserStatusByNodeId] = useState({});
   const [browserErrorByNodeId, setBrowserErrorByNodeId] = useState({});
@@ -115,6 +118,9 @@ export const ConnectedNodesCard = ({
   const [browserAttachStateByNodeId, setBrowserAttachStateByNodeId] = useState(() =>
     readBrowserAttachStateByNode(),
   );
+  const [menuOpenNodeId, setMenuOpenNodeId] = useState("");
+  const [removeDialogNode, setRemoveDialogNode] = useState(null);
+  const [removingNodeId, setRemovingNodeId] = useState("");
   const browserPollCursorRef = useRef(0);
   const browserCheckInFlightNodeIdRef = useRef("");
 
@@ -200,6 +206,33 @@ export const ConnectedNodesCard = ({
     });
   }, [setBrowserAttachStateForNode]);
 
+  const handleOpenNodeMenu = useCallback((nodeId) => {
+    const normalizedNodeId = String(nodeId || "").trim();
+    if (!normalizedNodeId) return;
+    setMenuOpenNodeId((currentNodeId) =>
+      currentNodeId === normalizedNodeId ? "" : normalizedNodeId,
+    );
+  }, []);
+
+  const handleRemoveNode = useCallback(async () => {
+    const nodeId = String(removeDialogNode?.nodeId || "").trim();
+    if (!nodeId || removingNodeId) return;
+    setRemovingNodeId(nodeId);
+    try {
+      await removeNode(nodeId);
+      // Removing a device should also clear local browser-attach state for that node.
+      handleDetachNodeBrowser(nodeId);
+      showToast("Device removed", "success");
+      setRemoveDialogNode(null);
+      setMenuOpenNodeId("");
+      await onRefreshNodes();
+    } catch (removeError) {
+      showToast(removeError.message || "Could not remove node", "error");
+    } finally {
+      setRemovingNodeId("");
+    }
+  }, [handleDetachNodeBrowser, onRefreshNodes, removeDialogNode, removingNodeId]);
+
   useEffect(() => {
     if (checkingBrowserNodeId) return;
     const pollableNodeIds = nodes
@@ -310,7 +343,30 @@ export const ConnectedNodesCard = ({
                             ${node?.nodeId || ""}
                           </div>
                         </div>
-                        ${renderNodeStatusBadge(node)}
+                        <div class="flex items-center gap-1.5">
+                          ${renderNodeStatusBadge(node)}
+                          ${node?.paired
+                            ? html`
+                                <${OverflowMenu}
+                                  open=${menuOpenNodeId === nodeId}
+                                  ariaLabel="Open node actions"
+                                  title="Open node actions"
+                                  onClose=${() => setMenuOpenNodeId("")}
+                                  onToggle=${() => handleOpenNodeMenu(nodeId)}
+                                >
+                                  <${OverflowMenuItem}
+                                    className="text-red-300 hover:text-red-200"
+                                    onClick=${() => {
+                                      setMenuOpenNodeId("");
+                                      setRemoveDialogNode(node);
+                                    }}
+                                  >
+                                    Remove device
+                                  </${OverflowMenuItem}>
+                                </${OverflowMenu}>
+                              `
+                            : null}
+                        </div>
                       </div>
                       <div class="flex flex-wrap gap-2 text-[11px] text-gray-500">
                         <span>platform: <code>${node?.platform || "unknown"}</code></span>
@@ -459,5 +515,22 @@ export const ConnectedNodesCard = ({
               </div>
             `}
   </div>
+  <${ConfirmDialog}
+    visible=${!!removeDialogNode}
+    title="Remove device?"
+    message=${removeDialogNode?.connected
+      ? "This device is currently connected. Removing it will disconnect and remove the paired device from this gateway (equivalent to running openclaw devices remove for this device id). The device can reconnect and pair again later."
+      : "This removes the paired device from this gateway (equivalent to running openclaw devices remove for this device id). The device can reconnect and pair again later."}
+    confirmLabel="Remove device"
+    confirmLoadingLabel="Removing..."
+    confirmTone="warning"
+    confirmLoading=${Boolean(removingNodeId)}
+    confirmDisabled=${Boolean(removingNodeId)}
+    onCancel=${() => {
+      if (removingNodeId) return;
+      setRemoveDialogNode(null);
+    }}
+    onConfirm=${handleRemoveNode}
+  />
 `;
 };

package/lib/public/js/components/nodes-tab/index.js

@@ -40,6 +40,7 @@ export const NodesTab = ({ onRestartRequired = () => {} }) => {
         loading=${state.loadingNodes}
         error=${state.nodesError}
         connectInfo=${state.connectInfo}
+        onRefreshNodes=${actions.refreshNodes}
       />
 
       <${BrowserAttachCard} />
@@ -47,7 +48,6 @@ export const NodesTab = ({ onRestartRequired = () => {} }) => {
       <${NodesSetupWizard}
         visible=${state.wizardVisible}
         nodes=${state.nodes}
-        pending=${state.pending}
         refreshNodes=${actions.refreshNodes}
         onRestartRequired=${onRestartRequired}
         onClose=${actions.closeWizard}

package/lib/public/js/components/nodes-tab/setup-wizard/index.js

@@ -3,6 +3,7 @@ import htm from "https://esm.sh/htm";
 import { ModalShell } from "../../modal-shell.js";
 import { ActionButton } from "../../action-button.js";
 import { CloseIcon, FileCopyLineIcon } from "../../icons.js";
+import { DevicePairings } from "../../device-pairings.js";
 import { copyTextToClipboard } from "../../../lib/clipboard.js";
 import { showToast } from "../../toast.js";
 import { useSetupWizard } from "./use-setup-wizard.js";
@@ -12,8 +13,6 @@ const html = htm.bind(h);
 const kWizardSteps = [
   "Install OpenClaw CLI",
   "Connect Node",
-  "Approve Node",
-  "Set Gateway Routing",
 ];
 
 const renderCommandBlock = ({ command = "", onCopy = () => {} }) => html`
@@ -44,7 +43,6 @@ const copyAndToast = async (value, label = "text") => {
 export const NodesSetupWizard = ({
   visible = false,
   nodes = [],
-  pending = [],
   refreshNodes = async () => {},
   onRestartRequired = () => {},
   onClose = () => {},
@@ -52,13 +50,11 @@ export const NodesSetupWizard = ({
   const state = useSetupWizard({
     visible,
     nodes,
-    pending,
     refreshNodes,
     onRestartRequired,
     onClose,
   });
   const isFinalStep = state.step === kWizardSteps.length - 1;
-  const canApproveSelectedNode = state.selectedNode?.paired === false;
 
   return html`
     <${ModalShell}
@@ -127,101 +123,26 @@ export const NodesSetupWizard = ({
                     onCopy: () =>
                       copyAndToast(state.connectCommand || "", "command"),
                   })}
-              <div class="rounded-lg border border-border bg-black/20 px-3 py-2 text-xs text-gray-400">
-                ${state.pendingSelectableNodes.length
-                  ? `${state.pendingSelectableNodes.length} pending node${state.pendingSelectableNodes.length === 1
-                      ? ""
-                      : "s"} detected. Continue to Step 3 to approve.`
-                  : "Pairing requests will show up here. Checks every 3s."}
-              </div>
-            </div>
-          `
-        : null}
-
-      ${state.step === 2
-        ? html`
-            <div class="space-y-2">
-              <div class="text-xs text-gray-500">
-                Select the node to approve after you run the connect command.
-              </div>
-              <div class="text-xs text-gray-500">
-                This list refreshes automatically every
-                ${" "}
-                <code>${Math.round(state.nodeDiscoveryPollIntervalMs / 1000)}s</code>
-                ${" "}
-                while this step is open.
-              </div>
-              <div class="flex items-center gap-2">
-                <select
-                  value=${state.selectedNodeId}
-                  oninput=${(event) => state.setSelectedNodeId(event.target.value)}
-                  class="flex-1 min-w-0 bg-black/30 border border-border rounded-lg px-2.5 py-2 text-xs font-mono focus:border-gray-500 focus:outline-none"
-                >
-                  <option value="">
-                    ${state.selectableNodes.length
-                      ? "Select node..."
-                      : "No nodes found yet"}
-                  </option>
-                  ${state.selectableNodes.map(
-                    (entry) => html`
-                      <option value=${entry.nodeId}>
-                        ${entry.displayName} (${entry.nodeId.slice(0, 12)}...)${entry.paired ===
-                        false
-                          ? " · pending approval"
-                          : " · already paired"}
-                      </option>
-                    `,
-                  )}
-                </select>
-                <${ActionButton}
-                  onClick=${state.refreshNodeList}
-                  idleLabel="Refresh"
-                  tone="secondary"
-                  size="sm"
-                />
-              </div>
-              ${state.selectedNodeId && !canApproveSelectedNode
+              ${state.devicePending.length
                 ? html`
-                    <div class="text-xs text-yellow-300">
-                      This node is already paired. Pick a
-                      ${" "}
-                      <code>pending approval</code>
-                      ${" "}
-                      node to continue.
-                    </div>
+                    <${DevicePairings}
+                      pending=${state.devicePending}
+                      onApprove=${state.handleDeviceApprove}
+                      onReject=${state.handleDeviceReject}
+                    />
                   `
-                : null}
-            </div>
-          `
-        : null}
-
-      ${state.step === 3
-        ? html`
-            <div class="space-y-2">
-              <div class="text-xs text-gray-500">
-                This step only updates gateway routing
-                (<code>tools.exec.host=node</code>, target node, and gateway
-                ask/security defaults).
-              </div>
-              <div class="rounded-lg border border-yellow-500/40 bg-yellow-500/10 px-3 py-2 text-xs text-yellow-200">
-                Node-host permissions are local to the connected machine and are
-                not managed from this wizard yet.
-              </div>
-              <${ActionButton}
-                onClick=${async () => {
-                  const ok = await state.applyGatewayNodeRouting();
-                  if (ok) {
-                    await refreshNodes();
-                    state.completeWizard();
-                  }
-                }}
-                loading=${state.configuring}
-                idleLabel="Apply Gateway Routing + Finish"
-                loadingLabel="Applying..."
-                tone="primary"
-                size="sm"
-                disabled=${!state.selectedNodeId}
-              />
+                : state.selectedPairedNode && !state.selectedPairedNode.connected
+                  ? html`
+                      <div class="rounded-lg border border-yellow-500/40 bg-yellow-500/10 px-3 py-2 text-xs text-yellow-200">
+                        Node is paired but currently disconnected. Run the node
+                        command again on your device, then Finish will enable.
+                      </div>
+                    `
+                  : html`
+                      <div class="rounded-lg border border-border bg-black/20 px-3 py-2 text-xs text-gray-400">
+                        Pairing request will show up here. Checks every 3s.
+                      </div>
+                    `}
             </div>
           `
         : null}
@@ -241,31 +162,29 @@ export const NodesSetupWizard = ({
         ${isFinalStep
           ? html`
               <${ActionButton}
-                onClick=${onClose}
-                idleLabel="Close"
-                tone="secondary"
+                onClick=${async () => {
+                  const ok = await state.applyGatewayNodeRouting();
+                  if (!ok) return;
+                  await refreshNodes();
+                  state.completeWizard();
+                }}
+                loading=${state.configuring}
+                idleLabel="Finish"
+                loadingLabel="Finishing..."
+                tone="primary"
                 size="md"
                 className="w-full justify-center"
+                disabled=${!state.canFinish}
               />
             `
           : html`
               <${ActionButton}
-                onClick=${async () => {
-                  if (state.step === 2) {
-                    const approved = await state.approveSelectedNode();
-                    if (!approved) return;
-                  }
-                  state.setStep(Math.min(kWizardSteps.length - 1, state.step + 1));
-                }}
-                loading=${state.step === 2 &&
-                state.approvingNodeId === state.selectedNodeId}
-                idleLabel=${state.step === 2 ? "Approve" : "Next"}
-                loadingLabel="Approving..."
+                onClick=${() =>
+                  state.setStep(Math.min(kWizardSteps.length - 1, state.step + 1))}
+                idleLabel="Next"
                 tone="primary"
                 size="md"
                 className="w-full justify-center"
-                disabled=${state.step === 2 &&
-                (!state.selectedNodeId || !canApproveSelectedNode)}
               />
             `}
       </div>

package/lib/public/js/components/nodes-tab/setup-wizard/use-setup-wizard.js

@@ -6,9 +6,11 @@ import {
   useState,
 } from "https://esm.sh/preact/hooks";
 import {
-  approveNode,
+  approveDevice,
+  fetchDevicePairings,
   fetchNodeConnectInfo,
-  saveNodeExecConfig,
+  rejectDevice,
+  routeExecToNode,
 } from "../../../lib/api.js";
 import { showToast } from "../../toast.js";
 
@@ -17,7 +19,6 @@ const kNodeDiscoveryPollIntervalMs = 3000;
 export const useSetupWizard = ({
   visible = false,
   nodes = [],
-  pending = [],
   refreshNodes = async () => {},
   onRestartRequired = () => {},
   onClose = () => {},
@@ -27,15 +28,14 @@ export const useSetupWizard = ({
   const [loadingConnectInfo, setLoadingConnectInfo] = useState(false);
   const [displayName, setDisplayName] = useState("My Mac Node");
   const [selectedNodeId, setSelectedNodeId] = useState("");
-  const [approvingNodeId, setApprovingNodeId] = useState("");
   const [configuring, setConfiguring] = useState(false);
+  const [devicePending, setDevicePending] = useState([]);
   const refreshInFlightRef = useRef(false);
 
   useEffect(() => {
     if (!visible) return;
     setStep(0);
     setSelectedNodeId("");
-    setApprovingNodeId("");
     setConfiguring(false);
   }, [visible]);
 
@@ -54,38 +54,29 @@ export const useSetupWizard = ({
       });
   }, [visible]);
 
-  const selectableNodes = useMemo(() => {
-    const all = [
-      ...pending.map((entry) => ({ ...entry, pendingApproval: true })),
-      ...nodes.map((entry) => ({ ...entry, pendingApproval: false })),
-    ];
+  const pairedNodes = useMemo(() => {
     const seen = new Set();
     const unique = [];
-    for (const entry of all) {
-      const nodeId = String(entry?.nodeId || entry?.id || "").trim();
+    for (const entry of nodes) {
+      const nodeId = String(entry?.nodeId || "").trim();
       if (!nodeId || seen.has(nodeId)) continue;
+      if (entry?.paired === false) continue;
       seen.add(nodeId);
       unique.push({
         nodeId,
         displayName: String(entry?.displayName || entry?.name || nodeId),
-        paired: entry?.pendingApproval ? false : entry?.paired !== false,
         connected: entry?.connected === true,
       });
     }
     return unique;
-  }, [nodes, pending]);
+  }, [nodes]);
 
-  const pendingSelectableNodes = useMemo(
-    () => selectableNodes.filter((entry) => entry.paired === false),
-    [selectableNodes],
-  );
-
-  const selectedNode = useMemo(
+  const selectedPairedNode = useMemo(
     () =>
-      selectableNodes.find(
+      pairedNodes.find(
         (entry) => entry.nodeId === String(selectedNodeId || "").trim(),
       ) || null,
-    [selectableNodes, selectedNodeId],
+    [pairedNodes, selectedNodeId],
   );
 
   const connectCommand = useMemo(() => {
@@ -114,13 +105,18 @@ export const useSetupWizard = ({
     refreshInFlightRef.current = true;
     try {
       await refreshNodes();
+      const deviceData = await fetchDevicePairings();
+      const pendingList = Array.isArray(deviceData?.pending)
+        ? deviceData.pending
+        : [];
+      setDevicePending(pendingList);
     } finally {
       refreshInFlightRef.current = false;
     }
   }, [refreshNodes]);
 
   useEffect(() => {
-    if (!visible || (step !== 1 && step !== 2)) return;
+    if (!visible || step !== 1) return;
     let active = true;
     const poll = async () => {
       if (!active) return;
@@ -137,45 +133,49 @@ export const useSetupWizard = ({
   }, [refreshNodeList, step, visible]);
 
   useEffect(() => {
-    if (!visible || step !== 2) return;
-    const hasSelected = selectableNodes.some(
+    if (!visible || step !== 1) return;
+    const hasSelected = pairedNodes.some(
       (entry) => entry.nodeId === String(selectedNodeId || "").trim(),
     );
-    if (hasSelected) return;
+    const normalizedDisplayName = String(displayName || "").trim().toLowerCase();
     const preferredNode =
-      pendingSelectableNodes.find((entry) => entry.paired === false) || selectableNodes[0];
+      pairedNodes.find(
+        (entry) =>
+          String(entry?.displayName || "")
+            .trim()
+            .toLowerCase() === normalizedDisplayName,
+      ) || pairedNodes[0];
     if (!preferredNode) return;
+    if (hasSelected && String(selectedNodeId || "").trim() === preferredNode.nodeId) return;
     setSelectedNodeId(preferredNode.nodeId);
-  }, [pendingSelectableNodes, selectableNodes, selectedNodeId, step, visible]);
+  }, [displayName, pairedNodes, selectedNodeId, step, visible]);
 
-  const approveSelectedNode = useCallback(async () => {
-    const nodeId = String(selectedNodeId || "").trim();
-    if (!nodeId || approvingNodeId) return false;
-    setApprovingNodeId(nodeId);
+  const handleDeviceApprove = useCallback(async (requestId) => {
     try {
-      await approveNode(nodeId);
-      showToast("Node approved", "success");
-      await refreshNodes();
-      return true;
+      await approveDevice(requestId);
+      showToast("Pairing approved", "success");
+      await refreshNodeList();
     } catch (err) {
-      showToast(err.message || "Could not approve node", "error");
-      return false;
-    } finally {
-      setApprovingNodeId("");
+      showToast(err.message || "Could not approve pairing", "error");
+    }
+  }, [refreshNodeList]);
+
+  const handleDeviceReject = useCallback(async (requestId) => {
+    try {
+      await rejectDevice(requestId);
+      showToast("Pairing rejected", "info");
+      await refreshNodeList();
+    } catch (err) {
+      showToast(err.message || "Could not reject pairing", "error");
     }
-  }, [approvingNodeId, refreshNodes, selectedNodeId]);
+  }, [refreshNodeList]);
 
   const applyGatewayNodeRouting = useCallback(async () => {
     const nodeId = String(selectedNodeId || "").trim();
     if (!nodeId || configuring) return false;
     setConfiguring(true);
     try {
-      await saveNodeExecConfig({
-        host: "node",
-        security: "allowlist",
-        ask: "on-miss",
-        node: nodeId,
-      });
+      await routeExecToNode(nodeId);
       onRestartRequired(true);
       showToast("Gateway routing now points to the selected node", "success");
       return true;
@@ -200,15 +200,16 @@ export const useSetupWizard = ({
     setDisplayName,
     selectedNodeId,
     setSelectedNodeId,
-    selectedNode,
-    selectableNodes,
-    pendingSelectableNodes,
-    approvingNodeId,
+    pairedNodes,
+    selectedPairedNode,
+    devicePending,
     configuring,
+    canFinish: Boolean(selectedPairedNode?.connected),
     connectCommand,
     refreshNodeList,
     nodeDiscoveryPollIntervalMs: kNodeDiscoveryPollIntervalMs,
-    approveSelectedNode,
+    handleDeviceApprove,
+    handleDeviceReject,
     applyGatewayNodeRouting,
     completeWizard,
   };

package/lib/public/js/components/nodes-tab/use-nodes-tab.js

@@ -8,6 +8,9 @@ export const useNodesTab = () => {
   const [wizardVisible, setWizardVisible] = useState(false);
   const [connectInfo, setConnectInfo] = useState(null);
   const [refreshingNodes, setRefreshingNodes] = useState(false);
+  const pairedNodes = Array.isArray(connectedNodesState.nodes)
+    ? connectedNodesState.nodes.filter((entry) => entry?.paired !== false)
+    : [];
 
   useEffect(() => {
     fetchNodeConnectInfo()
@@ -32,7 +35,7 @@ export const useNodesTab = () => {
   return {
     state: {
       wizardVisible,
-      nodes: connectedNodesState.nodes,
+      nodes: pairedNodes,
       pending: connectedNodesState.pending,
       loadingNodes: connectedNodesState.loading,
       refreshingNodes,

package/lib/public/js/lib/api.js

@@ -679,6 +679,34 @@ export const approveNode = async (nodeId) => {
   return parseJsonOrThrow(res, "Could not approve node");
 };
 
+export const removeNode = async (nodeId) => {
+  const safeNodeId = encodeURIComponent(String(nodeId || ""));
+  const res = await authFetch(`/api/nodes/${safeNodeId}`, {
+    method: "DELETE",
+  });
+  return parseJsonOrThrow(res, "Could not remove node");
+};
+
+export const routeExecToNode = async (nodeId) => {
+  const safeNodeId = encodeURIComponent(String(nodeId || ""));
+  const controller = new AbortController();
+  const timeoutId = setTimeout(() => controller.abort(), 20000);
+  try {
+    const res = await authFetch(`/api/nodes/${safeNodeId}/route`, {
+      method: "POST",
+      signal: controller.signal,
+    });
+    return parseJsonOrThrow(res, "Could not route execution to node");
+  } catch (error) {
+    if (String(error?.name || "") === "AbortError") {
+      throw new Error("Routing timed out. Gateway may be restarting or unavailable.");
+    }
+    throw error;
+  } finally {
+    clearTimeout(timeoutId);
+  }
+};
+
 export const fetchNodeConnectInfo = async () => {
   const res = await authFetch("/api/nodes/connect-info");
   return parseJsonOrThrow(res, "Could not load connect info");
@@ -1132,10 +1160,12 @@ export const fetchFileContent = async (filePath) => {
 };
 
 export const saveFileContent = async (filePath, content) => {
+  const normalizedPath = String(filePath || "");
+  const normalizedContent = typeof content === "string" ? content : String(content ?? "");
   const res = await authFetch("/api/browse/write", {
     method: "PUT",
     headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ path: filePath, content }),
+    body: JSON.stringify({ path: normalizedPath, content: normalizedContent }),
   });
   return parseJsonOrThrow(res, "Could not save file");
 };

package/lib/server/routes/nodes.js

@@ -7,8 +7,9 @@ const kAllowedExecHosts = new Set(["gateway", "node"]);
 const kAllowedExecSecurity = new Set(["deny", "allowlist", "full"]);
 const kAllowedExecAsk = new Set(["off", "on-miss", "always"]);
 const kSafeNodeIdPattern = /^[\w\-:.]+$/;
-const kNodeBrowserInvokeTimeoutMs = 5000;
-const kNodeBrowserCliTimeoutMs = 9000;
+const kNodeBrowserInvokeTimeoutMs = 15000;
+const kNodeBrowserCliTimeoutMs = 18000;
+const kNodeRouteCliTimeoutMs = 12000;
 
 const quoteCliArg = (value) => quoteShellArg(value, { strategy: "single" });
 
@@ -34,6 +35,31 @@ const parseNodesStatus = (stdout) => {
   return { nodes, pending };
 };
 
+const parseNodesPending = (stdout) => {
+  const parsed = parseJsonObjectFromNoisyOutput(stdout) || {};
+  const list = Array.isArray(parsed.pending)
+    ? parsed.pending
+    : Array.isArray(parsed.requests)
+      ? parsed.requests
+      : Array.isArray(parsed.nodes)
+        ? parsed.nodes
+        : [];
+  return list
+    .map((entry) => {
+      if (!entry || typeof entry !== "object") return null;
+      const requestId = String(entry.requestId || entry.id || "").trim();
+      const nodeId = String(entry.nodeId || requestId).trim();
+      if (!nodeId) return null;
+      return {
+        ...entry,
+        id: requestId || nodeId,
+        nodeId,
+        paired: false,
+      };
+    })
+    .filter(Boolean);
+};
+
 const parseNodeBrowserStatus = (stdout) => {
   const parsed = parseJsonObjectFromNoisyOutput(stdout) || {};
   const payload =
@@ -146,15 +172,29 @@ const registerNodeRoutes = ({
   fsModule,
 }) => {
   app.get("/api/nodes", async (_req, res) => {
-    const result = await clawCmd("nodes status --json", { quiet: true });
-    if (!result.ok) {
+    const statusResult = await clawCmd("nodes status --json", { quiet: true });
+    if (!statusResult.ok) {
       return res.status(500).json({
         ok: false,
-        error: result.stderr || "Could not load nodes status",
+        error: statusResult.stderr || "Could not load nodes status",
       });
     }
-    const status = parseNodesStatus(result.stdout);
-    return res.json({ ok: true, ...status });
+    const status = parseNodesStatus(statusResult.stdout);
+    const pendingResult = await clawCmd("nodes pending --json", { quiet: true });
+    const pending = pendingResult.ok
+      ? parseNodesPending(pendingResult.stdout)
+      : status.pending;
+    const pendingById = new Map();
+    for (const entry of pending) {
+      const nodeId = String(entry?.nodeId || entry?.id || "").trim();
+      if (!nodeId || pendingById.has(nodeId)) continue;
+      pendingById.set(nodeId, entry);
+    }
+    return res.json({
+      ok: true,
+      nodes: status.nodes,
+      pending: Array.from(pendingById.values()),
+    });
   });
 
   app.post("/api/nodes/:id/approve", async (req, res) => {
@@ -172,6 +212,51 @@ const registerNodeRoutes = ({
     return res.json({ ok: true });
   });
 
+  app.post("/api/nodes/:id/route", async (req, res) => {
+    const nodeId = String(req.params.id || "").trim();
+    if (!nodeId || !kSafeNodeIdPattern.test(nodeId)) {
+      return res.status(400).json({ ok: false, error: "Invalid node id" });
+    }
+    const commands = [
+      "config set tools.exec.host 'node'",
+      "config set tools.exec.security 'allowlist'",
+      "config set tools.exec.ask 'on-miss'",
+      `config set tools.exec.node ${quoteCliArg(nodeId)}`,
+    ];
+    for (const command of commands) {
+      const result = await clawCmd(command, {
+        quiet: true,
+        timeoutMs: kNodeRouteCliTimeoutMs,
+      });
+      if (!result.ok) {
+        return res.status(500).json({
+          ok: false,
+          error:
+            result.stderr ||
+            `Could not apply node routing (${command})`,
+        });
+      }
+    }
+    return res.json({ ok: true, restartRequired: true, nodeId });
+  });
+
+  app.delete("/api/nodes/:id", async (req, res) => {
+    const nodeId = String(req.params.id || "").trim();
+    if (!nodeId || !kSafeNodeIdPattern.test(nodeId)) {
+      return res.status(400).json({ ok: false, error: "Invalid node id" });
+    }
+    const result = await clawCmd(`devices remove ${quoteCliArg(nodeId)}`, {
+      quiet: true,
+    });
+    if (!result.ok) {
+      return res.status(500).json({
+        ok: false,
+        error: result.stderr || "Could not remove node",
+      });
+    }
+    return res.json({ ok: true, nodeId });
+  });
+
   app.get("/api/nodes/connect-info", async (req, res) => {
     const baseUrl = resolveSetupUiBaseUrl(req);
     const parsed = parseBaseUrlParts(baseUrl);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chrysb/alphaclaw",
-  "version": "0.7.2-beta.4",
+  "version": "0.7.2-beta.6",
   "publishConfig": {
     "access": "public"
   },
@@ -31,7 +31,7 @@
   "dependencies": {
     "express": "^4.21.0",
     "http-proxy": "^1.18.1",
-    "openclaw": "2026.3.12",
+    "openclaw": "2026.3.13",
     "ws": "^8.19.0"
   },
   "devDependencies": {