clawconnect-agent 0.2.4 → 0.2.5

package/README.md

@@ -422,7 +422,7 @@ Tests are colocated with the source as `*.test.ts`. They run with `npm test`, an
 ## Requirements
 
 - macOS, Linux, or Windows 10 / Server 2016+
-- Node.js 18+
+- Node.js 22.19+
 
 ## License
 

package/README.zh-CN.md

@@ -477,7 +477,7 @@ clawconnect-agent/
 ## 前置要求
 
 - macOS、Linux 或 Windows 10 / Server 2016+
-- Node.js `18+`
+- Node.js `22.19+`
 - 本机已安装并可运行 `openclaw`
 - 本机 OpenClaw Gateway 能正常启动
 

package/dist/openclaw/gateway-client.d.ts

@@ -1,3 +1,4 @@
+import { type GatewayClientMode, type GatewayClientName } from "@openclaw/gateway-protocol/client-info";
 export declare function gatewayWebSocketOrigin(url: string): string;
 export interface GatewayClientOptions {
     url: string | (() => string);
@@ -6,27 +7,30 @@ export interface GatewayClientOptions {
     role?: string;
     scopes?: string[];
     caps?: string[];
-    clientMode?: string;
-    clientId?: string;
+    clientMode?: GatewayClientMode;
+    clientId?: GatewayClientName;
     clientDisplayName?: string;
     clientVersion?: string;
     onConnected: () => void;
     onEvent: (eventName: string, payload: unknown) => void;
     onDisconnected: (reason: string) => void;
 }
+/**
+ * ClawConnect's compatibility wrapper around OpenClaw's reference v4 client.
+ *
+ * ClawConnect is a WebChat bridge, not the bundled Control UI. Advertising the
+ * WebChat identity preserves chat routing while avoiding Control UI build-ID
+ * checks that third-party clients cannot satisfy.
+ */
 export declare class OpenClawGatewayClient {
     private readonly opts;
-    private ws;
-    private pending;
-    private backoffMs;
+    private client;
+    private activeUrl;
     private stopped;
-    private connectNonce;
-    private connectSent;
-    private storedDeviceToken;
-    private connectTimer;
-    private tickTimer;
-    private lastTick;
-    private tickIntervalMs;
+    private reconnectTimer;
+    private storedDeviceAuth;
+    private responseHookRequests;
+    private bufferedEvents;
     private readonly identity;
     constructor(opts: GatewayClientOptions);
     start(): void;
@@ -36,10 +40,6 @@ export declare class OpenClawGatewayClient {
         onResponse?: (value: T) => void;
     }): Promise<T>;
     private resolveUrl;
-    private sendConnect;
-    private handleMessage;
-    private startTickWatch;
-    private scheduleReconnect;
-    private teardown;
-    private flushPending;
+    private recreateForChangedUrl;
+    private flushBufferedEvents;
 }

package/dist/openclaw/gateway-client.js

@@ -1,22 +1,31 @@
-import { WebSocket } from "ws";
-import { randomUUID, generateKeyPairSync, createPrivateKey, sign, createPublicKey, createHash } from "node:crypto";
-import { readFileSync, writeFileSync, existsSync, mkdirSync } from "node:fs";
-import { join } from "node:path";
+import { GatewayClient, } from "@openclaw/gateway-client";
+import { GATEWAY_CLIENT_MODES, GATEWAY_CLIENT_NAMES, } from "@openclaw/gateway-protocol/client-info";
+import { PROTOCOL_VERSION } from "@openclaw/gateway-protocol/version";
+import { createHash, createPrivateKey, createPublicKey, generateKeyPairSync, sign, } from "node:crypto";
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
+import { join } from "node:path";
 import { setRestrictiveDirPermissions, setRestrictiveFilePermissions, } from "../platform/service-manager-common.js";
