@okxweb3/a2a-node 0.0.11 → 0.0.12

package/dist/cli.js

@@ -7071,10 +7071,30 @@ async function ensureClient(timeoutMs) {
     clearClient();
   }
   const config = resolveOpenClawGatewayConfig();
-  const client = new MinimalGatewayClient(config);
+  const startedAt = Date.now();
+  const firstProtocol = preferredGatewayProtocolVersion;
+  const client = new MinimalGatewayClient(config, firstProtocol);
   sharedClient = client;
-  await client.connect(timeoutMs);
-  return client;
+  try {
+    await client.connect(timeoutMs);
+    return client;
+  } catch (err2) {
+    if (!isOpenClawProtocolMismatch(err2)) {
+      throw err2;
+    }
+    clearClient();
+    const elapsedMs = Date.now() - startedAt;
+    const remainingMs = Math.max(1, timeoutMs - elapsedMs);
+    const fallbackProtocol = firstProtocol === PREFERRED_PROTOCOL_VERSION ? LEGACY_PROTOCOL_VERSION : PREFERRED_PROTOCOL_VERSION;
+    console.error(
+      `${LOG_PREFIX} protocol fallback from=${firstProtocol} to=${fallbackProtocol} remainingMs=${remainingMs}: ${formatErrorMessage(err2)}`
+    );
+    const fallbackClient = new MinimalGatewayClient(config, fallbackProtocol);
+    sharedClient = fallbackClient;
+    await fallbackClient.connect(remainingMs);
+    preferredGatewayProtocolVersion = fallbackProtocol;
+    return fallbackClient;
+  }
 }
 function stopOpenClawGateway() {
   if (!sharedClient) {
@@ -7198,14 +7218,14 @@ function readSyncedGatewayConfig(env) {
     return null;
   }
 }
-function buildConnectParams(config, instanceId) {
+function buildConnectParams(config, instanceId, protocolVersion) {
   return {
-    minProtocol: PROTOCOL_VERSION,
-    maxProtocol: PROTOCOL_VERSION,
+    minProtocol: protocolVersion,
+    maxProtocol: protocolVersion,
     client: {
       id: "gateway-client",
       displayName: "okx-a2a-node",
-      version: "0.0.11",
+      version: "0.0.12",
       platform: "node",
       mode: "backend",
       instanceId
@@ -7216,7 +7236,7 @@ function buildConnectParams(config, instanceId) {
     commands: [],
     permissions: {},
     locale: Intl.DateTimeFormat().resolvedOptions().locale || "en-US",
-    userAgent: `okx-a2a-node/${"0.0.11"}`,
+    userAgent: `okx-a2a-node/${"0.0.12"}`,
     auth: {
       ...config.token ? { token: config.token } : {},
       ...config.password ? { password: config.password } : {}
@@ -7235,17 +7255,54 @@ function toGatewayError(error) {
   });
   return err2;
 }
+function toGatewayCloseError(code2, reason) {
+  const closeCode = code2 ?? 0;
+  const closeReason = reason || "";
+  if (closeCode === 1002 && /protocol mismatch/i.test(closeReason)) {
+    return Object.assign(new Error(`OpenClaw gateway protocol mismatch code=${closeCode} reason=${closeReason}`), {
+      code: "PROTOCOL_MISMATCH",
+      gatewayCode: "PROTOCOL_MISMATCH",
+      retryable: false,
+      details: {
+        closeCode,
+        reason: closeReason
+      }
+    });
+  }
+  return Object.assign(new Error(`OpenClaw gateway connection closed code=${closeCode}`), {
+    code: "ECONNRESET",
+    retryable: true,
+    details: {
+      closeCode,
+      reason: closeReason
+    }
+  });
+}
 function normalizeSocketError(event) {
   const message = event instanceof Error ? event.message : typeof event === "object" && event !== null && "message" in event ? String(event.message) : "OpenClaw gateway websocket error";
   return Object.assign(new Error(message), { code: "ECONNRESET", retryable: true });
 }
+function isOpenClawProtocolMismatch(err2) {
+  const e = err2;
+  const code2 = String(e?.gatewayCode ?? e?.code ?? e?.details?.code ?? "");
+  if (code2 === "PROTOCOL_MISMATCH") {
+    return true;
+  }
+  const reason = String(e?.details?.reason ?? "");
+  const message = String(e?.message ?? "");
+  const expectedProtocol = Number(e?.details?.expectedProtocol);
+  return /protocol mismatch/i.test(reason) || /protocol mismatch/i.test(message) || expectedProtocol === PREFERRED_PROTOCOL_VERSION || expectedProtocol === LEGACY_PROTOCOL_VERSION;
+}
+function formatErrorMessage(err2) {
+  return err2 instanceof Error ? err2.message : String(err2);
+}
 function isSessionNotFound(err2) {
   const e = err2;
   const code2 = e?.gatewayCode ?? e?.code;
   const msg = String(e?.message ?? "");
   return (code2 === "INVALID_REQUEST" || code2 === "SESSION_NOT_FOUND") && msg.includes("session not found");
 }
-var import_node_crypto3, DEFAULT_GATEWAY_PORT, DEFAULT_TIMEOUT_MS, PROTOCOL_VERSION, DEFAULT_SCOPES, LOG_PREFIX, GATEWAY_STARTING_RETRY_DELAYS_MS, wsFactory, sharedClient, MinimalGatewayClient;
+var import_node_crypto3, DEFAULT_GATEWAY_PORT, DEFAULT_TIMEOUT_MS, PREFERRED_PROTOCOL_VERSION, LEGACY_PROTOCOL_VERSION, DEFAULT_SCOPES, LOG_PREFIX, GATEWAY_STARTING_RETRY_DELAYS_MS, wsFactory, preferredGatewayProtocolVersion, sharedClient, MinimalGatewayClient;
 var init_openclaw_gateway = __esm({
   "src/openclaw-gateway.ts"() {
     "use strict";
@@ -7253,29 +7310,33 @@ var init_openclaw_gateway = __esm({
     init_openclaw_gateway_config();
     DEFAULT_GATEWAY_PORT = 18789;
     DEFAULT_TIMEOUT_MS = 2e4;
-    PROTOCOL_VERSION = 4;
+    PREFERRED_PROTOCOL_VERSION = 4;
+    LEGACY_PROTOCOL_VERSION = 3;
     DEFAULT_SCOPES = ["operator.admin"];
     LOG_PREFIX = "[okx-a2a:gateway]";
     GATEWAY_STARTING_RETRY_DELAYS_MS = [300, 700, 1200, 2e3, 3e3];
     wsFactory = createDefaultWebSocket;
+    preferredGatewayProtocolVersion = PREFERRED_PROTOCOL_VERSION;
     sharedClient = null;
     MinimalGatewayClient = class {
       config;
+      protocolVersion;
       instanceId = (0, import_node_crypto3.randomUUID)();
       pending = /* @__PURE__ */ new Map();
       ws = null;
       ready = false;
       closed = false;
       requestSeq = 0;
-      constructor(config) {
+      constructor(config, protocolVersion) {
         this.config = config;
+        this.protocolVersion = protocolVersion;
       }
       isReady() {
         return this.ready && !this.closed && this.ws?.readyState === 1;
       }
       async connect(timeoutMs) {
         console.error(
-          `${LOG_PREFIX} connect url=${this.config.url} source=${this.config.source} instanceId=${this.instanceId} passwordConfigured=${!!this.config.password} tokenConfigured=${!!this.config.token} scopes=${DEFAULT_SCOPES.join(",")}`
+          `${LOG_PREFIX} connect url=${this.config.url} source=${this.config.source} instanceId=${this.instanceId} protocol=${this.protocolVersion} passwordConfigured=${!!this.config.password} tokenConfigured=${!!this.config.token} scopes=${DEFAULT_SCOPES.join(",")}`
         );
         const ws = wsFactory(this.config.url);
         this.ws = ws;
@@ -7327,14 +7388,11 @@ var init_openclaw_gateway = __esm({
             if (!settled) {
               settled = true;
               clearTimeout(timer);
-              reject(Object.assign(new Error(`OpenClaw gateway connection closed code=${closeEvent.code ?? 0}`), {
-                code: "ECONNRESET",
-                retryable: true
-              }));
+              reject(toGatewayCloseError(closeEvent.code, closeEvent.reason));
             }
           });
         });
-        console.error(`${LOG_PREFIX} hello ok instanceId=${this.instanceId}`);
+        console.error(`${LOG_PREFIX} hello ok instanceId=${this.instanceId} protocol=${this.protocolVersion}`);
       }
       request(method, params, options = {}) {
         if (method === "connect") {
@@ -7393,7 +7451,11 @@ var init_openclaw_gateway = __esm({
         this.ws = null;
       }
       async handleOpen(timeoutMs) {
-        const hello = await this.request("connect", buildConnectParams(this.config, this.instanceId), { timeoutMs });
+        const hello = await this.request(
+          "connect",
+          buildConnectParams(this.config, this.instanceId, this.protocolVersion),
+          { timeoutMs }
+        );
         if (!isHelloOk(hello)) {
           throw Object.assign(new Error("OpenClaw gateway handshake did not return hello-ok"), {
             code: "PROTOCOL_ERROR"
@@ -23715,7 +23777,7 @@ var init_sentry_config = __esm({
     environment = process.env.SENTRY_ENV === "dev" ? "dev" : "prod";
     SENTRY_CONFIG = {
       projectName: "okx/openclaw-okx-a2a-extension",
-      release: "0.0.11",
+      release: "0.0.12",
       environment
     };
   }
@@ -90678,12 +90740,12 @@ async function runListenerWithLock(options, paths) {
       }));
     }
   });
-  service.setPluginVersion("0.0.11");
+  service.setPluginVersion("0.0.12");
   await service.init();
   const pluginVersionStatus = service.pluginVersionStatus;
   if (pluginVersionStatus.unavailable) {
     throw new Error(
-      `@okxweb3/a2a-node v${"0.0.11"} is below the required minimum v${pluginVersionStatus.minVersion}`
+      `@okxweb3/a2a-node v${"0.0.12"} is below the required minimum v${pluginVersionStatus.minVersion}`
     );
   }
   const systemConfig = service.getSystemConfig();
@@ -90701,7 +90763,7 @@ async function runListenerWithLock(options, paths) {
       onchainosAgentId: "*",
       reason: "system-config missing sentryDsn",
       pluginId: "@okxweb3/a2a-node",
-      pluginVersion: "0.0.11"
+      pluginVersion: "0.0.12"
     });
   }
   console.log(
@@ -93548,7 +93610,7 @@ function isPrereleaseVersion(version2) {
 }
 function getCurrentNodeCliVersion() {
   try {
-    return "0.0.11";
+    return "0.0.12";
   } catch {
     return null;
   }
@@ -94011,7 +94073,7 @@ init_task_config();
 init_sentry_logger();
 init_sentry_config();
 function printUsage2() {
-  console.log(`okx-a2a ${"0.0.11"}
+  console.log(`okx-a2a ${"0.0.12"}
 
 Usage:
   okx-a2a <command> [options]
@@ -94048,7 +94110,7 @@ Run \`okx-a2a <command> -h\` for command-specific help.
 `);
 }
 function printVersion() {
-  console.log("0.0.11");
+  console.log("0.0.12");
 }
 function printDaemonUsage() {
   console.log(`Usage: okx-a2a daemon <start|restart|stop|status> [options]

package/dist/index.js

@@ -85460,11 +85460,13 @@ function readSyncedOpenClawGatewayConfig(homeDir = resolveA2aTaskHome()) {
 // src/openclaw-gateway.ts
 var DEFAULT_GATEWAY_PORT = 18789;
 var DEFAULT_TIMEOUT_MS = 2e4;
-var PROTOCOL_VERSION = 4;
+var PREFERRED_PROTOCOL_VERSION = 4;
+var LEGACY_PROTOCOL_VERSION = 3;
 var DEFAULT_SCOPES = ["operator.admin"];
 var LOG_PREFIX = "[okx-a2a:gateway]";
 var GATEWAY_STARTING_RETRY_DELAYS_MS = [300, 700, 1200, 2e3, 3e3];
 var wsFactory = createDefaultWebSocket;
+var preferredGatewayProtocolVersion = PREFERRED_PROTOCOL_VERSION;
 function createDefaultWebSocket(url) {
   try {
     const WebSocketCtor = require_ws();
@@ -85530,6 +85532,7 @@ function resolveOpenClawGatewayConfig(env = process.env) {
 }
 function setOpenClawWebSocketFactoryForTests(factory) {
   wsFactory = factory ?? createDefaultWebSocket;
+  preferredGatewayProtocolVersion = PREFERRED_PROTOCOL_VERSION;
   clearClient();
 }
 function clearClient() {
@@ -85547,10 +85550,30 @@ async function ensureClient(timeoutMs) {
     clearClient();
   }
   const config = resolveOpenClawGatewayConfig();
-  const client = new MinimalGatewayClient(config);
+  const startedAt = Date.now();
+  const firstProtocol = preferredGatewayProtocolVersion;
+  const client = new MinimalGatewayClient(config, firstProtocol);
   sharedClient = client;
-  await client.connect(timeoutMs);
-  return client;
+  try {
+    await client.connect(timeoutMs);
+    return client;
+  } catch (err2) {
+    if (!isOpenClawProtocolMismatch(err2)) {
+      throw err2;
+    }
+    clearClient();
+    const elapsedMs = Date.now() - startedAt;
+    const remainingMs = Math.max(1, timeoutMs - elapsedMs);
+    const fallbackProtocol = firstProtocol === PREFERRED_PROTOCOL_VERSION ? LEGACY_PROTOCOL_VERSION : PREFERRED_PROTOCOL_VERSION;
+    console.error(
+      `${LOG_PREFIX} protocol fallback from=${firstProtocol} to=${fallbackProtocol} remainingMs=${remainingMs}: ${formatErrorMessage(err2)}`
+    );
+    const fallbackClient = new MinimalGatewayClient(config, fallbackProtocol);
+    sharedClient = fallbackClient;
+    await fallbackClient.connect(remainingMs);
+    preferredGatewayProtocolVersion = fallbackProtocol;
+    return fallbackClient;
+  }
 }
 function stopOpenClawGateway() {
   if (!sharedClient) {
@@ -85663,21 +85686,23 @@ async function sleep(ms) {
 }
 var MinimalGatewayClient = class {
   config;
+  protocolVersion;
   instanceId = (0, import_node_crypto6.randomUUID)();
   pending = /* @__PURE__ */ new Map();
   ws = null;
   ready = false;
   closed = false;
   requestSeq = 0;
-  constructor(config) {
+  constructor(config, protocolVersion) {
     this.config = config;
+    this.protocolVersion = protocolVersion;
   }
   isReady() {
     return this.ready && !this.closed && this.ws?.readyState === 1;
   }
   async connect(timeoutMs) {
     console.error(
-      `${LOG_PREFIX} connect url=${this.config.url} source=${this.config.source} instanceId=${this.instanceId} passwordConfigured=${!!this.config.password} tokenConfigured=${!!this.config.token} scopes=${DEFAULT_SCOPES.join(",")}`
+      `${LOG_PREFIX} connect url=${this.config.url} source=${this.config.source} instanceId=${this.instanceId} protocol=${this.protocolVersion} passwordConfigured=${!!this.config.password} tokenConfigured=${!!this.config.token} scopes=${DEFAULT_SCOPES.join(",")}`
     );
     const ws = wsFactory(this.config.url);
     this.ws = ws;
@@ -85729,14 +85754,11 @@ var MinimalGatewayClient = class {
         if (!settled) {
           settled = true;
           clearTimeout(timer);
-          reject(Object.assign(new Error(`OpenClaw gateway connection closed code=${closeEvent.code ?? 0}`), {
-            code: "ECONNRESET",
-            retryable: true
-          }));
+          reject(toGatewayCloseError(closeEvent.code, closeEvent.reason));
         }
       });
     });
-    console.error(`${LOG_PREFIX} hello ok instanceId=${this.instanceId}`);
+    console.error(`${LOG_PREFIX} hello ok instanceId=${this.instanceId} protocol=${this.protocolVersion}`);
   }
   request(method, params, options = {}) {
     if (method === "connect") {
@@ -85795,7 +85817,11 @@ var MinimalGatewayClient = class {
     this.ws = null;
   }
   async handleOpen(timeoutMs) {
-    const hello = await this.request("connect", buildConnectParams(this.config, this.instanceId), { timeoutMs });
+    const hello = await this.request(
+      "connect",
+      buildConnectParams(this.config, this.instanceId, this.protocolVersion),
+      { timeoutMs }
+    );
     if (!isHelloOk(hello)) {
       throw Object.assign(new Error("OpenClaw gateway handshake did not return hello-ok"), {
         code: "PROTOCOL_ERROR"
@@ -85858,14 +85884,14 @@ function readSyncedGatewayConfig(env) {
     return null;
   }
 }
-function buildConnectParams(config, instanceId) {
+function buildConnectParams(config, instanceId, protocolVersion) {
   return {
-    minProtocol: PROTOCOL_VERSION,
-    maxProtocol: PROTOCOL_VERSION,
+    minProtocol: protocolVersion,
+    maxProtocol: protocolVersion,
     client: {
       id: "gateway-client",
       displayName: "okx-a2a-node",
-      version: "0.0.11",
+      version: "0.0.12",
       platform: "node",
       mode: "backend",
       instanceId
@@ -85876,7 +85902,7 @@ function buildConnectParams(config, instanceId) {
     commands: [],
     permissions: {},
     locale: Intl.DateTimeFormat().resolvedOptions().locale || "en-US",
-    userAgent: `okx-a2a-node/${"0.0.11"}`,
+    userAgent: `okx-a2a-node/${"0.0.12"}`,
     auth: {
       ...config.token ? { token: config.token } : {},
       ...config.password ? { password: config.password } : {}
@@ -85895,10 +85921,47 @@ function toGatewayError(error) {
   });
   return err2;
 }
+function toGatewayCloseError(code2, reason) {
+  const closeCode = code2 ?? 0;
+  const closeReason = reason || "";
+  if (closeCode === 1002 && /protocol mismatch/i.test(closeReason)) {
+    return Object.assign(new Error(`OpenClaw gateway protocol mismatch code=${closeCode} reason=${closeReason}`), {
+      code: "PROTOCOL_MISMATCH",
+      gatewayCode: "PROTOCOL_MISMATCH",
+      retryable: false,
+      details: {
+        closeCode,
+        reason: closeReason
+      }
+    });
+  }
+  return Object.assign(new Error(`OpenClaw gateway connection closed code=${closeCode}`), {
+    code: "ECONNRESET",
+    retryable: true,
+    details: {
+      closeCode,
+      reason: closeReason
+    }
+  });
+}
 function normalizeSocketError(event) {
   const message = event instanceof Error ? event.message : typeof event === "object" && event !== null && "message" in event ? String(event.message) : "OpenClaw gateway websocket error";
   return Object.assign(new Error(message), { code: "ECONNRESET", retryable: true });
 }
+function isOpenClawProtocolMismatch(err2) {
+  const e = err2;
+  const code2 = String(e?.gatewayCode ?? e?.code ?? e?.details?.code ?? "");
+  if (code2 === "PROTOCOL_MISMATCH") {
+    return true;
+  }
+  const reason = String(e?.details?.reason ?? "");
+  const message = String(e?.message ?? "");
+  const expectedProtocol = Number(e?.details?.expectedProtocol);
+  return /protocol mismatch/i.test(reason) || /protocol mismatch/i.test(message) || expectedProtocol === PREFERRED_PROTOCOL_VERSION || expectedProtocol === LEGACY_PROTOCOL_VERSION;
+}
+function formatErrorMessage(err2) {
+  return err2 instanceof Error ? err2.message : String(err2);
+}
 function isSessionNotFound(err2) {
   const e = err2;
   const code2 = e?.gatewayCode ?? e?.code;
@@ -89254,7 +89317,7 @@ function userWatchEventDeliveredSentryExtra(event) {
 var environment = process.env.SENTRY_ENV === "dev" ? "dev" : "prod";
 var SENTRY_CONFIG = {
   projectName: "okx/openclaw-okx-a2a-extension",
-  release: "0.0.11",
+  release: "0.0.12",
   environment
 };
 
@@ -89373,12 +89436,12 @@ async function runListenerWithLock(options, paths) {
       }));
     }
   });
-  service.setPluginVersion("0.0.11");
+  service.setPluginVersion("0.0.12");
   await service.init();
   const pluginVersionStatus = service.pluginVersionStatus;
   if (pluginVersionStatus.unavailable) {
     throw new Error(
-      `@okxweb3/a2a-node v${"0.0.11"} is below the required minimum v${pluginVersionStatus.minVersion}`
+      `@okxweb3/a2a-node v${"0.0.12"} is below the required minimum v${pluginVersionStatus.minVersion}`
     );
   }
   const systemConfig = service.getSystemConfig();
@@ -89396,7 +89459,7 @@ async function runListenerWithLock(options, paths) {
       onchainosAgentId: "*",
       reason: "system-config missing sentryDsn",
       pluginId: "@okxweb3/a2a-node",
-      pluginVersion: "0.0.11"
+      pluginVersion: "0.0.12"
     });
   }
   console.log(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@okxweb3/a2a-node",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "Host-agnostic Node CLI for E2E encrypted agent-to-agent communication via XMTP",
   "main": "dist/index.js",
   "bin": {