feat(setup): pairing helper to list/approve devices (vignesh07#83)

Author: vignesh07

src/server.js

@@ -465,6 +465,13 @@ app.get("/setup", requireSetupAuth, (_req, res) => {
     <button id="reset" style="background:#444; margin-left:0.5rem">Reset setup</button>
     <pre id="log" style="white-space:pre-wrap"></pre>
     <p class="muted">Reset deletes the OpenClaw config file so you can rerun onboarding. Pairing approval lets you grant DM access when dmPolicy=pairing.</p>
+
+    <details style="margin-top: 0.75rem">
+      <summary><strong>Pairing helper</strong> (for “disconnected (1008): pairing required”)</summary>
+      <p class="muted">This lists pending device requests and lets you approve them without SSH.</p>
+      <button id="devicesRefresh" style="background:#0f172a">Refresh pending devices</button>
+      <div id="devicesList" class="muted" style="margin-top:0.5rem"></div>
+    </details>
   </div>
 
   <script src="/setup/app.js"></script>
@@ -824,6 +831,16 @@ function redactSecrets(text) {
     .replace(/(AA[A-Za-z0-9_-]{10,}:\S{10,})/g, "[REDACTED]");
 }
 
+function extractDeviceRequestIds(text) {
+  const s = String(text || "");
+  const out = new Set();
+
+  for (const m of s.matchAll(/requestId\s*(?:=|:)\s*([A-Za-z0-9_-]{6,})/g)) out.add(m[1]);
+  for (const m of s.matchAll(/"requestId"\s*:\s*"([A-Za-z0-9_-]{6,})"/g)) out.add(m[1]);
+
+  return Array.from(out);
+}
+
 const ALLOWED_CONSOLE_COMMANDS = new Set([
   // Wrapper-managed lifecycle
   "gateway.restart",
@@ -969,12 +986,31 @@ app.post("/setup/api/pairing/approve", requireSetupAuth, async (req, res) => {
   return res.status(r.code === 0 ? 200 : 500).json({ ok: r.code === 0, output: r.output });
 });
 
+// Device pairing helper (list + approve) to avoid needing SSH.
+app.get("/setup/api/devices/pending", requireSetupAuth, async (_req, res) => {
+  const r = await runCmd(OPENCLAW_NODE, clawArgs(["devices", "list"]));
+  const output = redactSecrets(r.output);
+  const requestIds = extractDeviceRequestIds(output);
+  return res.status(r.code === 0 ? 200 : 500).json({ ok: r.code === 0, requestIds, output });
+});
+
+app.post("/setup/api/devices/approve", requireSetupAuth, async (req, res) => {
+  const requestId = String((req.body && req.body.requestId) || "").trim();
+  if (!requestId) return res.status(400).json({ ok: false, error: "Missing device request ID" });
+  if (!/^[A-Za-z0-9_-]+$/.test(requestId)) return res.status(400).json({ ok: false, error: "Invalid device request ID" });
+  const r = await runCmd(OPENCLAW_NODE, clawArgs(["devices", "approve", requestId]));
+  return res.status(r.code === 0 ? 200 : 500).json({ ok: r.code === 0, output: redactSecrets(r.output) });
+});
+
 app.post("/setup/api/reset", requireSetupAuth, async (_req, res) => {
   // Minimal reset: delete the config file so /setup can rerun.
   // Keep credentials/sessions/workspace by default.
   try {
-    fs.rmSync(configPath(), { force: true });
-    res.type("text/plain").send("OK - deleted config file. You can rerun setup now.");
+    const candidates = typeof resolveConfigCandidates === "function" ? resolveConfigCandidates() : [configPath()];
+    for (const p of candidates) {
+      try { fs.rmSync(p, { force: true }); } catch {}
+    }
+    res.type("text/plain").send("OK - deleted config file(s). You can rerun setup now.");
   } catch (err) {
     res.status(500).type("text/plain").send(String(err));
   }

src/setup-app.js

@@ -241,6 +241,62 @@
     };
   }
 
+  // Device pairing helper
+  var devicesRefreshBtn = document.getElementById('devicesRefresh');
+  var devicesListEl = document.getElementById('devicesList');
+
+  function approveDevice(requestId) {
+    if (!requestId) return;
+    if (!confirm('Approve device request ' + requestId + '?')) return;
+    if (devicesListEl) devicesListEl.textContent = 'Approving ' + requestId + '...';
+
+    return httpJson('/setup/api/devices/approve', {
+      method: 'POST',
+      headers: { 'content-type': 'application/json' },
+      body: JSON.stringify({ requestId: requestId })
+    }).then(function (j) {
+      if (devicesListEl) devicesListEl.textContent = j.output || 'Approved.';
+      return refreshStatus();
+    }).catch(function (e) {
+      if (devicesListEl) devicesListEl.textContent = 'Error: ' + String(e);
+    });
+  }
+
+  function refreshDevices() {
+    if (!devicesListEl) return;
+    devicesListEl.textContent = 'Loading pending devices...';
+    return httpJson('/setup/api/devices/pending').then(function (j) {
+      var ids = j.requestIds || [];
+      if (!ids.length) {
+        devicesListEl.textContent = 'No pending device requests found.';
+        return;
+      }
+      devicesListEl.innerHTML = '';
+      for (var i = 0; i < ids.length; i++) {
+        (function (id) {
+          var row = document.createElement('div');
+          row.style.marginTop = '0.25rem';
+          var btn = document.createElement('button');
+          btn.textContent = 'Approve ' + id;
+          btn.style.background = '#111';
+          btn.style.marginRight = '0.5rem';
+          btn.onclick = function () { approveDevice(id); };
+          var code = document.createElement('code');
+          code.textContent = id;
+          row.appendChild(btn);
+          row.appendChild(code);
+          devicesListEl.appendChild(row);
+        })(ids[i]);
+      }
+    }).catch(function (e) {
+      devicesListEl.textContent = 'Error: ' + String(e);
+    });
+  }
+
+  if (devicesRefreshBtn) {
+    devicesRefreshBtn.onclick = refreshDevices;
+  }
+
   document.getElementById('reset').onclick = function () {
     if (!confirm('Reset setup? This deletes the config file so onboarding can run again.')) return;
     logEl.textContent = 'Resetting...\n';

test/extract-device-requests.test.js

@@ -0,0 +1,18 @@
+import test from "node:test";
+import assert from "node:assert/strict";
+
+function extractDeviceRequestIds(text) {
+  const s = String(text || "");
+  const out = new Set();
+
+  // Common patterns: requestId=XYZ, requestId: XYZ, "requestId":"XYZ".
+  for (const m of s.matchAll(/requestId\s*(?:=|:)\s*([A-Za-z0-9_-]{6,})/g)) out.add(m[1]);
+  for (const m of s.matchAll(/"requestId"\s*:\s*"([A-Za-z0-9_-]{6,})"/g)) out.add(m[1]);
+
+  return Array.from(out);
+}
+
+test("extractDeviceRequestIds: finds requestId formats", () => {
+  const sample = `pending:\n- requestId=abc123_DEF\n{"requestId":"REQ_456-xy"}\nrequestId: ZZZ999`;
+  assert.deepEqual(extractDeviceRequestIds(sample).sort(), ["REQ_456-xy", "ZZZ999", "abc123_DEF"].sort());
+});