-// ---------------------------------------------------------------------------
-// Device identity (Ed25519, persisted across restarts)
-// ---------------------------------------------------------------------------
+import { CLAWCONNECT_AGENT_VERSION } from "../runtime-metadata.js";
 const IDENTITY_PATH = join(homedir(), ".clawconnect", "device-identity.json");
 const ED25519_SPKI_PREFIX = Buffer.from("302a300506032b6570032100", "hex");
+const DEFAULT_CLIENT_ID = GATEWAY_CLIENT_NAMES.WEBCHAT_UI;
+const DEFAULT_CLIENT_MODE = GATEWAY_CLIENT_MODES.WEBCHAT;
+const DEFAULT_SCOPES = [
+    "operator.admin",
+    "operator.read",
+    "operator.write",
+    "operator.approvals",
+    "operator.pairing",
+];
 function base64UrlEncode(buf) {
-    return buf.toString("base64").replaceAll("+", "-").replaceAll("/", "_").replace(/=+$/g, "");
+    return buf.toString("base64url");
 }
 function rawPublicKeyBytes(publicKeyPem) {
     const key = createPublicKey(publicKeyPem);
     const spki = key.export({ type: "spki", format: "der" });
-    if (spki.length === ED25519_SPKI_PREFIX.length + 32 &&
-        spki.subarray(0, ED25519_SPKI_PREFIX.length).equals(ED25519_SPKI_PREFIX)) {
+    if (spki.length === ED25519_SPKI_PREFIX.length + 32
+        && spki.subarray(0, ED25519_SPKI_PREFIX.length).equals(ED25519_SPKI_PREFIX)) {
         return spki.subarray(ED25519_SPKI_PREFIX.length);
     }
     return spki;
@@ -26,10 +35,12 @@ function loadOrCreateDeviceIdentity() {
         try {
             const stored = JSON.parse(readFileSync(IDENTITY_PATH, "utf8"));
             if (stored.deviceId && stored.publicKeyPem && stored.privateKeyPem) {
-                return { deviceId: stored.deviceId, publicKeyPem: stored.publicKeyPem, privateKeyPem: stored.privateKeyPem };
+                return stored;
             }
         }
-        catch { /* fall through */ }
+        catch {
+            // Generate a replacement below when the persisted identity is unreadable.
+        }
     }
     const { publicKey, privateKey } = generateKeyPairSync("ed25519");
     const publicKeyPem = publicKey.export({ type: "spki", format: "pem" }).toString();
@@ -38,38 +49,11 @@ function loadOrCreateDeviceIdentity() {
     const identity = { deviceId, publicKeyPem, privateKeyPem };
     const clawconnectDir = join(homedir(), ".clawconnect");
     mkdirSync(clawconnectDir, { recursive: true });
-    writeFileSync(IDENTITY_PATH, JSON.stringify({ version: 1, ...identity, createdAtMs: Date.now() }, null, 2) + "\n", "utf8");
+    writeFileSync(IDENTITY_PATH, `${JSON.stringify({ version: 1, ...identity, createdAtMs: Date.now() }, null, 2)}\n`, "utf8");
     setRestrictiveDirPermissions(clawconnectDir);
     setRestrictiveFilePermissions(IDENTITY_PATH);
     return identity;
 }
-function buildSignedDevice(identity, opts) {
-    const version = opts.nonce ? "v2" : "v1";
-    const payload = [
-        version,
-        identity.deviceId,
-        opts.clientId,
-        opts.clientMode,
-        opts.role,
-        opts.scopes.join(","),
-        String(opts.signedAtMs),
-        opts.token ?? "",
-        ...(version === "v2" ? [opts.nonce ?? ""] : []),
-    ].join("|");
-    const key = createPrivateKey(identity.privateKeyPem);
-    const signature = base64UrlEncode(sign(null, Buffer.from(payload, "utf8"), key));
-    return {
-        id: identity.deviceId,
-        publicKey: base64UrlEncode(rawPublicKeyBytes(identity.publicKeyPem)),
-        signature,
-        signedAt: opts.signedAtMs,
-        nonce: opts.nonce,
-    };
-}
-const MIN_PROTOCOL_VERSION = 3;
-const MAX_PROTOCOL_VERSION = 4;
-const DEFAULT_CLIENT_ID = "openclaw-control-ui";
-const DEFAULT_CLIENT_MODE = "webchat";
 export function gatewayWebSocketOrigin(url) {
     const parsed = new URL(url);
     if (parsed.protocol === "ws:")
@@ -83,250 +67,140 @@ export function gatewayWebSocketOrigin(url) {
     parsed.hash = "";
     return parsed.origin;
 }
+/**
+ * ClawConnect's compatibility wrapper around OpenClaw's reference v4 client.
+ *
+ * ClawConnect is a WebChat bridge, not the bundled Control UI. Advertising the
+ * WebChat identity preserves chat routing while avoiding Control UI build-ID
+ * checks that third-party clients cannot satisfy.
+ */
 export class OpenClawGatewayClient {
     opts;
-    ws = null;
-    pending = new Map();
-    backoffMs = 1000;
+    client = null;
+    activeUrl = null;
     stopped = false;
-    connectNonce = null;
-    connectSent = false;
-    storedDeviceToken = null;
-    connectTimer = null;
-    tickTimer = null;
-    lastTick = 0;
-    tickIntervalMs = 30_000;
-    identity;
+    reconnectTimer = null;
+    storedDeviceAuth = null;
+    responseHookRequests = 0;
+    bufferedEvents = [];
+    identity = loadOrCreateDeviceIdentity();
     constructor(opts) {
         this.opts = opts;
-        this.identity = loadOrCreateDeviceIdentity();
     }
     start() {
-        if (this.stopped)
+        if (this.stopped || this.client)
             return;
         const url = this.resolveUrl();
-        const clientId = this.opts.clientId ?? DEFAULT_CLIENT_ID;
-        this.ws = new WebSocket(url, {
-            maxPayload: 25 * 1024 * 1024,
-            // OpenClaw 会校验 Control UI 的 Gateway 来源；必须从 ws(s) 地址确定性派生，
-            // 不能通过放宽 gateway.controlUi.allowedOrigins 绕过安全边界。
-            ...(clientId === DEFAULT_CLIENT_ID ? { origin: gatewayWebSocketOrigin(url) } : {}),
-        });
-        this.ws.on("open", () => {
-            this.connectNonce = null;
-            this.connectSent = false;
-            // Fallback: send connect after 1 s if challenge hasn't arrived
-            this.connectTimer = setTimeout(() => this.sendConnect(), 1000);
-        });
-        this.ws.on("message", (data) => {
-            const raw = typeof data === "string" ? data : data.toString();
-            this.handleMessage(raw);
-        });
-        this.ws.on("close", (code, reason) => {
-            const reasonText = reason.toString() || `code ${code}`;
-            this.teardown();
-            this.flushPending(new Error(`gateway disconnected: ${reasonText}`));
-            this.opts.onDisconnected(reasonText);
-            this.scheduleReconnect();
-        });
-        this.ws.on("error", (err) => {
-            console.error(`[gateway-client] ws error: ${String(err)}`);
+        this.activeUrl = url;
+        const client = new GatewayClient({
+            url,
+            origin: gatewayWebSocketOrigin(url),
+            token: this.opts.token,
+            password: this.opts.password,
+            role: this.opts.role ?? "operator",
+            scopes: this.opts.scopes ?? DEFAULT_SCOPES,
+            caps: this.opts.caps ?? ["tool-events"],
+            clientName: this.opts.clientId ?? DEFAULT_CLIENT_ID,
+            clientDisplayName: this.opts.clientDisplayName ?? "ClawConnect Agent",
+            clientVersion: this.opts.clientVersion ?? CLAWCONNECT_AGENT_VERSION,
+            platform: process.platform,
+            mode: this.opts.clientMode ?? DEFAULT_CLIENT_MODE,
+            minProtocol: PROTOCOL_VERSION,
+            maxProtocol: PROTOCOL_VERSION,
+            deviceIdentity: this.identity,
+            hostDeps: {
+                signDevicePayload: (privateKeyPem, payload) => base64UrlEncode(sign(null, Buffer.from(payload, "utf8"), createPrivateKey(privateKeyPem))),
+                publicKeyRawBase64UrlFromPem: (publicKeyPem) => base64UrlEncode(rawPublicKeyBytes(publicKeyPem)),
+                loadDeviceAuthToken: () => this.storedDeviceAuth,
+                storeDeviceAuthToken: ({ token, scopes }) => {
+                    this.storedDeviceAuth = { token, scopes };
+                },
+                clearDeviceAuthToken: () => {
+                    this.storedDeviceAuth = null;
+                },
+                logDebug: (message) => console.debug(`[gateway-client] ${message}`),
+                logError: (message) => console.error(`[gateway-client] ${message}`),
+            },
+            onHelloOk: () => this.opts.onConnected(),
+            onConnectError: (error) => {
+                console.error(`[gateway-client] connect failed: ${String(error)}`);
+            },
+            onEvent: (event) => {
+                if (event.event === "tick")
+                    return;
+                const bufferedEvent = { event: event.event, payload: event.payload ?? null };
+                if (this.responseHookRequests > 0) {
+                    this.bufferedEvents.push(bufferedEvent);
+                    return;
+                }
+                this.opts.onEvent(bufferedEvent.event, bufferedEvent.payload);
+            },
+            onClose: (code, reason) => {
+                const reasonText = reason || `code ${code}`;
+                this.opts.onDisconnected(reasonText);
+                this.recreateForChangedUrl(client);
+            },
         });
+        this.client = client;
+        client.start();
     }
     stop() {
         this.stopped = true;
-        this.teardown();
-        this.ws?.close();
-        this.ws = null;
-        this.flushPending(new Error("gateway client stopped"));
+        if (this.reconnectTimer) {
+            clearTimeout(this.reconnectTimer);
+            this.reconnectTimer = null;
+        }
+        this.client?.stop();
+        this.client = null;
+        this.activeUrl = null;
     }
     send(method, params) {
-        if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
-            throw new Error("gateway not connected");
-        }
-        const frame = { type: "req", id: randomUUID(), method, params };
-        this.ws.send(JSON.stringify(frame));
+        void this.request(method, params).catch((error) => {
+            console.error(`[gateway-client] ${method} failed: ${String(error)}`);
+        });
     }
     async request(method, params, options) {
-        if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
+        if (!this.client)
             throw new Error("gateway not connected");
-        }
-        const id = randomUUID();
-        const frame = { type: "req", id, method, params };
-        const p = new Promise((resolve, reject) => {
-            this.pending.set(id, {
-                resolve: (v) => resolve(v),
-                reject,
-                ...(options?.onResponse ? { onResponse: (value) => options.onResponse?.(value) } : {}),
-            });
-        });
-        this.ws.send(JSON.stringify(frame));
-        return p;
-    }
-    // -------------------------------------------------------------------------
-    resolveUrl() {
-        return typeof this.opts.url === "function" ? this.opts.url() : this.opts.url;
-    }
-    sendConnect() {
-        if (this.connectSent)
-            return;
-        this.connectSent = true;
-        if (this.connectTimer) {
-            clearTimeout(this.connectTimer);
-            this.connectTimer = null;
-        }
-        const role = this.opts.role ?? "operator";
-        const scopes = this.opts.scopes ?? [
-            "operator.admin",
-            "operator.read",
-            "operator.write",
-            "operator.approvals",
-            "operator.pairing",
-        ];
-        // chat.send 属于操作界面行为。其他 client id 会被 OpenClaw 当作外部发送者，
-        // 并给模型提示词添加 Sender 不可信信封，使普通 ClawConnect 消息被误判为注入。
-        const clientId = this.opts.clientId ?? DEFAULT_CLIENT_ID;
-        const clientMode = this.opts.clientMode ?? DEFAULT_CLIENT_MODE;
-        const caps = this.opts.caps ?? ["tool-events"];
-        const signedAtMs = Date.now();
-        const nonce = this.connectNonce ?? undefined;
-        const authToken = this.storedDeviceToken ?? this.opts.token;
-        const device = buildSignedDevice(this.identity, {
-            clientId, clientMode, role, scopes, signedAtMs,
-            token: authToken ?? undefined,
-            nonce,
-        });
-        const params = {
-            minProtocol: MIN_PROTOCOL_VERSION,
-            maxProtocol: MAX_PROTOCOL_VERSION,
-            role,
-            scopes,
-            caps,
-            client: {
-                id: clientId,
-                displayName: this.opts.clientDisplayName ?? "ClawConnect Agent",
-                version: this.opts.clientVersion ?? "1.0.0",
-                platform: process.platform,
-                mode: clientMode,
-            },
-            device,
-            auth: authToken || this.opts.password
-                ? { token: authToken, password: this.opts.password }
-                : undefined,
-        };
-        this.request("connect", params)
-            .then((helloOk) => {
-            const deviceToken = helloOk?.auth?.deviceToken;
-            if (typeof deviceToken === "string") {
-                this.storedDeviceToken = deviceToken;
-            }
-            if (typeof helloOk?.policy?.tickIntervalMs === "number") {
-                this.tickIntervalMs = helloOk.policy.tickIntervalMs;
-            }
-            this.backoffMs = 1000;
-            this.lastTick = Date.now();
-            this.startTickWatch();
-            this.opts.onConnected();
-        })
-            .catch((err) => {
-            console.error(`[gateway-client] connect failed: ${String(err)}`);
-            // Clear stale device token so the next reconnect uses the base token from config
-            this.storedDeviceToken = null;
-            this.ws?.close(1008, "connect failed");
-        });
-    }
-    handleMessage(raw) {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        let parsed;
+        const hasResponseHook = Boolean(options?.onResponse);
+        if (hasResponseHook)
+            this.responseHookRequests += 1;
         try {
-            parsed = JSON.parse(raw);
-        }
-        catch {
-            return;
+            const value = await this.client.request(method, params);
+            options?.onResponse?.(value);
+            return value;
         }
-        if (typeof parsed?.type !== "string")
-            return;
-        if (parsed.type === "event") {
-            const evt = parsed;
-            if (evt.event === "connect.challenge") {
-                const nonce = evt.payload?.nonce;
-                if (typeof nonce === "string") {
-                    this.connectNonce = nonce;
-                    this.sendConnect();
-                }
-                return;
-            }
-            if (evt.event === "tick") {
-                this.lastTick = Date.now();
-                return;
+        finally {
+            if (hasResponseHook) {
+                this.responseHookRequests -= 1;
+                if (this.responseHookRequests === 0)
+                    this.flushBufferedEvents();
             }
-            this.opts.onEvent(evt.event, evt.payload ?? null);
-            return;
-        }
-        if (parsed.type === "res") {
-            const res = parsed;
-            const pending = this.pending.get(res.id);
-            if (!pending)
-                return;
-            this.pending.delete(res.id);
-            if (res.ok) {
-                try {
-                    // response hook 必须先于 Promise continuation；Gateway 可能紧接 response 帧发送首个事件。
-                    pending.onResponse?.(res.payload);
-                    pending.resolve(res.payload);
-                }
-                catch (error) {
-                    pending.reject(error);
-                }
-            }
-            else
-                pending.reject(new Error(res.error?.message ?? "gateway error"));
-            return;
-        }
-        // Handle incoming req frames from OpenClaw. Ack immediately so the
-        // gateway doesn't retry control-plane requests at this relay client.
-        if (parsed.type === "req") {
-            const id = parsed.id;
-            // Ack immediately so OpenClaw doesn't retry
-            if (id && this.ws?.readyState === WebSocket.OPEN) {
-                this.ws.send(JSON.stringify({ type: "res", id, ok: true }));
-            }
-            return;
         }
     }
-    startTickWatch() {
-        if (this.tickTimer)
-            clearInterval(this.tickTimer);
-        const interval = Math.max(this.tickIntervalMs, 1000);
-        this.tickTimer = setInterval(() => {
-            if (this.stopped || !this.lastTick)
-                return;
-            if (Date.now() - this.lastTick > this.tickIntervalMs * 2) {
-                this.ws?.close(4000, "tick timeout");
-            }
-        }, interval);
+    resolveUrl() {
+        return typeof this.opts.url === "function" ? this.opts.url() : this.opts.url;
     }
-    scheduleReconnect() {
-        if (this.stopped)
+    recreateForChangedUrl(closedClient) {
+        if (this.stopped || this.client !== closedClient)
             return;
-        const delay = this.backoffMs;
-        this.backoffMs = Math.min(this.backoffMs * 2, 30_000);
-        setTimeout(() => this.start(), delay).unref();
-    }
-    teardown() {
-        if (this.connectTimer) {
-            clearTimeout(this.connectTimer);
-            this.connectTimer = null;
-        }
-        if (this.tickTimer) {
-            clearInterval(this.tickTimer);
-            this.tickTimer = null;
-        }
+        const nextUrl = this.resolveUrl();
+        if (nextUrl === this.activeUrl)
+            return;
+        closedClient.stop();
+        this.client = null;
+        this.activeUrl = null;
+        this.reconnectTimer = setTimeout(() => {
+            this.reconnectTimer = null;
+            this.start();
+        }, 0);
+        this.reconnectTimer.unref?.();
     }
-    flushPending(err) {
-        for (const p of this.pending.values())
-            p.reject(err);
-        this.pending.clear();
+    flushBufferedEvents() {
+        const events = this.bufferedEvents;
+        this.bufferedEvents = [];
+        for (const event of events)
+            this.opts.onEvent(event.event, event.payload);
     }
 }
 //# sourceMappingURL=gateway-client.js.map

package/dist/openclaw/gateway-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"gateway-client.js","sourceRoot":"","sources":["../../src/openclaw/gateway-client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gateway-client.js","sourceRoot":"","sources":["../../src/openclaw/gateway-client.ts"],"names":[],"mappings":"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"}

package/dist/openclaw/relay/chat-history.d.ts

@@ -55,6 +55,17 @@ export type TranscriptHistoryRequest = {
 export declare function clearTranscriptHistoryCache(): void;
 export declare function readOpenClawTranscriptChatHistory(rawParams: unknown, defaults: GatewaySessionDefaults): Promise<HistoryResponse | null>;
 export declare function readChatHistoryFromTranscriptFile(request: TranscriptHistoryRequest): Promise<HistoryResponse>;
+/**
+ * OpenClaw v4 may serve chat.history from its state database even when the
+ * legacy transcript file is unavailable. The v4 response deliberately keeps
+ * canonical identity under __openclaw, so Relay cannot consume its raw
+ * messages as a timeline snapshot. Project those protocol fields here instead
+ * of asking downstream clients to infer missing user turns from assistant text.
+ */
+export declare function canonicalizeOpenClawGatewayHistoryResponse(history: HistoryResponse, request: {
+    sessionKey: string;
+    cursor?: string;
+}): HistoryResponse;
 /**
  * OpenClaw 会把内部心跳探测写入 transcript。只有精确的保留提示最终得到纯确认回执时，
  * 才隐藏整段内部记录；若心跳产生真实告警，则保留完整内容供用户查看。