@okxweb3/a2a-node 0.0.19 → 0.0.20-beta-17d080241c-260626095524

package/dist/cli.js

@@ -7577,7 +7577,7 @@ function buildConnectParams(config, instanceId, protocolVersion) {
     client: {
       id: "gateway-client",
       displayName: "okx-a2a-node",
-      version: "0.0.19",
+      version: "0.0.20-beta-17d080241c-260626095524",
       platform: "node",
       mode: "backend",
       instanceId
@@ -7588,7 +7588,7 @@ function buildConnectParams(config, instanceId, protocolVersion) {
     commands: [],
     permissions: {},
     locale: Intl.DateTimeFormat().resolvedOptions().locale || "en-US",
-    userAgent: `okx-a2a-node/${"0.0.19"}`,
+    userAgent: `okx-a2a-node/${"0.0.20-beta-17d080241c-260626095524"}`,
     auth: {
       ...config.token ? { token: config.token } : {},
       ...config.password ? { password: config.password } : {}
@@ -7927,7 +7927,7 @@ var init_openclaw_session_key = __esm({
 function currentOpenClawGatewaySessionKey(env = process.env) {
   for (const candidate of currentOpenClawGatewaySessionCandidates(env)) {
     if (candidate.ok) {
-      return candidate.sessionKey;
+      return canonicalizeOpenClawGatewaySessionKey(candidate.sessionKey);
     }
   }
   return null;
@@ -7952,11 +7952,12 @@ function bindOpenClawGatewayRouteFromEnv(store, input, env = process.env) {
       });
       continue;
     }
-    const channel = channelFromOpenClawGatewaySessionKey(candidate.sessionKey);
+    const sessionKey = canonicalizeOpenClawGatewaySessionKey(candidate.sessionKey);
+    const channel = channelFromOpenClawGatewaySessionKey(sessionKey);
     if (!channel) {
       logOpenClawRouteSkip("invalid_gateway_session_key", {
         jobId,
-        sessionKey: candidate.sessionKey,
+        sessionKey,
         existingRoute: resolveOpenClawGatewayRoute(store, { jobId })
       });
       continue;
@@ -7966,7 +7967,7 @@ function bindOpenClawGatewayRouteFromEnv(store, input, env = process.env) {
       firstBound ??= existingRoute.gatewaySessionKey || existingRoute.sessionKey || null;
       continue;
     }
-    const route = buildOpenClawRouteEntry(candidate.sessionKey, channel);
+    const route = buildOpenClawRouteEntry(sessionKey, channel);
     routes = [...routes, route];
     const binding = store.upsertJobGatewayRoute({ jobId, provider: "openclaw", route });
     if (binding.provider !== "openclaw") {
@@ -8053,7 +8054,9 @@ function readOpenClawRouteEntries(store, jobId) {
   const channelOrder = [];
   const routeByChannel = /* @__PURE__ */ new Map();
   for (const route of routes) {
-    const sessionKey = normalizeText(route.gatewaySessionKey) ?? normalizeText(route.sessionKey);
+    const sessionKey = canonicalizeOpenClawGatewaySessionKey(
+      normalizeText(route.gatewaySessionKey) ?? normalizeText(route.sessionKey) ?? ""
+    );
     const channel = channelFromOpenClawGatewaySessionKey(sessionKey);
     if (!sessionKey || !channel) {
       continue;
@@ -8106,20 +8109,70 @@ function parseOpenClawGatewaySessionKey(sessionKey) {
     };
   }
   if (platform === "telegram" && targetKind === "direct") {
+    const threadId = parseTelegramTopicSuffix(parts.slice(5));
     return {
       ...parts[4] ? { chatId: parts[4] } : {},
+      ...threadId ? { threadId } : {},
+      chatType: "dm"
+    };
+  }
+  if (platform === "telegram" && targetKind === "dm") {
+    const threadId = parseTelegramTopicSuffix(parts.slice(5));
+    return {
+      ...parts[4] ? { chatId: parts[4] } : {},
+      ...threadId ? { threadId } : {},
       chatType: "dm"
     };
   }
   if (platform === "telegram" && targetKind === "group") {
+    const threadId = parts[5] === "topic" ? parts[6] : parts[5];
     return {
       ...parts[4] ? { chatId: parts[4] } : {},
-      ...parts[6] ? { threadId: parts[6] } : {},
-      chatType: parts[6] ? "thread" : "group"
+      ...threadId ? { threadId } : {},
+      chatType: threadId ? "thread" : "group"
     };
   }
   return {};
 }
+function canonicalizeOpenClawGatewaySessionKey(sessionKey) {
+  const key = normalizeText(sessionKey);
+  if (!key) {
+    return sessionKey;
+  }
+  const parts = key.split(":");
+  if (parts.length < 4 || parts[0] !== "agent") {
+    return key;
+  }
+  const platform = parts[2];
+  const targetKind = parts[3];
+  if (platform !== "telegram") {
+    return key;
+  }
+  if ((targetKind === "direct" || targetKind === "dm") && parts[4]) {
+    const threadId = parseTelegramTopicSuffix(parts.slice(5));
+    return threadId ? `agent:${parts[1]}:telegram:direct:${parts[4]}:topic:${threadId}` : `agent:${parts[1]}:telegram:direct:${parts[4]}`;
+  }
+  if (targetKind === "group" && parts[4]) {
+    const threadId = parts[5] === "topic" ? parts[6] : parts[5];
+    return threadId ? `agent:${parts[1]}:telegram:group:${parts[4]}:topic:${threadId}` : `agent:${parts[1]}:telegram:group:${parts[4]}`;
+  }
+  return key;
+}
+function parseTelegramTopicSuffix(parts) {
+  if (parts.length === 0) {
+    return void 0;
+  }
+  if (parts[0] === "topic") {
+    return parts[1] || void 0;
+  }
+  if (parts[0] === "thread") {
+    if (parts.length >= 3) {
+      return parts.slice(2).join(":") || void 0;
+    }
+    return parts[1] || void 0;
+  }
+  return parts[0] || void 0;
+}
 function validateOpenClawGatewaySessionKey(sessionKey) {
   const key = normalizeText(sessionKey);
   if (!key) {
@@ -8159,10 +8212,16 @@ function deriveOpenClawGatewaySessionKey(input) {
   const chatId = encodeURIComponent(input.chatId);
   const threadId = input.threadId ? encodeURIComponent(input.threadId) : "";
   if (input.platform === "telegram") {
-    return threadId ? `agent:main:telegram:group:${chatId}:topic:${threadId}` : `agent:main:telegram:direct:${chatId}`;
+    if (!threadId) {
+      return `agent:main:telegram:direct:${chatId}`;
+    }
+    return isTelegramGroupChatId(input.chatId) ? `agent:main:telegram:group:${chatId}:topic:${threadId}` : `agent:main:telegram:direct:${chatId}:topic:${threadId}`;
   }
   return threadId ? `agent:main:${input.platform}:thread:${chatId}:${threadId}` : `agent:main:${input.platform}:dm:${chatId}`;
 }
+function isTelegramGroupChatId(chatId) {
+  return chatId.startsWith("-") || chatId.startsWith("@");
+}
 function readGatewaySessionKeysEnv(env) {
   const raw = normalizeText(env[CURRENT_GATEWAY_SESSION_KEYS_ENV]);
   if (!raw) {
@@ -24748,7 +24807,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.19",
+      release: "0.0.20-beta-17d080241c-260626095524",
       environment
     };
   }
@@ -92488,12 +92547,12 @@ async function runListenerWithLock(options, paths) {
       }));
     }
   });
-  service.setPluginVersion("0.0.19");
+  service.setPluginVersion("0.0.20-beta-17d080241c-260626095524");
   await service.init();
   const pluginVersionStatus = service.pluginVersionStatus;
   if (pluginVersionStatus.unavailable) {
     throw new Error(
-      `@okxweb3/a2a-node v${"0.0.19"} is below the required minimum v${pluginVersionStatus.minVersion}`
+      `@okxweb3/a2a-node v${"0.0.20-beta-17d080241c-260626095524"} is below the required minimum v${pluginVersionStatus.minVersion}`
     );
   }
   const systemConfig = service.getSystemConfig();
@@ -92511,7 +92570,7 @@ async function runListenerWithLock(options, paths) {
       onchainosAgentId: "*",
       reason: "system-config missing sentryDsn",
       pluginId: "@okxweb3/a2a-node",
-      pluginVersion: "0.0.19"
+      pluginVersion: "0.0.20-beta-17d080241c-260626095524"
     });
   }
   logWithTimestamp(
@@ -95623,7 +95682,7 @@ async function getCurrentNodeCliVersion() {
   return await getGlobalNpmPackageVersion(UPDATE_PACKAGES.node) ?? getBundledNodeCliVersion();
 }
 function getBundledNodeCliVersion() {
-  return true ? "0.0.19" : null;
+  return true ? "0.0.20-beta-17d080241c-260626095524" : null;
 }
 function readConfiguredAiProvider() {
   const explicit = process.env.OKX_AGENT_TASK_AI_CLI ?? process.env.OKX_A2A_AI_PROVIDER;
@@ -96456,7 +96515,7 @@ init_sentry_logger();
 init_sentry_config();
 var CURRENT_GATEWAY_SESSION_KEYS_ENV2 = "OKX_A2A_CURRENT_GATEWAY_SESSION_KEYS";
 function printUsage2() {
-  console.log(`okx-a2a ${"0.0.19"}
+  console.log(`okx-a2a ${"0.0.20-beta-17d080241c-260626095524"}
 
 Usage:
   okx-a2a <command> [options]
@@ -96493,7 +96552,7 @@ Run \`okx-a2a <command> -h\` for command-specific help.
 `);
 }
 function printVersion() {
-  console.log("0.0.19");
+  console.log("0.0.20-beta-17d080241c-260626095524");
 }
 function printDaemonUsage() {
   console.log(`Usage: okx-a2a daemon <start|restart|stop|status|autostart> [options]

package/dist/index.js

@@ -86421,7 +86421,7 @@ function buildConnectParams(config, instanceId, protocolVersion) {
     client: {
       id: "gateway-client",
       displayName: "okx-a2a-node",
-      version: "0.0.19",
+      version: "0.0.20-beta-17d080241c-260626095524",
       platform: "node",
       mode: "backend",
       instanceId
@@ -86432,7 +86432,7 @@ function buildConnectParams(config, instanceId, protocolVersion) {
     commands: [],
     permissions: {},
     locale: Intl.DateTimeFormat().resolvedOptions().locale || "en-US",
-    userAgent: `okx-a2a-node/${"0.0.19"}`,
+    userAgent: `okx-a2a-node/${"0.0.20-beta-17d080241c-260626095524"}`,
     auth: {
       ...config.token ? { token: config.token } : {},
       ...config.password ? { password: config.password } : {}
@@ -86568,7 +86568,7 @@ var ACTIVE_ORIGIN_TTL_MS = 30 * 6e4;
 function currentOpenClawGatewaySessionKey(env = process.env) {
   for (const candidate of currentOpenClawGatewaySessionCandidates(env)) {
     if (candidate.ok) {
-      return candidate.sessionKey;
+      return canonicalizeOpenClawGatewaySessionKey(candidate.sessionKey);
     }
   }
   return null;
@@ -86593,11 +86593,12 @@ function bindOpenClawGatewayRouteFromEnv(store, input, env = process.env) {
       });
       continue;
     }
-    const channel = channelFromOpenClawGatewaySessionKey(candidate.sessionKey);
+    const sessionKey = canonicalizeOpenClawGatewaySessionKey(candidate.sessionKey);
+    const channel = channelFromOpenClawGatewaySessionKey(sessionKey);
     if (!channel) {
       logOpenClawRouteSkip("invalid_gateway_session_key", {
         jobId,
-        sessionKey: candidate.sessionKey,
+        sessionKey,
         existingRoute: resolveOpenClawGatewayRoute(store, { jobId })
       });
       continue;
@@ -86607,7 +86608,7 @@ function bindOpenClawGatewayRouteFromEnv(store, input, env = process.env) {
       firstBound ??= existingRoute.gatewaySessionKey || existingRoute.sessionKey || null;
       continue;
     }
-    const route = buildOpenClawRouteEntry(candidate.sessionKey, channel);
+    const route = buildOpenClawRouteEntry(sessionKey, channel);
     routes = [...routes, route];
     const binding = store.upsertJobGatewayRoute({ jobId, provider: "openclaw", route });
     if (binding.provider !== "openclaw") {
@@ -86694,7 +86695,9 @@ function readOpenClawRouteEntries(store, jobId) {
   const channelOrder = [];
   const routeByChannel = /* @__PURE__ */ new Map();
   for (const route of routes) {
-    const sessionKey = normalizeText(route.gatewaySessionKey) ?? normalizeText(route.sessionKey);
+    const sessionKey = canonicalizeOpenClawGatewaySessionKey(
+      normalizeText(route.gatewaySessionKey) ?? normalizeText(route.sessionKey) ?? ""
+    );
     const channel = channelFromOpenClawGatewaySessionKey(sessionKey);
     if (!sessionKey || !channel) {
       continue;
@@ -86747,20 +86750,70 @@ function parseOpenClawGatewaySessionKey(sessionKey) {
     };
   }
   if (platform === "telegram" && targetKind === "direct") {
+    const threadId = parseTelegramTopicSuffix(parts.slice(5));
     return {
       ...parts[4] ? { chatId: parts[4] } : {},
+      ...threadId ? { threadId } : {},
+      chatType: "dm"
+    };
+  }
+  if (platform === "telegram" && targetKind === "dm") {
+    const threadId = parseTelegramTopicSuffix(parts.slice(5));
+    return {
+      ...parts[4] ? { chatId: parts[4] } : {},
+      ...threadId ? { threadId } : {},
       chatType: "dm"
     };
   }
   if (platform === "telegram" && targetKind === "group") {
+    const threadId = parts[5] === "topic" ? parts[6] : parts[5];
     return {
       ...parts[4] ? { chatId: parts[4] } : {},
-      ...parts[6] ? { threadId: parts[6] } : {},
-      chatType: parts[6] ? "thread" : "group"
+      ...threadId ? { threadId } : {},
+      chatType: threadId ? "thread" : "group"
     };
   }
   return {};
 }
+function canonicalizeOpenClawGatewaySessionKey(sessionKey) {
+  const key = normalizeText(sessionKey);
+  if (!key) {
+    return sessionKey;
+  }
+  const parts = key.split(":");
+  if (parts.length < 4 || parts[0] !== "agent") {
+    return key;
+  }
+  const platform = parts[2];
+  const targetKind = parts[3];
+  if (platform !== "telegram") {
+    return key;
+  }
+  if ((targetKind === "direct" || targetKind === "dm") && parts[4]) {
+    const threadId = parseTelegramTopicSuffix(parts.slice(5));
+    return threadId ? `agent:${parts[1]}:telegram:direct:${parts[4]}:topic:${threadId}` : `agent:${parts[1]}:telegram:direct:${parts[4]}`;
+  }
+  if (targetKind === "group" && parts[4]) {
+    const threadId = parts[5] === "topic" ? parts[6] : parts[5];
+    return threadId ? `agent:${parts[1]}:telegram:group:${parts[4]}:topic:${threadId}` : `agent:${parts[1]}:telegram:group:${parts[4]}`;
+  }
+  return key;
+}
+function parseTelegramTopicSuffix(parts) {
+  if (parts.length === 0) {
+    return void 0;
+  }
+  if (parts[0] === "topic") {
+    return parts[1] || void 0;
+  }
+  if (parts[0] === "thread") {
+    if (parts.length >= 3) {
+      return parts.slice(2).join(":") || void 0;
+    }
+    return parts[1] || void 0;
+  }
+  return parts[0] || void 0;
+}
 function validateOpenClawGatewaySessionKey(sessionKey) {
   const key = normalizeText(sessionKey);
   if (!key) {
@@ -86800,10 +86853,16 @@ function deriveOpenClawGatewaySessionKey(input) {
   const chatId = encodeURIComponent(input.chatId);
   const threadId = input.threadId ? encodeURIComponent(input.threadId) : "";
   if (input.platform === "telegram") {
-    return threadId ? `agent:main:telegram:group:${chatId}:topic:${threadId}` : `agent:main:telegram:direct:${chatId}`;
+    if (!threadId) {
+      return `agent:main:telegram:direct:${chatId}`;
+    }
+    return isTelegramGroupChatId(input.chatId) ? `agent:main:telegram:group:${chatId}:topic:${threadId}` : `agent:main:telegram:direct:${chatId}:topic:${threadId}`;
   }
   return threadId ? `agent:main:${input.platform}:thread:${chatId}:${threadId}` : `agent:main:${input.platform}:dm:${chatId}`;
 }
+function isTelegramGroupChatId(chatId) {
+  return chatId.startsWith("-") || chatId.startsWith("@");
+}
 function readGatewaySessionKeysEnv(env) {
   const raw = normalizeText(env[CURRENT_GATEWAY_SESSION_KEYS_ENV]);
   if (!raw) {
@@ -90588,7 +90647,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.19",
+  release: "0.0.20-beta-17d080241c-260626095524",
   environment
 };
 
@@ -90815,12 +90874,12 @@ async function runListenerWithLock(options, paths) {
       }));
     }
   });
-  service.setPluginVersion("0.0.19");
+  service.setPluginVersion("0.0.20-beta-17d080241c-260626095524");
   await service.init();
   const pluginVersionStatus = service.pluginVersionStatus;
   if (pluginVersionStatus.unavailable) {
     throw new Error(
-      `@okxweb3/a2a-node v${"0.0.19"} is below the required minimum v${pluginVersionStatus.minVersion}`
+      `@okxweb3/a2a-node v${"0.0.20-beta-17d080241c-260626095524"} is below the required minimum v${pluginVersionStatus.minVersion}`
     );
   }
   const systemConfig = service.getSystemConfig();
@@ -90838,7 +90897,7 @@ async function runListenerWithLock(options, paths) {
       onchainosAgentId: "*",
       reason: "system-config missing sentryDsn",
       pluginId: "@okxweb3/a2a-node",
-      pluginVersion: "0.0.19"
+      pluginVersion: "0.0.20-beta-17d080241c-260626095524"
     });
   }
   logWithTimestamp(

package/package.json

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