@botcord/daemon 0.2.8 → 0.2.9

package/dist/openclaw-discovery.js

@@ -46,13 +46,31 @@ export async function discoverLocalOpenclawGateways(opts = {}) {
 }
 export function mergeOpenclawGateways(cfg, found) {
     const existing = cfg.openclawGateways ?? [];
-    const existingUrls = new Set(existing.map((g) => normalizeUrlKey(g.url)));
+    const byUrl = new Map();
+    existing.forEach((g, i) => byUrl.set(normalizeUrlKey(g.url), i));
     const existingNames = new Set(existing.map((g) => g.name));
+    const merged = existing.map((g) => ({ ...g }));
     const added = [];
+    let mutated = false;
     for (const item of found) {
         const key = normalizeUrlKey(item.url);
-        if (existingUrls.has(key))
+        const idx = byUrl.get(key);
+        if (idx !== undefined) {
+            // Same URL already configured — only fill in auth that the user is
+            // missing, never overwrite an existing token / tokenFile.
+            const cur = merged[idx];
+            if (!cur.token && !cur.tokenFile) {
+                if (item.token) {
+                    cur.token = item.token;
+                    mutated = true;
+                }
+                else if (item.tokenFile) {
+                    cur.tokenFile = item.tokenFile;
+                    mutated = true;
+                }
+            }
             continue;
+        }
         const profile = {
             name: uniqueName(item.name, existingNames),
             url: item.url,
@@ -61,14 +79,15 @@ export function mergeOpenclawGateways(cfg, found) {
             profile.token = item.token;
         else if (item.tokenFile)
             profile.tokenFile = item.tokenFile;
-        existingUrls.add(key);
+        byUrl.set(key, merged.length);
         existingNames.add(profile.name);
+        merged.push(profile);
         added.push(profile);
     }
-    if (added.length === 0)
+    if (added.length === 0 && !mutated)
         return { cfg, changed: false, added };
     return {
-        cfg: { ...cfg, openclawGateways: [...existing, ...added] },
+        cfg: { ...cfg, openclawGateways: merged },
         changed: true,
         added,
     };
@@ -117,9 +136,34 @@ function discoverFromConfigDir(root) {
 }
 function parseJsonConfig(raw) {
     const obj = JSON.parse(raw);
+    // Prefer OpenClaw's native shape: `gateway.port` + `gateway.auth.token`.
+    // The legacy `acp.url` shape is also supported for explicit user-authored configs.
+    const native = pickOpenclawGatewayValues(obj?.gateway);
+    if (native)
+        return native;
     const acp = obj?.acp ?? obj?.gateway?.acp ?? obj?.gateway ?? obj;
     return pickConfigValues(acp);
 }
+function pickOpenclawGatewayValues(gw) {
+    if (!gw || typeof gw !== "object")
+        return null;
+    const port = typeof gw.port === "number" ? gw.port : undefined;
+    if (!port)
+        return null;
+    // Local discovery always targets the loopback interface, regardless of how
+    // the gateway is bound — the daemon is on the same machine.
+    const url = `ws://127.0.0.1:${port}`;
+    const auth = gw.auth;
+    const out = { url };
+    if (auth && typeof auth === "object" && auth.mode === "token") {
+        if (typeof auth.token === "string" && auth.token.trim())
+            out.token = auth.token.trim();
+        else if (typeof auth.tokenFile === "string" && auth.tokenFile.trim()) {
+            out.tokenFile = auth.tokenFile.trim();
+        }
+    }
+    return out;
+}
 function parseTomlConfig(raw) {
     let inAcp = false;
     const values = {};

package/dist/provision.js

@@ -4,7 +4,7 @@
  * side effects (register agent, write credentials, load route, add/remove
  * gateway channel) and return an ack payload.
  */
-import { existsSync, rmSync, unlinkSync } from "node:fs";
+import { existsSync, readFileSync, rmSync, unlinkSync } from "node:fs";
 import { homedir } from "node:os";
 import path from "node:path";
 import { BotCordClient, CONTROL_FRAME_TYPES, defaultCredentialsFile, derivePublicKey, loadStoredCredentials, writeCredentialsFile, } from "@botcord/protocol-core";
@@ -801,16 +801,22 @@ export function collectRuntimeSnapshot() {
 /** Maximum number of `endpoints[]` entries persisted per runtime (RFC §3.8.2). */
 export const RUNTIME_ENDPOINTS_CAP = 32;
 /**
- * Default L2 + L3 probe — opens a WS handshake against the OpenClaw gateway
- * and, when the connection is up, issues a JSON-RPC `agents.list` request to
- * enumerate configured agent profiles. Best-effort: a successful WS open with
- * a failed `agents.list` still reports `ok: true` (just without `agents`),
- * matching the RFC's "agents populated only when listing succeeded" rule.
+ * Default L2 + L3 probe — speaks OpenClaw's WS frame protocol against the
+ * gateway and enumerates agent profiles via `agents.list`.
  *
- * Method name and result shape follow OpenClaw:
- *   `~/claws/openclaw/src/gateway/server-methods/agents.ts:416` and
- *   `~/claws/openclaw/src/gateway/session-utils.ts:783` —
- *   `{ defaultId, mainKey, scope, agents: [{ id, name?, identity?, workspace, model? }] }`.
+ * Wire flow (see `~/claws/openclaw/src/gateway/server/ws-connection/message-handler.ts`
+ * and `~/claws/openclaw/src/gateway/protocol/schema/frames.ts`):
+ *   1. WS upgrade (no auth required at the HTTP layer).
+ *   2. Server emits `{type:"event", event:"connect.challenge", payload:{nonce}}`.
+ *   3. Client sends `{type:"req", id, method:"connect", params:{minProtocol, maxProtocol,
+ *      client:{id:"openclaw-probe", mode:"probe", ...}, auth:{token}}}`.
+ *   4. Server responds `{type:"res", id, ok:true, payload:{type:"hello-ok", server:{version}, ...}}`.
+ *   5. Client sends `{type:"req", id, method:"agents.list", params:{}}`.
+ *   6. Server responds with `{payload: { defaultId, mainKey, scope, agents:[{id, name?, workspace?, model?}] }}`.
+ *
+ * Best-effort: a successful WS open with a failed handshake / `agents.list`
+ * still reports `ok: true` (just without `agents`), matching the RFC's
+ * "agents populated only when listing succeeded" rule.
  */
 async function defaultWsProbe(args) {
     const { default: WebSocket } = await import("ws");
@@ -818,6 +824,9 @@ async function defaultWsProbe(args) {
         let settled = false;
         let ws;
         let timer;
+        let serverVersion;
+        const CONNECT_ID = "probe-connect";
+        let connectSent = false;
         const settle = (v) => {
             if (settled)
                 return;
@@ -834,6 +843,8 @@ async function defaultWsProbe(args) {
         };
         try {
             const headers = {};
+            // Some deployments gate the WS upgrade on Authorization too; harmless
+            // when not enforced — auth is also re-asserted in the connect frame.
             if (args.token)
                 headers["Authorization"] = `Bearer ${args.token}`;
             ws = new WebSocket(args.url, { headers });
@@ -843,65 +854,81 @@ async function defaultWsProbe(args) {
             return;
         }
         timer = setTimeout(() => settle({ ok: false, error: "timeout" }), args.timeoutMs);
-        const requestId = "probe-agents-list";
-        ws.on("open", () => {
-            // L3: enumerate agent profiles. We don't fail the L2 result if this
-            // call fails — the gateway is reachable either way.
+        const sendConnect = () => {
+            if (connectSent)
+                return;
+            connectSent = true;
+            const params = {
+                minProtocol: 3,
+                maxProtocol: 3,
+                client: {
+                    id: "openclaw-probe",
+                    version: "0.1.0",
+                    platform: process.platform || "node",
+                    mode: "probe",
+                },
+                role: "operator",
+                scopes: ["operator.read"],
+            };
+            if (args.token)
+                params.auth = { token: args.token };
             try {
-                ws.send(JSON.stringify({
-                    jsonrpc: "2.0",
-                    id: requestId,
-                    method: "agents.list",
-                    params: {},
-                }));
+                ws.send(JSON.stringify({ type: "req", id: CONNECT_ID, method: "connect", params }));
             }
             catch (err) {
-                settle({ ok: true, error: `agents.list send failed: ${err.message}` });
+                settle({ ok: true, error: `connect send failed: ${err.message}` });
             }
+        };
+        ws.on("open", () => {
+            // Some servers send `connect.challenge` before the socket is fully
+            // wired; if it never arrives we still try a best-effort connect after
+            // a short delay so the probe doesn't stall on legacy gateways.
+            setTimeout(() => {
+                if (!connectSent && !settled)
+                    sendConnect();
+            }, 250);
         });
         ws.on("message", (raw) => {
+            let msg;
             try {
-                const msg = JSON.parse(typeof raw === "string" ? raw : raw.toString("utf8"));
-                if (msg?.id !== requestId)
-                    return; // ignore unrelated frames
-                if (msg.error) {
-                    settle({ ok: true, error: String(msg.error?.message ?? "agents.list error") });
+                msg = JSON.parse(typeof raw === "string" ? raw : raw.toString("utf8"));
+            }
+            catch {
+                return;
+            }
+            if (!msg || typeof msg !== "object")
+                return;
+            if (msg.type === "event" && msg.event === "connect.challenge") {
+                // Nonce only matters for device-pairing flows; token-only auth ignores it.
+                sendConnect();
+                return;
+            }
+            if (msg.type !== "res" || typeof msg.id !== "string")
+                return;
+            if (msg.id === CONNECT_ID) {
+                if (!msg.ok) {
+                    const errMsg = msg.error?.message ? String(msg.error.message) : "connect rejected";
+                    settle({ ok: true, error: errMsg });
                     return;
                 }
-                const list = Array.isArray(msg.result?.agents) ? msg.result.agents : [];
-                const agents = [];
-                for (const a of list) {
-                    if (!a || typeof a.id !== "string" || a.id.length === 0)
-                        continue;
-                    const row = { id: a.id };
-                    if (typeof a.name === "string")
-                        row.name = a.name;
-                    if (typeof a.workspace === "string")
-                        row.workspace = a.workspace;
-                    if (a.model && typeof a.model === "object") {
-                        const model = {};
-                        if (typeof a.model.name === "string")
-                            model.name = a.model.name;
-                        if (typeof a.model.provider === "string")
-                            model.provider = a.model.provider;
-                        if (model.name || model.provider)
-                            row.model = model;
-                    }
-                    agents.push(row);
-                }
-                settle({ ok: true, agents });
-            }
-            catch (err) {
-                settle({ ok: true, error: `agents.list parse failed: ${err.message}` });
+                const v = msg.payload?.server?.version;
+                if (typeof v === "string" && v)
+                    serverVersion = v;
+                // We don't fetch agents.list over the wire: it requires `operator.read`
+                // which the gateway only grants to clients that present a paired device
+                // identity (see message-handler.ts:478 — self-declared scopes are
+                // cleared without device pairing). For local OpenClaw the agent list
+                // is sourced directly from disk by `probeOpenclawAgents`.
+                settle({ ok: true, version: serverVersion });
             }
         });
         ws.on("error", (err) => {
             settle({ ok: false, error: err.message });
         });
         ws.on("close", () => {
-            // If the socket closes before `agents.list` resolved we still treat
-            // L2 as ok (open fired) and emit no agents.
-            settle({ ok: true });
+            // If the socket closes before we got our agents.list response, treat
+            // L2 as ok (the upgrade succeeded) and emit no agents.
+            settle({ ok: true, version: serverVersion });
         });
     });
 }
@@ -913,11 +940,74 @@ export async function probeOpenclawAgents(profile, opts = {}) {
         ...(profile.token ? { token: profile.token } : {}),
         ...(profile.tokenFile ? { tokenFile: profile.tokenFile } : {}),
     });
-    return probe({
+    const result = await probe({
         url: profile.url,
         token: prepared.resolvedToken,
         timeoutMs: opts.timeoutMs ?? 3000,
     });
+    // For loopback gateways the agent roster lives in `~/.openclaw/openclaw.json`
+    // and is the source of truth — listing it over the wire would require a
+    // paired device identity (operator.read scope). When the WS probe is the
+    // default (i.e. no test injection) we enrich the result from disk.
+    if (result.ok && !result.agents && !opts.probe && isLoopbackUrl(profile.url)) {
+        const local = readLocalOpenclawAgents();
+        if (local && local.length > 0)
+            result.agents = local;
+    }
+    return result;
+}
+function isLoopbackUrl(raw) {
+    try {
+        const u = new URL(raw);
+        return u.hostname === "127.0.0.1" || u.hostname === "::1" || u.hostname === "localhost";
+    }
+    catch {
+        return false;
+    }
+}
+function readLocalOpenclawAgents() {
+    try {
+        const file = path.join(homedir(), ".openclaw", "openclaw.json");
+        if (!existsSync(file))
+            return null;
+        const cfg = JSON.parse(readFileSync(file, "utf8"));
+        const list = Array.isArray(cfg?.agents?.list) ? cfg.agents.list : [];
+        const defaultId = typeof cfg?.agents?.defaults?.id === "string" ? cfg.agents.defaults.id : "default";
+        const seen = new Set();
+        const out = [];
+        const push = (raw, fallbackId) => {
+            const id = typeof raw?.id === "string" && raw.id ? raw.id : fallbackId;
+            if (!id || seen.has(id))
+                return;
+            seen.add(id);
+            const row = { id };
+            if (typeof raw?.name === "string")
+                row.name = raw.name;
+            if (typeof raw?.workspace === "string")
+                row.workspace = raw.workspace;
+            const m = raw?.model;
+            if (m && typeof m === "object") {
+                const model = {};
+                if (typeof m.primary === "string")
+                    model.name = m.primary;
+                else if (typeof m.name === "string")
+                    model.name = m.name;
+                if (typeof m.provider === "string")
+                    model.provider = m.provider;
+                if (model.name || model.provider)
+                    row.model = model;
+            }
+            out.push(row);
+        };
+        // Default agent first so it surfaces at the top of the dropdown.
+        push({ id: defaultId, workspace: cfg?.agents?.defaults?.workspace, model: cfg?.agents?.defaults?.model }, defaultId);
+        for (const entry of list)
+            push(entry);
+        return out;
+    }
+    catch {
+        return null;
+    }
 }
 /**
  * Async variant that includes L2 (gateway reachability) and L3 (agent listing)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botcord/daemon",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "BotCord local daemon — bridges Hub inbox push to local Claude Code / Codex / Gemini CLIs",
   "type": "module",
   "bin": {

package/src/__tests__/openclaw-discovery.test.ts

@@ -62,6 +62,33 @@ describe("discoverLocalOpenclawGateways", () => {
     );
   });
 
+  it("parses OpenClaw's native gateway.port + auth.token shape", async () => {
+    const dir = tempDir();
+    writeFileSync(
+      path.join(dir, "openclaw.json"),
+      JSON.stringify({
+        gateway: {
+          port: 18789,
+          bind: "loopback",
+          auth: { mode: "token", token: "native-token" },
+        },
+      }),
+    );
+
+    const found = await discoverLocalOpenclawGateways({
+      searchPaths: [dir],
+      defaultPorts: [],
+    });
+
+    expect(found).toEqual([
+      expect.objectContaining({
+        url: "ws://127.0.0.1:18789",
+        token: "native-token",
+        source: "config-file",
+      }),
+    ]);
+  });
+
   it("uses OPENCLAW_ACP_URL and token env vars", async () => {
     const found = await discoverLocalOpenclawGateways({
       searchPaths: [],
@@ -124,6 +151,27 @@ describe("discoverLocalOpenclawGateways", () => {
 });
 
 describe("mergeOpenclawGateways", () => {
+  it("backfills token onto an existing profile that lacks one", () => {
+    const cfg = baseConfig();
+    cfg.openclawGateways = [
+      { name: "openclaw-127-0-0-1-18789", url: "ws://127.0.0.1:18789" },
+    ];
+    const merged = mergeOpenclawGateways(cfg, [
+      {
+        name: "openclaw-127-0-0-1-18789",
+        url: "ws://127.0.0.1:18789",
+        token: "discovered",
+        source: "config-file",
+      },
+    ]);
+
+    expect(merged.changed).toBe(true);
+    expect(merged.added).toEqual([]);
+    expect(merged.cfg.openclawGateways).toEqual([
+      { name: "openclaw-127-0-0-1-18789", url: "ws://127.0.0.1:18789", token: "discovered" },
+    ]);
+  });
+
   it("appends new URLs and keeps existing profiles untouched", () => {
     const cfg = baseConfig();
     cfg.openclawGateways = [{ name: "local", url: "ws://127.0.0.1:18789/acp", token: "user-token" }];

package/src/openclaw-discovery.ts

@@ -84,27 +84,46 @@ export function mergeOpenclawGateways(
   found: DiscoveredOpenclawGateway[],
 ): MergeOpenclawGatewayResult {
   const existing = cfg.openclawGateways ?? [];
-  const existingUrls = new Set(existing.map((g) => normalizeUrlKey(g.url)));
+  const byUrl = new Map<string, number>();
+  existing.forEach((g, i) => byUrl.set(normalizeUrlKey(g.url), i));
   const existingNames = new Set(existing.map((g) => g.name));
+  const merged = existing.map((g) => ({ ...g }));
   const added: OpenclawGatewayProfile[] = [];
+  let mutated = false;
 
   for (const item of found) {
     const key = normalizeUrlKey(item.url);
-    if (existingUrls.has(key)) continue;
+    const idx = byUrl.get(key);
+    if (idx !== undefined) {
+      // Same URL already configured — only fill in auth that the user is
+      // missing, never overwrite an existing token / tokenFile.
+      const cur = merged[idx];
+      if (!cur.token && !cur.tokenFile) {
+        if (item.token) {
+          cur.token = item.token;
+          mutated = true;
+        } else if (item.tokenFile) {
+          cur.tokenFile = item.tokenFile;
+          mutated = true;
+        }
+      }
+      continue;
+    }
     const profile: OpenclawGatewayProfile = {
       name: uniqueName(item.name, existingNames),
       url: item.url,
     };
     if (item.token) profile.token = item.token;
     else if (item.tokenFile) profile.tokenFile = item.tokenFile;
-    existingUrls.add(key);
+    byUrl.set(key, merged.length);
     existingNames.add(profile.name);
+    merged.push(profile);
     added.push(profile);
   }
 
-  if (added.length === 0) return { cfg, changed: false, added };
+  if (added.length === 0 && !mutated) return { cfg, changed: false, added };
   return {
-    cfg: { ...cfg, openclawGateways: [...existing, ...added] },
+    cfg: { ...cfg, openclawGateways: merged },
     changed: true,
     added,
   };
@@ -148,10 +167,34 @@ function discoverFromConfigDir(root: string): DiscoveredOpenclawGateway[] {
 
 function parseJsonConfig(raw: string): { url?: string; token?: string; tokenFile?: string } | null {
   const obj = JSON.parse(raw) as any;
+  // Prefer OpenClaw's native shape: `gateway.port` + `gateway.auth.token`.
+  // The legacy `acp.url` shape is also supported for explicit user-authored configs.
+  const native = pickOpenclawGatewayValues(obj?.gateway);
+  if (native) return native;
   const acp = obj?.acp ?? obj?.gateway?.acp ?? obj?.gateway ?? obj;
   return pickConfigValues(acp);
 }
 
+function pickOpenclawGatewayValues(
+  gw: any,
+): { url?: string; token?: string; tokenFile?: string } | null {
+  if (!gw || typeof gw !== "object") return null;
+  const port = typeof gw.port === "number" ? gw.port : undefined;
+  if (!port) return null;
+  // Local discovery always targets the loopback interface, regardless of how
+  // the gateway is bound — the daemon is on the same machine.
+  const url = `ws://127.0.0.1:${port}`;
+  const auth = gw.auth;
+  const out: { url: string; token?: string; tokenFile?: string } = { url };
+  if (auth && typeof auth === "object" && auth.mode === "token") {
+    if (typeof auth.token === "string" && auth.token.trim()) out.token = auth.token.trim();
+    else if (typeof auth.tokenFile === "string" && auth.tokenFile.trim()) {
+      out.tokenFile = auth.tokenFile.trim();
+    }
+  }
+  return out;
+}
+
 function parseTomlConfig(raw: string): { url?: string; token?: string; tokenFile?: string } | null {
   let inAcp = false;
   const values: Record<string, string> = {};

package/src/provision.ts

@@ -4,7 +4,7 @@
  * side effects (register agent, write credentials, load route, add/remove
  * gateway channel) and return an ack payload.
  */
-import { existsSync, rmSync, unlinkSync } from "node:fs";
+import { existsSync, readFileSync, rmSync, unlinkSync } from "node:fs";
 import { homedir } from "node:os";
 import path from "node:path";
 import {
@@ -957,16 +957,22 @@ export type WsEndpointProbeFn = (args: {
 }>;
 
 /**
- * Default L2 + L3 probe — opens a WS handshake against the OpenClaw gateway
- * and, when the connection is up, issues a JSON-RPC `agents.list` request to
- * enumerate configured agent profiles. Best-effort: a successful WS open with
- * a failed `agents.list` still reports `ok: true` (just without `agents`),
- * matching the RFC's "agents populated only when listing succeeded" rule.
+ * Default L2 + L3 probe — speaks OpenClaw's WS frame protocol against the
+ * gateway and enumerates agent profiles via `agents.list`.
  *
- * Method name and result shape follow OpenClaw:
- *   `~/claws/openclaw/src/gateway/server-methods/agents.ts:416` and
- *   `~/claws/openclaw/src/gateway/session-utils.ts:783` —
- *   `{ defaultId, mainKey, scope, agents: [{ id, name?, identity?, workspace, model? }] }`.
+ * Wire flow (see `~/claws/openclaw/src/gateway/server/ws-connection/message-handler.ts`
+ * and `~/claws/openclaw/src/gateway/protocol/schema/frames.ts`):
+ *   1. WS upgrade (no auth required at the HTTP layer).
+ *   2. Server emits `{type:"event", event:"connect.challenge", payload:{nonce}}`.
+ *   3. Client sends `{type:"req", id, method:"connect", params:{minProtocol, maxProtocol,
+ *      client:{id:"openclaw-probe", mode:"probe", ...}, auth:{token}}}`.
+ *   4. Server responds `{type:"res", id, ok:true, payload:{type:"hello-ok", server:{version}, ...}}`.
+ *   5. Client sends `{type:"req", id, method:"agents.list", params:{}}`.
+ *   6. Server responds with `{payload: { defaultId, mainKey, scope, agents:[{id, name?, workspace?, model?}] }}`.
+ *
+ * Best-effort: a successful WS open with a failed handshake / `agents.list`
+ * still reports `ok: true` (just without `agents`), matching the RFC's
+ * "agents populated only when listing succeeded" rule.
  */
 async function defaultWsProbe(args: {
   url: string;
@@ -1000,6 +1006,9 @@ async function defaultWsProbe(args: {
     let settled = false;
     let ws: any;
     let timer: ReturnType<typeof setTimeout> | undefined;
+    let serverVersion: string | undefined;
+    const CONNECT_ID = "probe-connect";
+    let connectSent = false;
     const settle = (v: ProbeResult): void => {
       if (settled) return;
       settled = true;
@@ -1013,6 +1022,8 @@ async function defaultWsProbe(args: {
     };
     try {
       const headers: Record<string, string> = {};
+      // Some deployments gate the WS upgrade on Authorization too; harmless
+      // when not enforced — auth is also re-asserted in the connect frame.
       if (args.token) headers["Authorization"] = `Bearer ${args.token}`;
       ws = new WebSocket(args.url, { headers });
     } catch (err) {
@@ -1020,58 +1031,75 @@ async function defaultWsProbe(args: {
       return;
     }
     timer = setTimeout(() => settle({ ok: false, error: "timeout" }), args.timeoutMs);
-    const requestId = "probe-agents-list";
-    ws.on("open", () => {
-      // L3: enumerate agent profiles. We don't fail the L2 result if this
-      // call fails — the gateway is reachable either way.
+
+    const sendConnect = (): void => {
+      if (connectSent) return;
+      connectSent = true;
+      const params: any = {
+        minProtocol: 3,
+        maxProtocol: 3,
+        client: {
+          id: "openclaw-probe",
+          version: "0.1.0",
+          platform: process.platform || "node",
+          mode: "probe",
+        },
+        role: "operator",
+        scopes: ["operator.read"],
+      };
+      if (args.token) params.auth = { token: args.token };
       try {
-        ws.send(
-          JSON.stringify({
-            jsonrpc: "2.0",
-            id: requestId,
-            method: "agents.list",
-            params: {},
-          }),
-        );
+        ws.send(JSON.stringify({ type: "req", id: CONNECT_ID, method: "connect", params }));
       } catch (err) {
-        settle({ ok: true, error: `agents.list send failed: ${(err as Error).message}` });
+        settle({ ok: true, error: `connect send failed: ${(err as Error).message}` });
       }
+    };
+
+    ws.on("open", () => {
+      // Some servers send `connect.challenge` before the socket is fully
+      // wired; if it never arrives we still try a best-effort connect after
+      // a short delay so the probe doesn't stall on legacy gateways.
+      setTimeout(() => {
+        if (!connectSent && !settled) sendConnect();
+      }, 250);
     });
     ws.on("message", (raw: Buffer | string) => {
+      let msg: any;
       try {
-        const msg = JSON.parse(typeof raw === "string" ? raw : raw.toString("utf8"));
-        if (msg?.id !== requestId) return; // ignore unrelated frames
-        if (msg.error) {
-          settle({ ok: true, error: String(msg.error?.message ?? "agents.list error") });
+        msg = JSON.parse(typeof raw === "string" ? raw : raw.toString("utf8"));
+      } catch {
+        return;
+      }
+      if (!msg || typeof msg !== "object") return;
+      if (msg.type === "event" && msg.event === "connect.challenge") {
+        // Nonce only matters for device-pairing flows; token-only auth ignores it.
+        sendConnect();
+        return;
+      }
+      if (msg.type !== "res" || typeof msg.id !== "string") return;
+      if (msg.id === CONNECT_ID) {
+        if (!msg.ok) {
+          const errMsg = msg.error?.message ? String(msg.error.message) : "connect rejected";
+          settle({ ok: true, error: errMsg });
           return;
         }
-        const list = Array.isArray(msg.result?.agents) ? msg.result.agents : [];
-        const agents: AgentRow[] = [];
-        for (const a of list) {
-          if (!a || typeof a.id !== "string" || a.id.length === 0) continue;
-          const row: AgentRow = { id: a.id };
-          if (typeof a.name === "string") row.name = a.name;
-          if (typeof a.workspace === "string") row.workspace = a.workspace;
-          if (a.model && typeof a.model === "object") {
-            const model: { name?: string; provider?: string } = {};
-            if (typeof a.model.name === "string") model.name = a.model.name;
-            if (typeof a.model.provider === "string") model.provider = a.model.provider;
-            if (model.name || model.provider) row.model = model;
-          }
-          agents.push(row);
-        }
-        settle({ ok: true, agents });
-      } catch (err) {
-        settle({ ok: true, error: `agents.list parse failed: ${(err as Error).message}` });
+        const v = msg.payload?.server?.version;
+        if (typeof v === "string" && v) serverVersion = v;
+        // We don't fetch agents.list over the wire: it requires `operator.read`
+        // which the gateway only grants to clients that present a paired device
+        // identity (see message-handler.ts:478 — self-declared scopes are
+        // cleared without device pairing). For local OpenClaw the agent list
+        // is sourced directly from disk by `probeOpenclawAgents`.
+        settle({ ok: true, version: serverVersion });
       }
     });
     ws.on("error", (err: Error) => {
       settle({ ok: false, error: err.message });
     });
     ws.on("close", () => {
-      // If the socket closes before `agents.list` resolved we still treat
-      // L2 as ok (open fired) and emit no agents.
-      settle({ ok: true });
+      // If the socket closes before we got our agents.list response, treat
+      // L2 as ok (the upgrade succeeded) and emit no agents.
+      settle({ ok: true, version: serverVersion });
     });
   });
 }
@@ -1097,11 +1125,69 @@ export async function probeOpenclawAgents(
     ...(profile.token ? { token: profile.token } : {}),
     ...(profile.tokenFile ? { tokenFile: profile.tokenFile } : {}),
   });
-  return probe({
+  const result = await probe({
     url: profile.url,
     token: prepared.resolvedToken,
     timeoutMs: opts.timeoutMs ?? 3000,
   });
+  // For loopback gateways the agent roster lives in `~/.openclaw/openclaw.json`
+  // and is the source of truth — listing it over the wire would require a
+  // paired device identity (operator.read scope). When the WS probe is the
+  // default (i.e. no test injection) we enrich the result from disk.
+  if (result.ok && !result.agents && !opts.probe && isLoopbackUrl(profile.url)) {
+    const local = readLocalOpenclawAgents();
+    if (local && local.length > 0) result.agents = local;
+  }
+  return result;
+}
+
+function isLoopbackUrl(raw: string): boolean {
+  try {
+    const u = new URL(raw);
+    return u.hostname === "127.0.0.1" || u.hostname === "::1" || u.hostname === "localhost";
+  } catch {
+    return false;
+  }
+}
+
+function readLocalOpenclawAgents(): Array<{
+  id: string;
+  name?: string;
+  workspace?: string;
+  model?: { name?: string; provider?: string };
+}> | null {
+  try {
+    const file = path.join(homedir(), ".openclaw", "openclaw.json");
+    if (!existsSync(file)) return null;
+    const cfg = JSON.parse(readFileSync(file, "utf8")) as any;
+    const list = Array.isArray(cfg?.agents?.list) ? cfg.agents.list : [];
+    const defaultId = typeof cfg?.agents?.defaults?.id === "string" ? cfg.agents.defaults.id : "default";
+    const seen = new Set<string>();
+    const out: Array<{ id: string; name?: string; workspace?: string; model?: { name?: string; provider?: string } }> = [];
+    const push = (raw: any, fallbackId?: string): void => {
+      const id = typeof raw?.id === "string" && raw.id ? raw.id : fallbackId;
+      if (!id || seen.has(id)) return;
+      seen.add(id);
+      const row: { id: string; name?: string; workspace?: string; model?: { name?: string; provider?: string } } = { id };
+      if (typeof raw?.name === "string") row.name = raw.name;
+      if (typeof raw?.workspace === "string") row.workspace = raw.workspace;
+      const m = raw?.model;
+      if (m && typeof m === "object") {
+        const model: { name?: string; provider?: string } = {};
+        if (typeof m.primary === "string") model.name = m.primary;
+        else if (typeof m.name === "string") model.name = m.name;
+        if (typeof m.provider === "string") model.provider = m.provider;
+        if (model.name || model.provider) row.model = model;
+      }
+      out.push(row);
+    };
+    // Default agent first so it surfaces at the top of the dropdown.
+    push({ id: defaultId, workspace: cfg?.agents?.defaults?.workspace, model: cfg?.agents?.defaults?.model }, defaultId);
+    for (const entry of list) push(entry);
+    return out;
+  } catch {
+    return null;
+  }
 }
 
 /**