@okxweb3/a2a-node 0.0.13-beta-d0ec14bc63-260622192924 → 0.0.13

package/dist/index.js

@@ -1589,7 +1589,7 @@ var require_misc = __commonJS({
       }
     }
     var SEMVER_REGEXP = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/;
-    function parseSemver2(input) {
+    function parseSemver3(input) {
       const match = input.match(SEMVER_REGEXP) || [];
       const major = parseInt(match[1], 10);
       const minor = parseInt(match[2], 10);
@@ -1631,7 +1631,7 @@ var require_misc = __commonJS({
     exports2.arrayify = arrayify;
     exports2.checkOrSetAlreadyCaught = checkOrSetAlreadyCaught;
     exports2.getEventDescription = getEventDescription;
-    exports2.parseSemver = parseSemver2;
+    exports2.parseSemver = parseSemver3;
     exports2.uuid4 = uuid4;
   }
 });
@@ -1913,7 +1913,7 @@ var require_path = __commonJS({
     function isAbsolute2(path) {
       return path.charAt(0) === "/";
     }
-    function join19(...args) {
+    function join18(...args) {
       return normalizePath(args.join("/"));
     }
     function dirname6(path) {
@@ -1938,7 +1938,7 @@ var require_path = __commonJS({
     exports2.basename = basename3;
     exports2.dirname = dirname6;
     exports2.isAbsolute = isAbsolute2;
-    exports2.join = join19;
+    exports2.join = join18;
     exports2.normalizePath = normalizePath;
     exports2.relative = relative;
     exports2.resolve = resolve4;
@@ -67932,7 +67932,6 @@ __export(index_exports, {
   GatewayOutboundBehavior: () => GatewayOutboundBehavior,
   InvalidXmtpMessageStore: () => InvalidXmtpMessageStore,
   OFFLINE_REPLAY_SYNC_INTERVAL: () => OFFLINE_REPLAY_SYNC_INTERVAL,
-  OPENCLAW_GATEWAY_ROUTE_GROUP_ID: () => OPENCLAW_GATEWAY_ROUTE_GROUP_ID,
   SYSTEM_NOTIFICATION_SESSION_KEY: () => SYSTEM_NOTIFICATION_SESSION_KEY,
   SessionStore: () => SessionStore,
   SqliteOutboundBehavior: () => SqliteOutboundBehavior,
@@ -67946,7 +67945,6 @@ __export(index_exports, {
   bindJobProviderToCurrentDefaultIfMissing: () => bindJobProviderToCurrentDefaultIfMissing,
   bindJobProviderToCurrentRuntimeIfMissing: () => bindJobProviderToCurrentRuntimeIfMissing,
   bindMessageJobProviderToCurrentDefault: () => bindMessageJobProviderToCurrentDefault,
-  bindOpenClawGatewayRouteFromEnv: () => bindOpenClawGatewayRouteFromEnv,
   buildAgentMessageNotice: () => buildAgentMessageNotice,
   buildAiAdapterCommand: () => buildAiAdapterCommand,
   buildAiProviderEnv: () => buildAiProviderEnv,
@@ -67967,18 +67965,19 @@ __export(index_exports, {
   createFileMessageHandler: () => createFileMessageHandler,
   createOutboundBehavior: () => createOutboundBehavior,
   createUserAttentionWatchParentMonitor: () => createUserAttentionWatchParentMonitor,
-  currentOpenClawGatewaySessionKey: () => currentOpenClawGatewaySessionKey,
   detectAiProviders: () => detectAiProviders,
   detectCurrentAiProvider: () => detectCurrentAiProvider,
   detectGatewayInvocation: () => detectGatewayInvocation,
   detectRuntime: () => detectRuntime,
+  ensureCommunicationMinVersions: () => ensureCommunicationMinVersions,
   ensureDefaultAiProvider: () => ensureDefaultAiProvider,
   extractAiSessionId: () => extractAiSessionId,
-  extractXmtpSentAtMs: () => extractXmtpSentAtMs,
+  extractXmtpSentAtMs: () => extractXmtpSentAtMs2,
   getDaemonStatus: () => getDaemonStatus,
   handleXmtpSendCommand: () => handleXmtpSendCommand,
   hasAiRuntimeMarker: () => hasAiRuntimeMarker,
   heartbeatUserAttentionWatcher: () => heartbeatUserAttentionWatcher,
+  isBelowRequiredVersion: () => isBelowRequiredVersion,
   isOriginalParentProcessAlive: () => isOriginalParentProcessAlive,
   isPrereleaseVersion: () => isPrereleaseVersion,
   isRetryableOpenClawGatewayError: () => isRetryableOpenClawGatewayError,
@@ -68001,8 +68000,6 @@ __export(index_exports, {
   resolveConfiguredAiProviderForJob: () => resolveConfiguredAiProviderForJob,
   resolveDirectCommunicationSessionTarget: () => resolveDirectCommunicationSessionTarget,
   resolveOpenClawGatewayConfig: () => resolveOpenClawGatewayConfig,
-  resolveOpenClawGatewayRoute: () => resolveOpenClawGatewayRoute,
-  resolveOpenClawGatewayRoutes: () => resolveOpenClawGatewayRoutes,
   resolveSystemNotificationTargets: () => resolveSystemNotificationTargets,
   resolveTaskConfigPath: () => resolveTaskConfigPath,
   resolveTaskHome: () => resolveTaskHome,
@@ -68561,10 +68558,6 @@ var SessionStore = class {
       VALUES (?, ?, ?, ?)
       ON CONFLICT(job_id) DO UPDATE SET
         provider = excluded.provider,
-        gateway_routes_json = CASE
-          WHEN job_provider_bindings.provider = excluded.provider THEN job_provider_bindings.gateway_routes_json
-          ELSE NULL
-        END,
         updated_at = excluded.updated_at
     `).run(params.jobId, params.provider, now, now);
     const binding = this.getJobProviderBinding(params.jobId);
@@ -68573,52 +68566,43 @@ var SessionStore = class {
     }
     return binding;
   }
-  setJobProviderGatewayRoutes(params) {
+  upsertJobGatewayRoute(params) {
     assertNonEmpty(params.jobId, "jobId");
-    assertAiProvider(params.provider);
-    const routesJson = JSON.stringify(normalizeGatewayRouteBindings(params.routes));
+    assertNonEmpty(params.route.platform, "route.platform");
+    assertNonEmpty(params.route.chatId, "route.chatId");
+    if (params.provider) {
+      assertAiProvider(params.provider);
+    }
     const now = this.timestamp();
     return this.transaction(() => {
-      this.db.prepare(`
-        INSERT OR IGNORE INTO job_provider_bindings(job_id, provider, created_at, updated_at)
-        VALUES (?, ?, ?, ?)
-      `).run(params.jobId, params.provider, now, now);
       const existing = this.getJobProviderBinding(params.jobId);
       if (!existing) {
-        throw new Error(`Failed to read job_provider_bindings ${params.jobId} before route update`);
-      }
-      if (existing.provider !== params.provider) {
-        return existing;
+        this.db.prepare(`
+          INSERT INTO job_provider_bindings(job_id, provider, gateway_routes_json, created_at, updated_at)
+          VALUES (?, ?, ?, ?, ?)
+        `).run(
+          params.jobId,
+          params.provider ?? "hermes",
+          JSON.stringify([normalizeGatewayRoute(params.route, now)]),
+          now,
+          now
+        );
+      } else {
+        const route = normalizeGatewayRoute(params.route, now);
+        const routes = upsertGatewayRoute(existing.gatewayRoutes, route);
+        this.db.prepare(`
+          UPDATE job_provider_bindings
+          SET gateway_routes_json = ?, updated_at = ?
+          WHERE job_id = ?
+        `).run(JSON.stringify(routes), now, params.jobId);
       }
-      this.db.prepare(`
-        UPDATE job_provider_bindings
-        SET gateway_routes_json = ?, updated_at = ?
-        WHERE job_id = ? AND provider = ?
-      `).run(routesJson, now, params.jobId, params.provider);
       const binding = this.getJobProviderBinding(params.jobId);
       if (!binding) {
-        throw new Error(`Failed to read job_provider_bindings ${params.jobId} after route update`);
+        throw new Error(`Failed to read job_provider_bindings ${params.jobId} after route upsert`);
       }
       return binding;
     });
   }
-  clearJobProviderGatewayRoutes(params) {
-    assertNonEmpty(params.jobId, "jobId");
-    if (params.provider) {
-      assertAiProvider(params.provider);
-    }
-    const now = this.timestamp();
-    const result = params.provider ? this.db.prepare(`
-          UPDATE job_provider_bindings
-          SET gateway_routes_json = NULL, updated_at = ?
-          WHERE job_id = ? AND provider = ?
-        `).run(now, params.jobId, params.provider) : this.db.prepare(`
-          UPDATE job_provider_bindings
-          SET gateway_routes_json = NULL, updated_at = ?
-          WHERE job_id = ?
-        `).run(now, params.jobId);
-    return Number(result.changes ?? 0) > 0;
-  }
   deleteJobProviderBinding(jobId) {
     assertNonEmpty(jobId, "jobId");
     const result = this.db.prepare("DELETE FROM job_provider_bindings WHERE job_id = ?").run(jobId);
@@ -69393,54 +69377,82 @@ function mapJobProviderBindingRow(row) {
   return {
     jobId: row.job_id,
     provider: row.provider,
-    ...row.gateway_routes_json ? { gatewayRoutes: parseGatewayRouteBindings(row.gateway_routes_json) } : {},
+    gatewayRoutes: parseGatewayRoutes(row.gateway_routes_json),
     createdAt: row.created_at,
     updatedAt: row.updated_at
   };
 }
-function parseGatewayRouteBindings(value) {
+function parseGatewayRoutes(value) {
+  if (!value) {
+    return [];
+  }
   try {
     const parsed = JSON.parse(value);
     if (!Array.isArray(parsed)) {
       return [];
     }
-    return normalizeGatewayRouteBindings(parsed);
+    return parsed.flatMap((item) => {
+      const route = normalizeGatewayRouteInput(item);
+      return route ? [route] : [];
+    });
   } catch {
     return [];
   }
 }
-function normalizeGatewayRouteBindings(value) {
-  if (!Array.isArray(value)) {
-    return [];
+function normalizeGatewayRouteInput(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return null;
   }
-  const routes = [];
-  for (const item of value) {
-    if (!item || typeof item !== "object") {
-      continue;
-    }
-    const record = item;
-    const platform = normalizeOptionalString(record.platform);
-    const sessionKey = normalizeOptionalString(record.sessionKey);
-    if (!platform || !sessionKey) {
-      continue;
-    }
-    const gatewaySessionKey = normalizeOptionalString(record.gatewaySessionKey);
-    const chatId = normalizeOptionalString(record.chatId);
-    const threadId = normalizeOptionalString(record.threadId);
-    const updatedAt = normalizeOptionalString(record.updatedAt);
-    routes.push({
-      platform,
-      sessionKey,
-      ...gatewaySessionKey ? { gatewaySessionKey } : {},
-      ...chatId ? { chatId } : {},
-      ...threadId ? { threadId } : {},
-      ...updatedAt ? { updatedAt } : {}
-    });
+  const item = value;
+  const platform = readText(item.platform);
+  const chatId = readText(item.chatId) ?? readText(item.chat_id);
+  if (!platform || !chatId) {
+    return null;
   }
-  return routes;
+  return {
+    platform,
+    chatId,
+    chatName: readText(item.chatName) ?? readText(item.chat_name) ?? "",
+    chatType: readText(item.chatType) ?? readText(item.chat_type) ?? (readText(item.threadId) || readText(item.thread_id) ? "thread" : "dm"),
+    threadId: readText(item.threadId) ?? readText(item.thread_id) ?? "",
+    userId: readText(item.userId) ?? readText(item.user_id) ?? "",
+    userName: readText(item.userName) ?? readText(item.user_name) ?? "",
+    sessionKey: readText(item.sessionKey) ?? readText(item.session_key) ?? "",
+    gatewaySessionKey: readText(item.gatewaySessionKey) ?? readText(item.gateway_session_key) ?? "",
+    updatedAt: readText(item.updatedAt) ?? readText(item.updated_at) ?? ""
+  };
+}
+function normalizeGatewayRoute(route, updatedAt) {
+  return {
+    platform: route.platform,
+    chatId: route.chatId,
+    chatName: route.chatName ?? "",
+    chatType: route.chatType || (route.threadId ? "thread" : "dm"),
+    threadId: route.threadId ?? "",
+    userId: route.userId ?? "",
+    userName: route.userName ?? "",
+    sessionKey: route.sessionKey ?? route.gatewaySessionKey ?? "",
+    gatewaySessionKey: route.gatewaySessionKey ?? route.sessionKey ?? "",
+    updatedAt
+  };
+}
+function upsertGatewayRoute(routes, route) {
+  const key = gatewayRouteKey(route);
+  const next = routes.filter((item) => gatewayRouteKey(item) !== key);
+  next.push(route);
+  return next;
+}
+function gatewayRouteKey(route) {
+  return `${route.platform}
+${route.chatId}
+${route.threadId ?? ""}`;
 }
-function normalizeOptionalString(value) {
-  return typeof value === "string" && value.trim() ? value.trim() : null;
+function readText(value) {
+  if (typeof value !== "string") {
+    return null;
+  }
+  const trimmed = value.trim();
+  return trimmed || null;
 }
 
 // src/daemon-lock.ts
@@ -69587,6 +69599,7 @@ async function ensureDaemonDirs(homeDir) {
 }
 async function ensureAiWorkspace(paths) {
   const aiWorkingDir = paths.workspaceDir;
+  await (0, import_promises2.rm)(aiWorkingDir, { recursive: true, force: true });
   ensureTaskDir(aiWorkingDir);
   return aiWorkingDir;
 }
@@ -69779,6 +69792,32 @@ async function stopDaemon(homeDir) {
   };
 }
 
+// ../core/src/log.ts
+function formatLogTimestamp(date = /* @__PURE__ */ new Date()) {
+  return date.toLocaleString(void 0, {
+    year: "numeric",
+    month: "2-digit",
+    day: "2-digit",
+    hour: "2-digit",
+    minute: "2-digit",
+    second: "2-digit",
+    fractionalSecondDigits: 3,
+    hour12: false
+  });
+}
+function prefixArgs(args) {
+  return [`[${formatLogTimestamp()}]`, ...args];
+}
+function logWithTimestamp(...args) {
+  console.log(...prefixArgs(args));
+}
+function warnWithTimestamp(...args) {
+  console.warn(...prefixArgs(args));
+}
+function errorWithTimestamp(...args) {
+  console.error(...prefixArgs(args));
+}
+
 // src/ai-runner.ts
 var import_node_crypto3 = require("node:crypto");
 var import_node_fs7 = require("node:fs");
@@ -70282,7 +70321,7 @@ function detectGatewayInvocation(env = process.env) {
   if (!isTruthyRuntimeMarker(env.OKX_A2A_IN_GATEWAY)) {
     return null;
   }
-  const provider = env.OKX_A2A_GATEWAY_PROVIDER ?? env.OKX_A2A_AI_PROVIDER ?? env.OKX_AGENT_TASK_AI_CLI;
+  const provider = env.OKX_A2A_GATEWAY_PROVIDER;
   if (!provider) {
     return null;
   }
@@ -70935,6 +70974,7 @@ var LogEvent = {
   USER_DISPATCHED: "User dispatched",
   SESSION_DISPATCHED: "Session dispatched",
   SYNC_TICK_COMPLETED: "Sync tick completed",
+  INBOUND_HANDLER_ENTERED: "Inbound handler entered",
   MESSAGE_RECEIVED: "Message received",
   MESSAGE_SENT: "Message sent",
   INBOUND_BUYER_PENDING: "Inbound buyer: no session, group still Unknown (pending)",
@@ -70972,6 +71012,8 @@ var LogEvent = {
   AGENTS_WAKEUP_NOTIFIED: "Agents wakeup notified",
   CONFIG_SENSITIVE_WORDS_REFRESHED: "Sensitive words config refreshed",
   CONFIG_SYSTEM_REFRESHED: "System config refreshed",
+  FORCED_UPDATE_STARTED: "Forced update started",
+  FORCED_UPDATE_SUCCEEDED: "Forced update succeeded",
   GATEWAY_DISCONNECTED: "Gateway disconnected",
   GATEWAY_REQUEST: "Gateway request",
   GATEWAY_DELIVERY_BUFFERED: "Gateway delivery buffered",
@@ -70982,6 +71024,9 @@ var LogEvent = {
   USER_WATCH_EVENT_DELIVERED: "User watch event delivered",
   INBOUND_DM_RAW: "Inbound DM raw",
   INBOUND_GROUP_RAW: "Inbound group raw",
+  SYSTEM_NOTIFICATION_RECEIVED: "System notification received",
+  SYSTEM_NOTIFICATION_ROUTED: "System notification routed",
+  HERMES_SESSION_ROUTE_BINDING: "Hermes session route binding",
   // ── error ─────────────────────────────────────────────────────
   XMTP_CONNECTION_FAILED: "XMTP connection failed",
   CONVERSATIONS_STREAM_FAILED: "conversations.stream failed",
@@ -71031,6 +71076,7 @@ var LogEvent = {
   CACHE_LOAD_FAILED: "Cache load failed",
   CACHE_WRITE_FAILED: "Cache write failed",
   CONFIG_LOAD_FAILED: "Config load failed",
+  FORCED_UPDATE_FAILED: "Forced update failed",
   SENTRY_INIT_SKIPPED: "Sentry init skipped",
   AGENT_DB_DIR_CREATE_FAILED: "Agent DB dir create failed"
 };
@@ -71180,6 +71226,9 @@ var SENTRY_INFO_ALLOWLIST = /* @__PURE__ */ new Set([
   LogEvent.INBOUND_DELIVERED,
   LogEvent.INBOUND_DM_RAW,
   LogEvent.INBOUND_GROUP_RAW,
+  LogEvent.SYSTEM_NOTIFICATION_RECEIVED,
+  LogEvent.SYSTEM_NOTIFICATION_ROUTED,
+  LogEvent.HERMES_SESSION_ROUTE_BINDING,
   LogEvent.INBOUND_BLOCKED_ADDRESS_MISMATCH,
   LogEvent.INBOUND_BLOCKED_INELIGIBLE,
   LogEvent.INBOUND_BLOCKED_SENSITIVE,
@@ -71204,10 +71253,13 @@ var SENTRY_INFO_ALLOWLIST = /* @__PURE__ */ new Set([
   LogEvent.BOOTSTRAP_APPLIED,
   LogEvent.CONFIG_SENSITIVE_WORDS_REFRESHED,
   LogEvent.CONFIG_SYSTEM_REFRESHED,
+  LogEvent.FORCED_UPDATE_STARTED,
+  LogEvent.FORCED_UPDATE_SUCCEEDED,
   LogEvent.CONVERSATION_HISTORY_QUERIED,
   LogEvent.FILE_DOWNLOADED,
   LogEvent.FILE_UPLOADED,
   LogEvent.GROUP_CONSENT_CHANGED,
+  LogEvent.INBOUND_HANDLER_ENTERED,
   LogEvent.MESSAGE_RECEIVED,
   LogEvent.OFFLINE_REPLAY_MESSAGE_REPLAYED,
   LogEvent.AGENT_REFRESH_SESSION_EXPIRED,
@@ -71235,7 +71287,7 @@ var SentryLogger = class _SentryLogger {
   }
   init(config) {
     if (this.initialized) {
-      console.warn("[logger] Already initialized, skipping.");
+      warnWithTimestamp("[logger] Already initialized, skipping.");
       return;
     }
     try {
@@ -71545,7 +71597,7 @@ async function runAiAdapter(options) {
   const permissionPreset = options.permissionPreset ?? (options.provider === "codex" || options.provider === "claude" ? resolveAiPermissionPresetForRun(homeDir, options.env ?? process.env) : void 0);
   const built = buildAiAdapterCommand({ ...options, homeDir, permissionPreset });
   const startedAt = Date.now();
-  console.error(
+  errorWithTimestamp(
     `[okx-agent-task] AI adapter start provider=${options.provider} command=${built.command} mode=${options.sessionId ? "resume" : "new"} cwd=${options.cwd ?? process.cwd()}`
   );
   const child = (0, import_node_child_process3.spawn)(built.command, built.args, {
@@ -71623,7 +71675,7 @@ async function runAiAdapter(options) {
   if (trailingStderr) {
     sessionId = trailingStderr;
   }
-  console.error(
+  errorWithTimestamp(
     `[okx-agent-task] AI adapter done provider=${options.provider} exitCode=${exitCode ?? "null"} sessionId=${sessionId ?? "(none)"} duration=${durationMs}ms timeout=${timedOut ? "yes" : "no"} stdout=${stdout.length}B stderr=${stderr.length}B`
   );
   if (timedOut || exitCode !== 0 || !sessionId) {
@@ -72071,18 +72123,20 @@ var AiRunner = class {
     const normalized = this.normalizeRunRequest(request);
     const queueKey = this.buildRunQueueKey(normalized);
     const triggeredAt = normalized.triggeredAtMs ?? Date.now();
-    await this.appendLlmLog({
-      type: "trigger",
-      source: normalized.source,
-      sessionKey: normalized.sessionKey,
-      jobId: normalized.jobId,
-      agentId: normalized.agentId,
-      messageId: normalized.messageId,
-      queueKey,
-      triggeredAtMs: triggeredAt,
-      commandPendingMs: normalized.commandPendingMs,
-      content: normalized.prompt
-    });
+    if (isAiLifecycleLoggingEnabled()) {
+      await this.appendLlmLog({
+        type: "trigger",
+        source: normalized.source,
+        sessionKey: normalized.sessionKey,
+        jobId: normalized.jobId,
+        agentId: normalized.agentId,
+        messageId: normalized.messageId,
+        queueKey,
+        triggeredAtMs: triggeredAt,
+        commandPendingMs: normalized.commandPendingMs,
+        content: normalized.prompt
+      });
+    }
     const enqueuedAt = Date.now();
     const previous = this.dispatchQueues.get(queueKey) ?? Promise.resolve();
     const next = previous.catch(() => void 0).then(() => this.runUnlocked(normalized, enqueuedAt, triggeredAt));
@@ -72128,7 +72182,7 @@ var AiRunner = class {
   }
   async runUnlocked(request, enqueuedAt, triggeredAt) {
     if (process.env.OKX_AGENT_TASK_DISABLE_AI === "1") {
-      console.error("[okx-agent-task] AI dispatch disabled by OKX_AGENT_TASK_DISABLE_AI=1");
+      errorWithTimestamp("[okx-agent-task] AI dispatch disabled by OKX_AGENT_TASK_DISABLE_AI=1");
       return;
     }
     try {
@@ -72143,8 +72197,9 @@ var AiRunner = class {
     const queueWaitMs = dispatchStartedAt - enqueuedAt;
     const commandPendingMs = request.commandPendingMs ?? 0;
     ensureTaskDir(this.logsDir);
-    const logPath = this.buildRunLogPath(request);
-    const log = (0, import_node_fs7.createWriteStream)(logPath, { flags: "a" });
+    const lifecycleLogsEnabled = isAiLifecycleLoggingEnabled();
+    const logPath = lifecycleLogsEnabled ? this.buildRunLogPath(request) : "";
+    const log = lifecycleLogsEnabled ? (0, import_node_fs7.createWriteStream)(logPath, { flags: "a" }) : null;
     let existing = null;
     let storeReadStartedAt;
     let storeReadEndedAt;
@@ -72183,7 +72238,7 @@ var AiRunner = class {
     const toolFailures = createAiToolFailureTracker(provider);
     const captureAiSessionId = (candidate) => {
       if (existingAiSessionId && candidate !== existingAiSessionId) {
-        console.error(
+        errorWithTimestamp(
           `[okx-agent-task] ignoring mismatched ${provider} session id ${this.formatRunTarget(request)} expected=${existingAiSessionId} got=${candidate}`
         );
         return;
@@ -72259,7 +72314,7 @@ var AiRunner = class {
       firstStdoutAt ??= Date.now();
       stdoutFull += chunk.toString("utf8");
       stdoutText = appendOutput(stdoutText, chunk);
-      log.write(chunk);
+      log?.write(chunk);
       parseStdoutChunk(chunk);
     });
     child.stderr?.on("data", (chunk) => {
@@ -72267,7 +72322,7 @@ var AiRunner = class {
       const text = chunk.toString("utf8");
       stderrFull += text;
       stderrText += text;
-      log.write(chunk);
+      log?.write(chunk);
       parseStderrText(text);
     });
     const target = formatDispatchTarget({
@@ -72277,7 +72332,7 @@ var AiRunner = class {
       messageId: request.messageId
     });
     const label = request.source === "job-dispatch" ? "AI dispatch" : "AI session";
-    console.error(
+    errorWithTimestamp(
       `[okx-agent-task] ${label} start ${target} provider=${provider} mode=${existingAiSessionId ? "resume" : "new"} pid=${child.pid ?? "unknown"} commandPending=${commandPendingMs ?? ""}ms queue=${queueWaitMs}ms prepare=${Date.now() - dispatchStartedAt}ms storeRead=${storeReadMs ?? ""}ms providerResolve=${resolveMs}ms cwd=${aiCwd} log=${logPath}`
     );
     const timeout = timeoutMs === null ? null : setTimeout(() => {
@@ -72286,7 +72341,7 @@ var AiRunner = class {
 `;
       stderrFull += message;
       stderrText += message;
-      log.write(message);
+      log?.write(message);
       console.error(message.trim());
       child.kill("SIGTERM");
       setTimeout(() => {
@@ -72319,9 +72374,11 @@ var AiRunner = class {
     const sessionWriteEndedAt = Date.now();
     const sessionWriteMs = sessionWriteEndedAt - sessionWriteStartedAt;
     const logFileCloseStartedAt = Date.now();
-    await new Promise((resolve4) => {
-      log.end(resolve4);
-    });
+    if (log) {
+      await new Promise((resolve4) => {
+        log.end(resolve4);
+      });
+    }
     const logFileCloseEndedAt = Date.now();
     const totalMs = logFileCloseEndedAt - triggeredAt;
     const trailingStdoutLine = stdoutBuffer.trim();
@@ -72365,7 +72422,7 @@ var AiRunner = class {
       aiSessionId,
       timedOut
     });
-    console.error(
+    errorWithTimestamp(
       `[okx-agent-task] ${label} done ${target} provider=${provider} exitCode=${exitCode ?? "null"} signal=${closeResult.signal ?? "none"} timeout=${timedOut ? "yes" : "no"} aiSession=${shortenValue(aiSessionId)} commandPending=${commandPendingMs ?? ""}ms queue=${queueWaitMs}ms cli=${cliMs}ms sessionWrite=${sessionWriteMs}ms total=${totalMs}ms result=${summarizeAiOutput(stdoutText, stderrText)}`
     );
     const aiFailureExtra = (reason) => aiRunSentryExtra({
@@ -72390,56 +72447,58 @@ var AiRunner = class {
       timeToFirstStdoutMs: firstStdoutAt === null ? null : firstStdoutAt - spawnedAt,
       timeToFirstStderrMs: firstStderrAt === null ? null : firstStderrAt - spawnedAt
     });
-    await this.appendLlmLog({
-      type: "ai-output",
-      source: request.source,
-      sessionKey: request.sessionKey,
-      jobId: request.jobId,
-      agentId: request.agentId,
-      messageId: request.messageId,
-      provider,
-      mode: existingAiSessionId ? "resume" : "new",
-      pid: child.pid ?? null,
-      cwd: aiCwd,
-      logPath,
-      exitCode,
-      closeSignal: closeResult.signal,
-      aiSessionId,
-      timedOut,
-      timeoutMs,
-      triggeredAtMs: triggeredAt,
-      enqueuedAtMs: enqueuedAt,
-      runStartedAtMs: dispatchStartedAt,
-      storeReadStartedAtMs: storeReadStartedAt,
-      storeReadEndedAtMs: storeReadEndedAt,
-      providerResolveStartedAtMs: resolveStartedAt,
-      providerResolveEndedAtMs: resolveEndedAt,
-      spawnStartedAtMs: spawnStartedAt,
-      spawnedAtMs: spawnedAt,
-      firstStdoutAtMs: firstStdoutAt,
-      firstStderrAtMs: firstStderrAt,
-      childClosedAtMs: childClosedAt,
-      sessionWriteStartedAtMs: sessionWriteStartedAt,
-      sessionWriteEndedAtMs: sessionWriteEndedAt,
-      logFileCloseStartedAtMs: logFileCloseStartedAt,
-      logFileCloseEndedAtMs: logFileCloseEndedAt,
-      commandPendingMs,
-      queueWaitMs,
-      triggerToEnqueueMs: enqueuedAt - triggeredAt,
-      runStartToSpawnMs: spawnedAt - dispatchStartedAt,
-      storeReadMs,
-      providerResolveMs: resolveMs,
-      timeToFirstStdoutMs: firstStdoutAt === null ? null : firstStdoutAt - spawnedAt,
-      timeToFirstStderrMs: firstStderrAt === null ? null : firstStderrAt - spawnedAt,
-      spawnToCloseMs: childClosedAt - spawnedAt,
-      runStartToCloseMs: childClosedAt - dispatchStartedAt,
-      sessionWriteMs,
-      logFileCloseMs: logFileCloseEndedAt - logFileCloseStartedAt,
-      cliMs,
-      totalMs,
-      stdout: stdoutFull,
-      stderr: stderrFull
-    });
+    if (lifecycleLogsEnabled) {
+      await this.appendLlmLog({
+        type: "ai-output",
+        source: request.source,
+        sessionKey: request.sessionKey,
+        jobId: request.jobId,
+        agentId: request.agentId,
+        messageId: request.messageId,
+        provider,
+        mode: existingAiSessionId ? "resume" : "new",
+        pid: child.pid ?? null,
+        cwd: aiCwd,
+        logPath,
+        exitCode,
+        closeSignal: closeResult.signal,
+        aiSessionId,
+        timedOut,
+        timeoutMs,
+        triggeredAtMs: triggeredAt,
+        enqueuedAtMs: enqueuedAt,
+        runStartedAtMs: dispatchStartedAt,
+        storeReadStartedAtMs: storeReadStartedAt,
+        storeReadEndedAtMs: storeReadEndedAt,
+        providerResolveStartedAtMs: resolveStartedAt,
+        providerResolveEndedAtMs: resolveEndedAt,
+        spawnStartedAtMs: spawnStartedAt,
+        spawnedAtMs: spawnedAt,
+        firstStdoutAtMs: firstStdoutAt,
+        firstStderrAtMs: firstStderrAt,
+        childClosedAtMs: childClosedAt,
+        sessionWriteStartedAtMs: sessionWriteStartedAt,
+        sessionWriteEndedAtMs: sessionWriteEndedAt,
+        logFileCloseStartedAtMs: logFileCloseStartedAt,
+        logFileCloseEndedAtMs: logFileCloseEndedAt,
+        commandPendingMs,
+        queueWaitMs,
+        triggerToEnqueueMs: enqueuedAt - triggeredAt,
+        runStartToSpawnMs: spawnedAt - dispatchStartedAt,
+        storeReadMs,
+        providerResolveMs: resolveMs,
+        timeToFirstStdoutMs: firstStdoutAt === null ? null : firstStdoutAt - spawnedAt,
+        timeToFirstStderrMs: firstStderrAt === null ? null : firstStderrAt - spawnedAt,
+        spawnToCloseMs: childClosedAt - spawnedAt,
+        runStartToCloseMs: childClosedAt - dispatchStartedAt,
+        sessionWriteMs,
+        logFileCloseMs: logFileCloseEndedAt - logFileCloseStartedAt,
+        cliMs,
+        totalMs,
+        stdout: stdoutFull,
+        stderr: stderrFull
+      });
+    }
     if (isMissingResumeSessionFailure({
       provider,
       existingAiSessionId,
@@ -72451,7 +72510,7 @@ var AiRunner = class {
         provider,
         request
       });
-      console.error(
+      errorWithTimestamp(
         `[okx-agent-task] ${provider} resume session is unavailable; retrying ${target} as a new session without prior context.`
       );
       return this.runAi(request, enqueuedAt, triggeredAt, true);
@@ -72624,30 +72683,6 @@ var AiRunner = class {
       });
     }
   }
-  buildArgs(provider, event, aiSessionId, cwd = this.resolveAiWorkingDir()) {
-    const sessionKey = buildDispatchSessionKey(event.jobId, event.sessionAgentId);
-    return this.buildRunArgs(provider, {
-      source: "job-dispatch",
-      sessionKey,
-      prompt: this.buildPrompt(event),
-      jobId: event.jobId,
-      agentId: event.sessionAgentId,
-      messageId: event.message.id,
-      jobFilePath: event.jobFilePath,
-      sessionAgentId: event.sessionAgentId
-    }, aiSessionId, cwd);
-  }
-  buildSessionArgs(provider, event, aiSessionId, cwd = this.resolveAiWorkingDir()) {
-    const messageId = event.messageId ?? `session-${Date.now()}`;
-    return this.buildRunArgs(provider, {
-      source: "session-message",
-      sessionKey: event.sessionKey,
-      prompt: this.buildSessionPrompt({ ...event, messageId }),
-      jobId: event.jobId,
-      agentId: event.agentId,
-      messageId
-    }, aiSessionId, cwd);
-  }
   buildRunArgs(provider, request, aiSessionId, cwd = this.resolveAiWorkingDir()) {
     const permissionPreset = this.resolveAiPermissionPresetForRun();
     const prompt = request.prompt;
@@ -72795,7 +72830,7 @@ var AiRunner = class {
           logPath: runContext?.logPath
         })
       );
-      console.error("[okx-agent-task] failed to create user_attention for AI run failure:", attentionErr);
+      errorWithTimestamp("[okx-agent-task] failed to create user_attention for AI run failure:", attentionErr);
     }
   }
   async reportAiToolFailures(failures, context) {
@@ -72847,7 +72882,7 @@ var AiRunner = class {
             reason: "user_attention_create_failed"
           }
         );
-        console.error("[okx-agent-task] failed to create user_attention for AI tool failure:", attentionErr);
+        errorWithTimestamp("[okx-agent-task] failed to create user_attention for AI tool failure:", attentionErr);
       }
     }
   }
@@ -72862,7 +72897,7 @@ var AiRunner = class {
       ensureTaskDir(this.logsDir);
       await (0, import_promises5.appendFile)((0, import_node_path11.join)(this.logsDir, "llm.log"), formatLlmLogEntry(entry), "utf8");
     } catch (err2) {
-      console.error("[okx-agent-task] failed to append llm.log:", err2);
+      errorWithTimestamp("[okx-agent-task] failed to append llm.log:", err2);
     }
   }
 };
@@ -72892,6 +72927,13 @@ function aiRunToolFailureSentryExtra(failure, context) {
     return out;
   }, {});
 }
+function isAiLifecycleLoggingEnabled(env = process.env) {
+  const raw = env.OKX_A2A_AI_LIFECYCLE_LOGS ?? env.OKX_AGENT_TASK_AI_LIFECYCLE_LOGS;
+  if (!raw) {
+    return true;
+  }
+  return !["0", "false", "no", "off"].includes(raw.trim().toLowerCase());
+}
 function safeProcessCwd() {
   try {
     return process.cwd();
@@ -74175,7 +74217,6 @@ var CommandStore = class {
       myAgentId: params.myAgentId,
       toAgentId: params.toAgentId,
       toXmtpAddress: params.toXmtpAddress,
-      gatewaySessionKeys: params.gatewaySessionKeys,
       createdAt: Date.now()
     };
   }
@@ -74339,7 +74380,7 @@ var CommandStore = class {
         });
         continue;
       }
-      console.log(`[okx-agent-task] invalid queued command row id=${row.id} type=${row.type}`);
+      logWithTimestamp(`[okx-agent-task] invalid queued command row id=${row.id} type=${row.type}`);
     }
     return commands;
   }
@@ -74411,7 +74452,7 @@ var CommandStore = class {
             status === "processing" ? mtimeMs : null
           );
         } catch (err2) {
-          console.log(`[okx-agent-task] failed to import legacy command ${path}:`, err2);
+          logWithTimestamp(`[okx-agent-task] failed to import legacy command ${path}:`, err2);
         }
       }
     }
@@ -76771,6 +76812,53 @@ function selfFilterMiddleware() {
   };
 }
 
+// ../core/src/xmtp-sdk/inbound-timing.ts
+function createInboundTimingTracker(xmtpSentAtMs, xmtpReceivedAtMs = Date.now()) {
+  const durations = {};
+  return {
+    xmtpSentAtMs,
+    xmtpReceivedAtMs,
+    xmtpDeliveryMs: safeDuration(xmtpReceivedAtMs, xmtpSentAtMs),
+    mark(stage, startedAtMs) {
+      const key = stage.endsWith("Ms") ? stage : `${stage}Ms`;
+      const durationMs = safeDuration(Date.now(), startedAtMs);
+      durations[key] = durationMs;
+      return durationMs;
+    },
+    extras(extra = {}) {
+      return {
+        xmtpSentAtMs,
+        xmtpReceivedAtMs,
+        xmtpDeliveryMs: safeDuration(xmtpReceivedAtMs, xmtpSentAtMs),
+        handlerTotalMs: safeDuration(Date.now(), xmtpReceivedAtMs),
+        ...durations,
+        ...extra
+      };
+    }
+  };
+}
+function extractXmtpSentAtMs(msg) {
+  if (typeof msg.sentAtNs === "bigint") {
+    return Number(msg.sentAtNs / 1000000n);
+  }
+  if (typeof msg.sentAtNs === "number") {
+    return Math.floor(msg.sentAtNs / 1e6);
+  }
+  if (msg.sentAt instanceof Date) {
+    return msg.sentAt.getTime();
+  }
+  if (typeof msg.sentAt === "number") {
+    return msg.sentAt;
+  }
+  return Date.now();
+}
+function safeDuration(endMs, startMs) {
+  if (!Number.isFinite(endMs) || !Number.isFinite(startMs)) {
+    return 0;
+  }
+  return Math.max(0, Math.round(endMs - startMs));
+}
+
 // ../core/src/xmtp-sdk/middleware/logging.ts
 function loggingMiddleware(identity3) {
   const tag = `[xmtp-sdk:${identity3.walletAddress ?? "?"}]`;
@@ -76778,46 +76866,38 @@ function loggingMiddleware(identity3) {
     const msg = ctx.message;
     const conv = ctx.conversation;
     const conversationId = conv.id;
+    const xmtpReceivedAtMs = Date.now();
+    const xmtpSentAtMs = extractXmtpSentAtMs(msg);
+    const ownInboxId = ctx.client?.inboxId ?? identity3.inboxId ?? "";
     const content3 = JSON.stringify(msg);
     const contentSummary = summarizeMessageContent(msg.content);
     const baseExtras = {
       ...agentExtras(identity3),
       ...jobIdExtras(msg.content),
       peerInboxId: msg.senderInboxId,
+      senderInboxId: msg.senderInboxId,
+      ownInboxId,
       conversationId,
       messageId: msg.id,
-      stage: "inbound/transport_received"
+      kind: msg.kind ?? "unknown",
+      source: "live",
+      xmtpSentAtMs: String(xmtpSentAtMs),
+      xmtpReceivedAtMs: String(xmtpReceivedAtMs),
+      xmtpDeliveryMs: String(safeDuration(xmtpReceivedAtMs, xmtpSentAtMs)),
+      stage: "inbound/stream_observed"
     };
     if (conv instanceof Group) {
       const groupName = conv.name ?? "unnamed";
-      let memberCount = "0";
-      let membersInfo = "";
-      let membersFetchFailed = "0";
-      try {
-        const members = await conv.members();
-        memberCount = String(members.length);
-        const addresses = members.flatMap(
-          (m) => m.accountIdentifiers.map((id) => id.identifier)
-        );
-        membersInfo = ` members=[${addresses.join(", ")}]`;
-      } catch (err2) {
-        console.log(`${tag} [group] members fetch failed:`, err2);
-        memberCount = "fetch-failed";
-        membersInfo = " members=[fetch failed]";
-        membersFetchFailed = "1";
-      }
-      console.log(
-        `${tag} [group] conv=${conversationId} name="${groupName}"${membersInfo} sender=${msg.senderInboxId} msg=${msg.id} bytes=${content3.length} ${contentSummary}`
+      logWithTimestamp(
+        `${tag} [group] conv=${conversationId} name="${groupName}" sender=${msg.senderInboxId} msg=${msg.id} bytes=${content3.length} ${contentSummary}`
       );
       logger.info(LogEvent.MESSAGE_RECEIVED, {
         ...baseExtras,
         chatType: "group",
-        groupName,
-        memberCount,
-        membersFetchFailed
+        groupName
       });
     } else {
-      console.log(
+      logWithTimestamp(
         `${tag} [dm] conv=${conversationId} sender=${msg.senderInboxId} msg=${msg.id} bytes=${content3.length} ${contentSummary}`
       );
       logger.info(LogEvent.MESSAGE_RECEIVED, {
@@ -83103,11 +83183,11 @@ async function createAgentWithInstallationPrune(signer, options, context) {
     if (!oldest) {
       throw err2;
     }
-    console.log(
+    logWithTimestamp(
       `${prefix} installation cap reached for ${context.address} (agentId=${context.agentId}); revoking oldest installation ${oldest.id}`
     );
     await Client.revokeInstallations(signer, inboxId, [oldest.bytes], options.env, options.gatewayHost);
-    console.log(
+    logWithTimestamp(
       `${prefix} revoked oldest installation for ${context.address} (agentId=${context.agentId}); retrying client init`
     );
     return await Agent.create(signer, options);
@@ -83201,7 +83281,7 @@ function loadSensitiveWordsFromCache(dataDir) {
     }
     return null;
   } catch (err2) {
-    console.log("[xmtp-sdk] failed to read sensitive-words.json cache:", err2);
+    logWithTimestamp("[xmtp-sdk] failed to read sensitive-words.json cache:", err2);
     logger.error(LogEvent.CACHE_LOAD_FAILED, err2 instanceof Error ? err2 : new Error(String(err2)), { cacheName: "sensitive-words" });
     return null;
   }
@@ -83211,19 +83291,19 @@ function saveSensitiveWordsToCache(dataDir, words) {
     ensureCacheDir(dataDir);
     (0, import_node_fs10.writeFileSync)(cachePath(dataDir, "sensitive-words.json"), JSON.stringify(words));
   } catch (err2) {
-    console.log(`[xmtp-sdk] failed to write sensitive-words.json:`, err2);
+    logWithTimestamp(`[xmtp-sdk] failed to write sensitive-words.json:`, err2);
     logger.error(LogEvent.CACHE_WRITE_FAILED, err2 instanceof Error ? err2 : new Error(String(err2)), { cacheName: "sensitive-words" });
   }
 }
 async function loadSensitiveWordsWith(dataDir, fetcher) {
   if (!fetcher) {
-    console.log("[xmtp-sdk] sensitive-words fetcher not provided by host");
+    logWithTimestamp("[xmtp-sdk] sensitive-words fetcher not provided by host");
     return loadSensitiveWordsFromCache(dataDir);
   }
   const cached = loadSensitiveWordsFromCache(dataDir);
   try {
     const words = await fetcher();
-    console.log(`[xmtp-sdk] fetched ${words.length} sensitive words from API`);
+    logWithTimestamp(`[xmtp-sdk] fetched ${words.length} sensitive words from API`);
     saveSensitiveWordsToCache(dataDir, words);
     logger.info(LogEvent.CONFIG_SENSITIVE_WORDS_REFRESHED, {
       count: String(words.length),
@@ -83231,17 +83311,17 @@ async function loadSensitiveWordsWith(dataDir, fetcher) {
     });
     return words;
   } catch (err2) {
-    console.log(`[xmtp-sdk] API fetch for sensitive words failed:`, err2);
+    logWithTimestamp(`[xmtp-sdk] API fetch for sensitive words failed:`, err2);
   }
   if (cached) {
-    console.log(`[xmtp-sdk] using ${cached.length} cached sensitive words from disk`);
+    logWithTimestamp(`[xmtp-sdk] using ${cached.length} cached sensitive words from disk`);
     logger.info(LogEvent.CONFIG_SENSITIVE_WORDS_REFRESHED, {
       count: String(cached.length),
       source: "cache"
     });
     return cached;
   }
-  console.log(`[xmtp-sdk] sensitive-words load failed: neither API nor local cache available`);
+  logWithTimestamp(`[xmtp-sdk] sensitive-words load failed: neither API nor local cache available`);
   logger.error(LogEvent.CONFIG_LOAD_FAILED, void 0, {
     config: "sensitive-words",
     reason: "no-api-no-cache"
@@ -83260,7 +83340,7 @@ function loadSystemConfigFromCache(dataDir) {
     }
     return null;
   } catch (err2) {
-    console.log("[xmtp-sdk] failed to read system-config.json cache:", err2);
+    logWithTimestamp("[xmtp-sdk] failed to read system-config.json cache:", err2);
     logger.error(LogEvent.CACHE_LOAD_FAILED, err2 instanceof Error ? err2 : new Error(String(err2)), { cacheName: "system-config" });
     return null;
   }
@@ -83270,18 +83350,18 @@ function saveSystemConfigToCache(dataDir, config) {
     ensureCacheDir(dataDir);
     (0, import_node_fs10.writeFileSync)(cachePath(dataDir, "system-config.json"), JSON.stringify(config));
   } catch (err2) {
-    console.log(`[xmtp-sdk] failed to write system-config.json:`, err2);
+    logWithTimestamp(`[xmtp-sdk] failed to write system-config.json:`, err2);
     logger.error(LogEvent.CACHE_WRITE_FAILED, err2 instanceof Error ? err2 : new Error(String(err2)), { cacheName: "system-config" });
   }
 }
 async function loadSystemConfigWith(dataDir, fetcher) {
   if (!fetcher) {
-    console.log("[xmtp-sdk] system-config fetcher not provided by host");
+    logWithTimestamp("[xmtp-sdk] system-config fetcher not provided by host");
     return loadSystemConfigFromCache(dataDir);
   }
   try {
     const config = await fetcher();
-    console.log(
+    logWithTimestamp(
       `[xmtp-sdk] fetched system-config from API: ${Object.keys(config).length} keys`
     );
     saveSystemConfigToCache(dataDir, config);
@@ -83291,11 +83371,11 @@ async function loadSystemConfigWith(dataDir, fetcher) {
     });
     return config;
   } catch (err2) {
-    console.log(`[xmtp-sdk] API fetch for system-config failed:`, err2);
+    logWithTimestamp(`[xmtp-sdk] API fetch for system-config failed:`, err2);
   }
   const cached = loadSystemConfigFromCache(dataDir);
   if (cached) {
-    console.log(
+    logWithTimestamp(
       `[xmtp-sdk] using cached system-config from disk: ${Object.keys(cached).length} keys`
     );
     logger.info(LogEvent.CONFIG_SYSTEM_REFRESHED, {
@@ -83304,7 +83384,7 @@ async function loadSystemConfigWith(dataDir, fetcher) {
     });
     return cached;
   }
-  console.log(`[xmtp-sdk] system-config load failed: neither API nor local cache available`);
+  logWithTimestamp(`[xmtp-sdk] system-config load failed: neither API nor local cache available`);
   logger.error(LogEvent.CONFIG_LOAD_FAILED, void 0, {
     config: "system-config",
     reason: "no-api-no-cache"
@@ -83328,7 +83408,7 @@ function loadSyncByAddress(dataDir) {
       }
     }
   } catch (err2) {
-    console.log("[xmtp-sdk] failed to read last-sync.json cache:", err2);
+    logWithTimestamp("[xmtp-sdk] failed to read last-sync.json cache:", err2);
     logger.error(LogEvent.CACHE_LOAD_FAILED, err2 instanceof Error ? err2 : new Error(String(err2)), { cacheName: "last-sync" });
   }
   return map;
@@ -83352,7 +83432,7 @@ function saveSyncForAddress(dataDir, address, timestampMs) {
     data.syncByAddress[address] = timestampMs;
     (0, import_node_fs10.writeFileSync)(path, JSON.stringify(data, null, 2));
   } catch (err2) {
-    console.log(
+    logWithTimestamp(
       `[xmtp-sdk] failed to write last-sync.json (address=${address}):`,
       err2
     );
@@ -83461,6 +83541,18 @@ function parseTips(raw) {
 function parseStringArray(raw) {
   return Array.isArray(raw) ? raw.filter((value) => typeof value === "string" && value.length > 0) : [];
 }
+function readOptionalString(record, key) {
+  const value = record[key];
+  return typeof value === "string" ? value : "";
+}
+function readMinVersion(raw) {
+  const container = raw.minVersion && typeof raw.minVersion === "object" && !Array.isArray(raw.minVersion) ? raw.minVersion : raw.minVersions && typeof raw.minVersions === "object" && !Array.isArray(raw.minVersions) ? raw.minVersions : {};
+  return {
+    cli: readOptionalString(container, "cli") || readOptionalString(raw, "cliMinVersion"),
+    openclaw: readOptionalString(container, "openclaw") || readOptionalString(raw, "openclawMinVersion"),
+    hermes: readOptionalString(container, "hermes") || readOptionalString(raw, "hermesMinVersion")
+  };
+}
 function parseExtConfig(raw) {
   const obj = raw && typeof raw === "object" && !Array.isArray(raw) ? raw : {};
   return {
@@ -83482,13 +83574,14 @@ function parseSystemConfig(raw) {
     acc.push({ address, inboxId, type });
     return acc;
   }, []) : [];
+  const minVersion = readMinVersion(raw);
   return {
     heartbeatInterval: typeof raw.heartbeatInterval === "number" ? raw.heartbeatInterval : SYSTEM_CONFIG_DEFAULTS.heartbeatInterval,
     maxFileSizeBytes: typeof raw.maxFileSizeBytes === "number" && Number.isFinite(raw.maxFileSizeBytes) && raw.maxFileSizeBytes > 0 ? raw.maxFileSizeBytes : SYSTEM_CONFIG_DEFAULTS.maxFileSizeBytes,
     sensitiveUploadReg: parseStringArray(raw.SENSITIVE_UPLOAD_REG),
     accounts,
     sentryDsn: typeof raw.sentryDsn === "string" ? raw.sentryDsn : "",
-    minAvailablePluginVersion: typeof raw.minAvailablePluginVersion === "string" ? raw.minAvailablePluginVersion : "",
+    minVersion,
     extConfig: parseExtConfig(raw.extConfig)
   };
 }
@@ -83537,11 +83630,7 @@ var XmtpService = class _XmtpService {
   _initFailures = [];
   _backupReady = Promise.resolve();
   _onAfterInitError = null;
-  _pluginVersion = "";
-  _pluginVersionStatus = {
-    unavailable: false,
-    minVersion: ""
-  };
+  _cliVersion = "";
   dataDir = DEFAULT_DATA_DIR;
   syncByAddress = /* @__PURE__ */ new Map();
   agentListFingerprint;
@@ -83572,12 +83661,12 @@ var XmtpService = class _XmtpService {
     return this.dataDir;
   }
   async init() {
-    console.log("[xmtp-sdk] init: loading system-config first to gate on plugin version...");
+    logWithTimestamp("[xmtp-sdk] init: loading system-config first to gate on plugin version...");
     this._initFailures = [];
     try {
       ensureA2aTaskDir(this.dataDir);
     } catch (err2) {
-      console.log(`[xmtp-sdk] failed to create data directory: ${this.dataDir}`, err2);
+      logWithTimestamp(`[xmtp-sdk] failed to create data directory: ${this.dataDir}`, err2);
       logger.error(
         LogEvent.AGENT_DB_DIR_CREATE_FAILED,
         err2 instanceof Error ? err2 : new Error(String(err2)),
@@ -83589,11 +83678,11 @@ var XmtpService = class _XmtpService {
     ]);
     if (systemConfigResult.status === "fulfilled" && systemConfigResult.value) {
       this.systemConfig = parseSystemConfig(systemConfigResult.value);
-      this.evaluatePluginVersion();
-      if (this._pluginVersionStatus.unavailable) {
+      const cliMinVersion = this.systemConfig.minVersion.cli;
+      if (this.isCliBelowMinVersion(cliMinVersion)) {
         this._initialized = false;
-        console.log(
-          `[xmtp-sdk] init aborted: plugin v${this._pluginVersion} is below the required minimum v${this._pluginVersionStatus.minVersion}. Run \`openclaw plugins update okx-a2a\` to upgrade.`
+        logWithTimestamp(
+          `[xmtp-sdk] init paused: cli v${this._cliVersion} is below the required minimum v${cliMinVersion}; daemon updater will attempt a forced update.`
         );
         return;
       }
@@ -83602,7 +83691,7 @@ var XmtpService = class _XmtpService {
         "loadSystemConfig returned null (neither API nor local cache is available)"
       );
       this._initFailures.push({ action: "loadSystemConfig", error: err2 });
-      console.log("[xmtp-sdk] init: loadSystemConfig failed:", err2.message);
+      logWithTimestamp("[xmtp-sdk] init: loadSystemConfig failed:", err2.message);
     }
     const [sensitiveWordsResult, clientsResult] = await Promise.allSettled([
       loadSensitiveWordsWith(this.dataDir, this.tools.fetchSensitiveWords),
@@ -83612,7 +83701,7 @@ var XmtpService = class _XmtpService {
     this._onAfterInitError = null;
     this._backupReady = afterInit ? afterInit().catch((err2) => {
       this._onAfterInitError = err2 instanceof Error ? err2 : new Error(String(err2));
-      console.log(
+      logWithTimestamp(
         "[xmtp-sdk] tools.onAfterInit failed (will retry on first use):",
         err2
       );
@@ -83622,39 +83711,36 @@ var XmtpService = class _XmtpService {
     } else {
       this.sensitiveWords = null;
       const reason = sensitiveWordsResult.status === "rejected" ? sensitiveWordsResult.reason : "loadSensitiveWords returned null (neither API nor local cache is available)";
-      console.log(
+      logWithTimestamp(
         "[xmtp-sdk] init: loadSensitiveWords failed; will lazy-retry during message handling:",
         reason
       );
     }
     if (clientsResult.status === "fulfilled") {
-      console.log(
+      logWithTimestamp(
         `[xmtp-sdk] init: XMTP clients initialized, ${clientsResult.value.size} clients`
       );
     } else {
       const err2 = clientsResult.reason instanceof Error ? clientsResult.reason : new Error(String(clientsResult.reason));
       this._initFailures.push({ action: "initXmtpInstall", error: err2 });
-      console.log("[xmtp-sdk] init: initXmtpInstall failed:", err2.message);
+      logWithTimestamp("[xmtp-sdk] init: initXmtpInstall failed:", err2.message);
     }
     this._initialized = this._initFailures.length === 0;
-    if (this._initialized) {
-      this.evaluatePluginVersion();
-    }
     const clientCount = clientsResult.status === "fulfilled" ? clientsResult.value.size : 0;
-    console.log(
+    logWithTimestamp(
       `[xmtp-sdk] init done: initialized=${this._initialized}, clients=${clientCount}, failures=${this._initFailures.length}`
     );
   }
   async retryFailedInit() {
     const remaining = [];
     for (const failure of this._initFailures) {
-      console.log(`[xmtp-sdk] retryFailedInit: retrying ${failure.action}...`);
+      logWithTimestamp(`[xmtp-sdk] retryFailedInit: retrying ${failure.action}...`);
       try {
         if (failure.action === "loadSystemConfig") {
           const config = await loadSystemConfigWith(this.dataDir, this.tools.fetchSystemConfig);
           if (config) {
             this.systemConfig = parseSystemConfig(config);
-            console.log(
+            logWithTimestamp(
               `[xmtp-sdk] retryFailedInit: loadSystemConfig retry succeeded`
             );
           } else {
@@ -83667,12 +83753,12 @@ var XmtpService = class _XmtpService {
           }
         } else if (failure.action === "initXmtpInstall") {
           await this.initXmtpInstall();
-          console.log(`[xmtp-sdk] retryFailedInit: initXmtpInstall retry succeeded`);
+          logWithTimestamp(`[xmtp-sdk] retryFailedInit: initXmtpInstall retry succeeded`);
         }
       } catch (err2) {
         const error = err2 instanceof Error ? err2 : new Error(String(err2));
         remaining.push({ action: failure.action, error });
-        console.log(
+        logWithTimestamp(
           `[xmtp-sdk] retryFailedInit: ${failure.action} retry failed:`,
           error.message
         );
@@ -83681,18 +83767,17 @@ var XmtpService = class _XmtpService {
     this._initFailures = remaining;
     if (remaining.length === 0) {
       this._initialized = true;
-      this.evaluatePluginVersion();
     }
     return { ok: remaining.length === 0, failures: remaining };
   }
   async initXmtpInstall() {
-    console.log(`==============XMTP_ENV: ${this.env}==============`);
+    logWithTimestamp(`==============XMTP_ENV: ${this.env}==============`);
     const initStart = Date.now();
     const dbDir = this.dataDir;
     try {
       ensureA2aTaskDir(dbDir);
     } catch (err2) {
-      console.log(`[xmtp-sdk] failed to create data directory: ${dbDir}`, err2);
+      logWithTimestamp(`[xmtp-sdk] failed to create data directory: ${dbDir}`, err2);
       logger.error(
         LogEvent.AGENT_DB_DIR_CREATE_FAILED,
         err2 instanceof Error ? err2 : new Error(String(err2)),
@@ -83701,7 +83786,7 @@ var XmtpService = class _XmtpService {
       return this.clients;
     }
     this.syncByAddress = loadSyncByAddress(this.dataDir);
-    console.log(
+    logWithTimestamp(
       `[xmtp-sdk] sync timestamps: ${this.syncByAddress.size} addresses on record`
     );
     if (!this.tools.listAllAgentsWithMetadata) {
@@ -83714,7 +83799,7 @@ var XmtpService = class _XmtpService {
     this.agentListFingerprint = agentList.fingerprint;
     this.setAgentStatusIndex(agentList.allAgents ?? agentList.agents);
     const agents = agentList.agents;
-    console.log(
+    logWithTimestamp(
       `[xmtp-sdk] fetched ${agents.length} agents from onchainos changed=${agentList.changed} duration=${agentList.durationMs}ms`
     );
     this.allAgents = agents;
@@ -83725,7 +83810,7 @@ var XmtpService = class _XmtpService {
           onchainosAgentIds: agents.map((a) => a.agentId).join(",")
         });
       }).catch((err2) => {
-        console.log("[xmtp-sdk] notifyAgentsWakeup unexpected error:", err2);
+        logWithTimestamp("[xmtp-sdk] notifyAgentsWakeup unexpected error:", err2);
         logger.error(
           LogEvent.NOTIFY_AGENTS_WAKEUP_FAILED,
           err2 instanceof Error ? err2 : new Error(String(err2)),
@@ -83755,7 +83840,7 @@ var XmtpService = class _XmtpService {
         const { address, agent, agentInfo } = r.value;
         this.stoppedAddresses.delete(address.toLowerCase());
         this.clients.set(address, agent);
-        console.log(
+        logWithTimestamp(
           `[xmtp-sdk] identity initialized: ${address} (agentId=${agentInfo.agentId})`
         );
         logger.info(LogEvent.AGENT_CLIENT_CREATED, {
@@ -83768,7 +83853,7 @@ var XmtpService = class _XmtpService {
         });
       } else {
         failedAgents.push(agents[i]);
-        console.log(
+        logWithTimestamp(
           `[xmtp-sdk] identity init failed: ${agents[i].communicationAddress} (agentId=${agents[i].agentId})`,
           r.reason
         );
@@ -83784,7 +83869,7 @@ var XmtpService = class _XmtpService {
       }
     }
     if (failedAgents.length > 0) {
-      console.log(
+      logWithTimestamp(
         `[xmtp-sdk] ${failedAgents.length} client(s) failed to initialize, retrying in 1s...`
       );
       await new Promise((r) => setTimeout(r, 1e3));
@@ -83795,7 +83880,7 @@ var XmtpService = class _XmtpService {
           const { address, agent, agentInfo } = r.value;
           this.stoppedAddresses.delete(address.toLowerCase());
           this.clients.set(address, agent);
-          console.log(
+          logWithTimestamp(
             `[xmtp-sdk] retry succeeded: ${address} (agentId=${agentInfo.agentId})`
           );
           logger.info(LogEvent.AGENT_CLIENT_CREATED, {
@@ -83808,7 +83893,7 @@ var XmtpService = class _XmtpService {
           });
         } else {
           const info = failedAgents[i];
-          console.log(
+          logWithTimestamp(
             `[xmtp-sdk] retry still failed: ${info.communicationAddress} (agentId=${info.agentId})`,
             r.reason
           );
@@ -83824,7 +83909,7 @@ var XmtpService = class _XmtpService {
         }
       }
     }
-    console.log(
+    logWithTimestamp(
       `[xmtp-sdk] initialized ${this.clients.size}/${agents.length} clients in total`
     );
     await this.startListening();
@@ -83842,7 +83927,7 @@ var XmtpService = class _XmtpService {
   }
   async refreshAgents() {
     if (this.refreshAgentsInFlight) {
-      console.log(`[xmtp-sdk] refresh: a refresh is already in flight, reusing the same promise`);
+      logWithTimestamp(`[xmtp-sdk] refresh: a refresh is already in flight, reusing the same promise`);
       return this.refreshAgentsInFlight;
     }
     this.refreshAgentsInFlight = this.runRefreshAgents().finally(() => {
@@ -83867,7 +83952,7 @@ var XmtpService = class _XmtpService {
       changed = agentList.changed;
     } catch (err2) {
       if (isSessionExpiredError(err2)) {
-        console.log(
+        logWithTimestamp(
           "[xmtp-sdk] refresh: onchainos session expired, taking all local clients offline"
         );
         logger.info(LogEvent.AGENT_REFRESH_SESSION_EXPIRED, {
@@ -83901,11 +83986,11 @@ var XmtpService = class _XmtpService {
         try {
           this.stoppedAddresses.add(address.toLowerCase());
           client.stop();
-          console.log(
+          logWithTimestamp(
             `[xmtp-sdk] refresh: stopped client: ${address} (agentId=${agentInfo.agentId})`
           );
         } catch (err2) {
-          console.log(`[xmtp-sdk] refresh: failed to stop client: ${address}`, err2);
+          logWithTimestamp(`[xmtp-sdk] refresh: failed to stop client: ${address}`, err2);
           logger.error(LogEvent.AGENT_REFRESH_FAILED, err2 instanceof Error ? err2 : new Error(String(err2)), {
             walletAddress: address,
             onchainosAgentId: agentInfo.agentId,
@@ -83927,7 +84012,7 @@ var XmtpService = class _XmtpService {
       try {
         ensureA2aTaskDir(dbDir);
       } catch (err2) {
-        console.log(`[xmtp-sdk] refresh: failed to create data directory: ${dbDir}`, err2);
+        logWithTimestamp(`[xmtp-sdk] refresh: failed to create data directory: ${dbDir}`, err2);
         logger.error(LogEvent.AGENT_REFRESH_FAILED, err2 instanceof Error ? err2 : new Error(String(err2)), {
           onchainosAgentId: "*",
           phase: "mkdir",
@@ -83964,7 +84049,7 @@ var XmtpService = class _XmtpService {
           const { address, agentInfo } = r.value;
           this.stoppedAddresses.delete(address.toLowerCase());
           this.clients.set(address, r.value.agent);
-          console.log(
+          logWithTimestamp(
             `[xmtp-sdk] refresh: identity initialized: ${address} (agentId=${agentInfo.agentId})`
           );
           logger.info(LogEvent.AGENT_CLIENT_CREATED, {
@@ -83978,7 +84063,7 @@ var XmtpService = class _XmtpService {
           });
         } else {
           failedAgents.push(added[i]);
-          console.log(
+          logWithTimestamp(
             `[xmtp-sdk] refresh: identity init failed: ${added[i].communicationAddress} (agentId=${added[i].agentId})`,
             r.reason
           );
@@ -83995,7 +84080,7 @@ var XmtpService = class _XmtpService {
         }
       }
       if (failedAgents.length > 0) {
-        console.log(
+        logWithTimestamp(
           `[xmtp-sdk] refresh: ${failedAgents.length} client(s) failed to initialize, retrying in 1s...`
         );
         await new Promise((r) => setTimeout(r, 1e3));
@@ -84006,7 +84091,7 @@ var XmtpService = class _XmtpService {
             const { address, agentInfo } = r.value;
             this.stoppedAddresses.delete(address.toLowerCase());
             this.clients.set(address, r.value.agent);
-            console.log(
+            logWithTimestamp(
               `[xmtp-sdk] refresh: retry succeeded: ${address} (agentId=${agentInfo.agentId})`
             );
             logger.info(LogEvent.AGENT_CLIENT_CREATED, {
@@ -84020,7 +84105,7 @@ var XmtpService = class _XmtpService {
             });
           } else {
             const info = failedAgents[i];
-            console.log(
+            logWithTimestamp(
               `[xmtp-sdk] refresh: retry still failed: ${info.communicationAddress} (agentId=${info.agentId})`,
               r.reason
             );
@@ -84043,11 +84128,11 @@ var XmtpService = class _XmtpService {
       for (const agentInfo of added) {
         const address = agentInfo.communicationAddress;
         if (this.syncByAddress.has(address) && this.clients.has(address)) {
-          console.log(
+          logWithTimestamp(
             `[xmtp-sdk] refresh: ${address} has a prior sync timestamp, triggering offline replay`
           );
           this.replayOfflineMessagesForAddress(address).catch((err2) => {
-            console.log(`[xmtp-sdk] refresh: ${address} offline replay failed:`, err2);
+            logWithTimestamp(`[xmtp-sdk] refresh: ${address} offline replay failed:`, err2);
             logger.error(
               LogEvent.OFFLINE_REPLAY_FAILED,
               err2 instanceof Error ? err2 : new Error(String(err2)),
@@ -84155,13 +84240,13 @@ var XmtpService = class _XmtpService {
         );
         if (result !== null) {
           this.sensitiveWords = result;
-          console.log(
+          logWithTimestamp(
             `[xmtp-sdk] lazy-retry sensitive-words succeeded: ${result.length} entries`
           );
           return result;
         }
         this.sensitiveWordsLastFailedAtMs = Date.now();
-        console.log(
+        logWithTimestamp(
           "[xmtp-sdk] lazy-retry sensitive-words failed, entering cooldown"
         );
         return null;
@@ -84174,27 +84259,14 @@ var XmtpService = class _XmtpService {
   getSystemConfig() {
     return this.systemConfig;
   }
-  // The plugin reports its own build version (injected via esbuild
-  // define) before calling init(); we compare it once against
-  // systemConfig.minAvailablePluginVersion when init completes, then
-  // freeze the result. Tool guards read the cached status, so per-call
-  // semver work is avoided entirely.
-  setPluginVersion(version2) {
-    this._pluginVersion = version2 ?? "";
-  }
-  get pluginVersionStatus() {
-    return this._pluginVersionStatus;
-  }
-  evaluatePluginVersion() {
-    const min = this.systemConfig.minAvailablePluginVersion;
-    if (!min || !isValidSemver(min) || !isValidSemver(this._pluginVersion)) {
-      this._pluginVersionStatus = { unavailable: false, minVersion: min ?? "" };
-      return;
-    }
-    this._pluginVersionStatus = {
-      unavailable: semverLt(this._pluginVersion, min),
-      minVersion: min
-    };
+  // The daemon reports its own build version before init(); startup can pause
+  // before XMTP clients are created while the node listener performs the actual
+  // forced update.
+  setCliVersion(version2) {
+    this._cliVersion = version2 ?? "";
+  }
+  isCliBelowMinVersion(minVersion) {
+    return Boolean(minVersion) && isValidSemver(minVersion) && isValidSemver(this._cliVersion) && semverLt(this._cliVersion, minVersion);
   }
   // Force-refresh systemConfig from onchainos API (falls back to disk
   // cache). Single in-flight promise is shared by concurrent callers so
@@ -84209,7 +84281,6 @@ var XmtpService = class _XmtpService {
         const raw = await loadSystemConfigWith(this.dataDir, this.tools.fetchSystemConfig);
         if (raw) {
           this.systemConfig = parseSystemConfig(raw);
-          this.evaluatePluginVersion();
         }
       } finally {
         this.systemConfigRefreshInflight = null;
@@ -84260,7 +84331,7 @@ var XmtpService = class _XmtpService {
   async allowGroup(myXmtpAddress, groupId) {
     const agent = this.getClientByAddress(myXmtpAddress);
     if (!agent) {
-      console.log(
+      logWithTimestamp(
         `[xmtp-sdk] allowGroup: no client found for address=${myXmtpAddress}`
       );
       logger.error(LogEvent.GROUP_CONSENT_UPDATE_FAILED, void 0, {
@@ -84281,7 +84352,7 @@ var XmtpService = class _XmtpService {
         (c) => c instanceof Group && c.id === groupId
       );
       if (!group) {
-        console.log(`[xmtp-sdk] allowGroup: groupId=${groupId} not found`);
+        logWithTimestamp(`[xmtp-sdk] allowGroup: groupId=${groupId} not found`);
         logger.error(LogEvent.GROUP_CONSENT_UPDATE_FAILED, void 0, {
           ...agentExtras({
             walletAddress: myXmtpAddress,
@@ -84295,13 +84366,13 @@ var XmtpService = class _XmtpService {
         return false;
       }
       if (group.consentState === import_node_bindings2.ConsentState.Allowed) {
-        console.log(
+        logWithTimestamp(
           `[xmtp-sdk] allowGroup: groupId=${groupId} already Allowed, skipping`
         );
         return true;
       }
       group.updateConsentState(import_node_bindings2.ConsentState.Allowed);
-      console.log(`[xmtp-sdk] allowGroup: groupId=${groupId} marked as Allowed`);
+      logWithTimestamp(`[xmtp-sdk] allowGroup: groupId=${groupId} marked as Allowed`);
       logger.info(LogEvent.GROUP_CONSENT_CHANGED, {
         ...agentExtras({
           walletAddress: myXmtpAddress,
@@ -84313,7 +84384,7 @@ var XmtpService = class _XmtpService {
       });
       return true;
     } catch (err2) {
-      console.log(`[xmtp-sdk] allowGroup failed: groupId=${groupId}`, err2);
+      logWithTimestamp(`[xmtp-sdk] allowGroup failed: groupId=${groupId}`, err2);
       logger.error(LogEvent.GROUP_CONSENT_UPDATE_FAILED, err2 instanceof Error ? err2 : new Error(String(err2)), {
         ...agentExtras({
           walletAddress: myXmtpAddress,
@@ -84330,14 +84401,14 @@ var XmtpService = class _XmtpService {
     const tag = `[xmtp-sdk:listUnknownGroups:${clientAddress}]`;
     const agent = this.getClientByAddress(clientAddress);
     if (!agent) {
-      console.log(`${tag} no client found, returning empty`);
+      logWithTimestamp(`${tag} no client found, returning empty`);
       return [];
     }
     await agent.client.conversations.syncAll([import_node_bindings2.ConsentState.Unknown]);
     const groups = await agent.client.conversations.list({
       consentStates: [import_node_bindings2.ConsentState.Unknown]
     });
-    console.log(`${tag} Unknown groups: ${groups.length}`);
+    logWithTimestamp(`${tag} Unknown groups: ${groups.length}`);
     const myInboxId = agent.client.inboxId;
     const myAgentId = this.getAgentByAddress(clientAddress)?.agentId ?? null;
     const result = [];
@@ -84381,7 +84452,7 @@ var XmtpService = class _XmtpService {
           messages: chatMsgs
         });
       } catch (err2) {
-        console.log(`${tag} failed to read group ${conv.id}:`, err2);
+        logWithTimestamp(`${tag} failed to read group ${conv.id}:`, err2);
         logger.error(
           LogEvent.INBOUND_ROUTING_FAILED,
           err2 instanceof Error ? err2 : new Error(String(err2)),
@@ -84402,7 +84473,7 @@ var XmtpService = class _XmtpService {
   async denyGroup(myXmtpAddress, groupId) {
     const agent = this.getClientByAddress(myXmtpAddress);
     if (!agent) {
-      console.log(
+      logWithTimestamp(
         `[xmtp-sdk] denyGroup: no client found for address=${myXmtpAddress}`
       );
       logger.error(LogEvent.GROUP_CONSENT_UPDATE_FAILED, void 0, {
@@ -84423,7 +84494,7 @@ var XmtpService = class _XmtpService {
         (c) => c instanceof Group && c.id === groupId
       );
       if (!group) {
-        console.log(`[xmtp-sdk] denyGroup: groupId=${groupId} not found`);
+        logWithTimestamp(`[xmtp-sdk] denyGroup: groupId=${groupId} not found`);
         logger.error(LogEvent.GROUP_CONSENT_UPDATE_FAILED, void 0, {
           ...agentExtras({
             walletAddress: myXmtpAddress,
@@ -84437,7 +84508,7 @@ var XmtpService = class _XmtpService {
         return false;
       }
       group.updateConsentState(import_node_bindings2.ConsentState.Denied);
-      console.log(`[xmtp-sdk] denyGroup: groupId=${groupId} marked as Denied`);
+      logWithTimestamp(`[xmtp-sdk] denyGroup: groupId=${groupId} marked as Denied`);
       logger.info(LogEvent.GROUP_CONSENT_CHANGED, {
         ...agentExtras({
           walletAddress: myXmtpAddress,
@@ -84449,7 +84520,7 @@ var XmtpService = class _XmtpService {
       });
       return true;
     } catch (err2) {
-      console.log(`[xmtp-sdk] denyGroup failed: groupId=${groupId}`, err2);
+      logWithTimestamp(`[xmtp-sdk] denyGroup failed: groupId=${groupId}`, err2);
       logger.error(LogEvent.GROUP_CONSENT_UPDATE_FAILED, err2 instanceof Error ? err2 : new Error(String(err2)), {
         ...agentExtras({
           walletAddress: myXmtpAddress,
@@ -84481,9 +84552,9 @@ var XmtpService = class _XmtpService {
           import_node_bindings2.ConsentState.Allowed,
           import_node_bindings2.ConsentState.Unknown
         ]);
-        console.log(`${tag} conversations synced (non-Denied)`);
+        logWithTimestamp(`${tag} conversations synced (non-Denied)`);
       } catch (err2) {
-        console.log(`${tag} conversation sync failed, skipping this client:`, err2);
+        logWithTimestamp(`${tag} conversation sync failed, skipping this client:`, err2);
         logger.error(
           LogEvent.CONVERSATIONS_STREAM_FAILED,
           err2 instanceof Error ? err2 : void 0,
@@ -84491,8 +84562,8 @@ var XmtpService = class _XmtpService {
         );
         return;
       }
-      agent.use(selfFilterMiddleware());
       agent.use(loggingMiddleware(identity3));
+      agent.use(selfFilterMiddleware());
       const inboundFactory = this.tools.createInboundMiddleware;
       if (inboundFactory) {
         agent.use(
@@ -84511,7 +84582,7 @@ var XmtpService = class _XmtpService {
           })
         );
       } else {
-        console.log(
+        logWithTimestamp(
           `${tag} tools.createInboundMiddleware not injected \u2014 inbound routing disabled`
         );
       }
@@ -84519,7 +84590,7 @@ var XmtpService = class _XmtpService {
         const initialSyncMs = Date.now();
         this.syncByAddress.set(address, initialSyncMs);
         saveSyncForAddress(this.dataDir, address, initialSyncMs);
-        console.log(
+        logWithTimestamp(
           `${tag} initialized sync timestamp at ${new Date(initialSyncMs).toISOString()}`
         );
       }
@@ -84527,13 +84598,13 @@ var XmtpService = class _XmtpService {
       const BASE_DELAY_MS = 1e3;
       const startWithRetry = async (attempt = 0) => {
         if (this.stoppedAddresses.has(address.toLowerCase()) || !this.clients.has(address)) {
-          console.log(`${tag} start skipped: client stopped or removed`);
+          logWithTimestamp(`${tag} start skipped: client stopped or removed`);
           return;
         }
         try {
           await agent.start();
         } catch (err2) {
-          console.log(`${tag} agent.start error (attempt=${attempt}):`, err2);
+          logWithTimestamp(`${tag} agent.start error (attempt=${attempt}):`, err2);
           logger.error(
             LogEvent.AGENT_START_FAILED,
             err2 instanceof Error ? err2 : void 0,
@@ -84547,24 +84618,24 @@ var XmtpService = class _XmtpService {
       };
       const scheduleRetry = (attempt) => {
         if (this.stoppedAddresses.has(address.toLowerCase()) || !this.clients.has(address)) {
-          console.log(`${tag} reconnect skipped: client stopped or removed`);
+          logWithTimestamp(`${tag} reconnect skipped: client stopped or removed`);
           return;
         }
         if (attempt >= MAX_RETRIES) {
-          console.log(`${tag} reached max retries (${MAX_RETRIES}), giving up reconnect`);
+          logWithTimestamp(`${tag} reached max retries (${MAX_RETRIES}), giving up reconnect`);
           return;
         }
         const delay = BASE_DELAY_MS * 2 ** attempt;
-        console.log(`${tag} reconnecting in ${delay}ms (attempt=${attempt + 1})`);
+        logWithTimestamp(`${tag} reconnecting in ${delay}ms (attempt=${attempt + 1})`);
         setTimeout(() => void startWithRetry(attempt + 1), delay);
       };
       agent.on("error", (err2) => {
-        console.log(`${tag} agent stream error:`, err2);
+        logWithTimestamp(`${tag} agent stream error:`, err2);
         logger.error(LogEvent.AGENT_STREAM_ERROR, err2, agentExtras(identity3));
         scheduleRetry(0);
       });
       void startWithRetry();
-      console.log(`${tag} message listener started`);
+      logWithTimestamp(`${tag} message listener started`);
     });
   }
   async replayOfflineMessagesForAddress(address) {
@@ -84590,7 +84661,7 @@ var XmtpService = class _XmtpService {
     };
     const processOffline = this.tools.processOfflineMessage;
     if (!processOffline) {
-      console.log(
+      logWithTimestamp(
         `${tag} tools.processOfflineMessage not injected \u2014 offline replay skipped`
       );
       summary.durationMs = Date.now() - addressReplayStartedAt;
@@ -84611,7 +84682,7 @@ var XmtpService = class _XmtpService {
       summary.listMs = Date.now() - listStartedAt;
       summary.conversations = conversations.length;
     } catch (err2) {
-      console.log(`${tag} conversation sync/list failed, skipping:`, err2);
+      logWithTimestamp(`${tag} conversation sync/list failed, skipping:`, err2);
       logger.error(
         LogEvent.OFFLINE_REPLAY_FAILED,
         err2 instanceof Error ? err2 : void 0,
@@ -84697,7 +84768,7 @@ var XmtpService = class _XmtpService {
             const handleMs = Date.now() - handleStartedAt;
             summary.handleMs += handleMs;
             if (handled) {
-              console.log(
+              logWithTimestamp(
                 `${tag} replayed content=${preview}`
               );
               summary.replayed++;
@@ -84716,7 +84787,7 @@ var XmtpService = class _XmtpService {
               summary.skipped++;
             }
           } catch (err2) {
-            console.log(`${tag}   replay handling failed: msgId=${msg.id}`, err2);
+            logWithTimestamp(`${tag}   replay handling failed: msgId=${msg.id}`, err2);
             logger.error(
               LogEvent.OFFLINE_REPLAY_MESSAGE_FAILED,
               err2 instanceof Error ? err2 : void 0,
@@ -84739,7 +84810,7 @@ var XmtpService = class _XmtpService {
           }
         }
       } catch (err2) {
-        console.log(`${tag} failed to read messages from conversation ${conv.id}:`, err2);
+        logWithTimestamp(`${tag} failed to read messages from conversation ${conv.id}:`, err2);
         logger.error(
           LogEvent.OFFLINE_REPLAY_FAILED,
           err2 instanceof Error ? err2 : void 0,
@@ -84879,7 +84950,7 @@ async function resolve2() {
   }
   const envBin = process.env.ONCHAINOS_BIN;
   if (envBin) {
-    console.log(`[onchainos] using ONCHAINOS_BIN=${envBin}`);
+    logWithTimestamp(`[onchainos] using ONCHAINOS_BIN=${envBin}`);
     resolvedBin = envBin;
     return resolvedBin;
   }
@@ -84888,17 +84959,17 @@ async function resolve2() {
     const { stdout } = await execFileAsync(shell, ["-lc", "command -v onchainos"]);
     const bin = extractExecutablePath(stdout);
     if (bin) {
-      console.log(`[onchainos] resolved binary via shell: ${bin}`);
+      logWithTimestamp(`[onchainos] resolved binary via shell: ${bin}`);
       resolvedBin = bin;
       return resolvedBin;
     }
   } catch (err2) {
-    console.log(
+    logWithTimestamp(
       "[onchainos] shell resolve failed, will fallback to bare 'onchainos':",
       err2
     );
   }
-  console.log(
+  logWithTimestamp(
     "[onchainos] could not resolve binary path, falling back to bare 'onchainos'"
   );
   resolvedBin = "onchainos";
@@ -84948,16 +85019,16 @@ function commandForLog(bin, args) {
 async function exec(args) {
   const bin = await resolve2();
   const cmd = commandForLog(bin, args);
-  console.log(`[onchainos] exec: ${cmd}`);
+  logWithTimestamp(`[onchainos] exec: ${cmd}`);
   const t0 = Date.now();
   try {
     const result = await execFileAsync(bin, args);
-    console.log(
+    logWithTimestamp(
       `[onchainos] exec done: ${cmd} (${Date.now() - t0}ms, stdout=${result.stdout.length}B, stderr=${result.stderr.length}B)`
     );
     return result;
   } catch (err2) {
-    console.log(
+    logWithTimestamp(
       `[onchainos] exec error: ${cmd} (${Date.now() - t0}ms) code=${err2.code} signal=${err2.signal} killed=${err2.killed} message=${err2.message}`
     );
     logger.error(
@@ -84985,21 +85056,7 @@ async function exec(args) {
   }
 }
 
-// ../core/src/xmtp-sdk/onchainos/index.ts
-function isAccountAgentGroup(item) {
-  return typeof item === "object" && item !== null && Array.isArray(item.agentList);
-}
-function normalizeAgentPage(raw) {
-  const list = [];
-  for (const item of raw.list) {
-    if (isAccountAgentGroup(item)) {
-      list.push(...item.agentList);
-    } else {
-      list.push(item);
-    }
-  }
-  return { list, page: raw.page, pageSize: raw.pageSize, total: raw.total };
-}
+// ../core/src/xmtp-sdk/onchainos/cli-response.ts
 var CliErrorReason = {
   OK_FALSE: "ok_false",
   JSON_PARSE_FAILED: "json_parse_failed"
@@ -85047,6 +85104,8 @@ function parseCliJson(stdout, command, extras = {}) {
     throw parseErr;
   }
 }
+
+// ../core/src/xmtp-sdk/onchainos/session-expired.ts
 var SESSION_EXPIRED_RE2 = /session expired/i;
 function isSessionExpired(stdout) {
   try {
@@ -85056,14 +85115,7 @@ function isSessionExpired(stdout) {
     return SESSION_EXPIRED_RE2.test(stdout);
   }
 }
-var lastExpiredNotifyAt = 0;
-var EXPIRED_NOTIFY_COOLDOWN_MS = 5 * 60 * 1e3;
-function notifySessionExpired(command) {
-  const now = Date.now();
-  if (now - lastExpiredNotifyAt < EXPIRED_NOTIFY_COOLDOWN_MS) {
-    return;
-  }
-  lastExpiredNotifyAt = now;
+function reportSessionExpired(command) {
   logger.error(
     LogEvent.ONCHAINOS_SESSION_EXPIRED,
     new Error("onchainos session expired"),
@@ -85077,9 +85129,87 @@ function notifySessionExpired(command) {
       reason: "session_expired"
     }
   );
+}
+
+// ../core/src/xmtp-sdk/onchainos/system-config.ts
+function notifyExpired(command, options) {
+  if (options?.notifySessionExpired) {
+    options.notifySessionExpired(command);
+    return;
+  }
+  reportSessionExpired(command);
+}
+function guardSessionExpired(stdout, command, options) {
+  if (isSessionExpired(stdout)) {
+    notifyExpired(command, options);
+  }
+}
+function guardCatchSessionExpired(err2, command, options) {
+  const stdout = String(err2?.stdout ?? "");
+  if (stdout && isSessionExpired(stdout)) {
+    notifyExpired(command, options);
+  }
+}
+async function fetchSystemConfig(options) {
+  logWithTimestamp(`[onchainos] fetching system-config`);
+  let stdout;
+  let stderr;
+  try {
+    ({ stdout, stderr } = await exec(["agent", "system-config"]));
+  } catch (err2) {
+    guardCatchSessionExpired(err2, "system-config", options);
+    throw err2;
+  }
+  if (stderr) {
+    logWithTimestamp(`[onchainos] stderr (system-config): ${stderr}`);
+  }
+  const res = parseCliJson(
+    stdout,
+    "system-config"
+  );
+  if (!res.ok) {
+    guardSessionExpired(stdout, "system-config", options);
+    const parseErr = new Error(`onchainos agent system-config failed`);
+    logger.error(
+      LogEvent.ONCHAINOS_CLI_ERROR,
+      parseErr,
+      cliOkFalseExtras(stdout, "system-config")
+    );
+    throw parseErr;
+  }
+  logWithTimestamp(
+    `[onchainos] fetched system-config: ${Object.keys(res.data).length} keys`
+  );
+  return res.data;
+}
+
+// ../core/src/xmtp-sdk/onchainos/index.ts
+function isAccountAgentGroup(item) {
+  return typeof item === "object" && item !== null && Array.isArray(item.agentList);
+}
+function normalizeAgentPage(raw) {
+  const list = [];
+  for (const item of raw.list) {
+    if (isAccountAgentGroup(item)) {
+      list.push(...item.agentList);
+    } else {
+      list.push(item);
+    }
+  }
+  return { list, page: raw.page, pageSize: raw.pageSize, total: raw.total };
+}
+var lastExpiredNotifyAt = 0;
+var EXPIRED_NOTIFY_COOLDOWN_MS = 5 * 60 * 1e3;
+function notifySessionExpired(command) {
+  const now = Date.now();
+  if (now - lastExpiredNotifyAt < EXPIRED_NOTIFY_COOLDOWN_MS) {
+    return;
+  }
+  lastExpiredNotifyAt = now;
+  reportSessionExpired(command);
   const hook = XmtpService.getInstance().tools.notifySessionExpired;
   if (!hook) {
-    console.log(
+    logWithTimestamp(
       "[onchainos] tools.notifySessionExpired not injected \u2014 skipping user notice"
     );
     return;
@@ -85087,15 +85217,15 @@ function notifySessionExpired(command) {
   try {
     hook(command);
   } catch (err2) {
-    console.log("[onchainos] tools.notifySessionExpired threw:", err2);
+    logWithTimestamp("[onchainos] tools.notifySessionExpired threw:", err2);
   }
 }
-function guardSessionExpired(stdout, command) {
+function guardSessionExpired2(stdout, command) {
   if (isSessionExpired(stdout)) {
     notifySessionExpired(command);
   }
 }
-function guardCatchSessionExpired(err2, command) {
+function guardCatchSessionExpired2(err2, command) {
   const stdout = String(err2?.stdout ?? "");
   if (stdout && isSessionExpired(stdout)) {
     notifySessionExpired(command);
@@ -85152,7 +85282,7 @@ async function fetchAgentPage(page) {
         commandStatus: "rejected"
       });
     }
-    guardCatchSessionExpired(err2, "list-agents");
+    guardCatchSessionExpired2(err2, "list-agents");
     throw err2;
   }
   logAgentListResponse({
@@ -85168,7 +85298,7 @@ async function fetchAgentPage(page) {
     { page: String(page), pageSize: String(PAGE_SIZE) }
   );
   if (!res.ok) {
-    guardSessionExpired(stdout, "list-agents");
+    guardSessionExpired2(stdout, "list-agents");
     const parseErr = new Error("onchainos agent get failed");
     logger.error(
       LogEvent.ONCHAINOS_CLI_ERROR,
@@ -85187,7 +85317,7 @@ var ONCHAINOS_CHAIN_INDEX = "196";
 async function fetchAgentsByIds(agentIds) {
   const requested = [...new Set(agentIds.filter(Boolean))];
   if (requested.length > 0) {
-    console.log(
+    logWithTimestamp(
       `[onchainos] executing: onchainos agent get --agent-ids ${requested.join(",")}`
     );
     let stdout;
@@ -85200,11 +85330,11 @@ async function fetchAgentsByIds(agentIds) {
         requested.join(",")
       ]));
     } catch (err2) {
-      guardCatchSessionExpired(err2, "get-agents-by-ids");
+      guardCatchSessionExpired2(err2, "get-agents-by-ids");
       throw err2;
     }
     if (stderr) {
-      console.log(`[onchainos] stderr (get-agents-by-ids): ${stderr}`);
+      logWithTimestamp(`[onchainos] stderr (get-agents-by-ids): ${stderr}`);
     }
     const res = parseCliJson(
       stdout,
@@ -85212,7 +85342,7 @@ async function fetchAgentsByIds(agentIds) {
       { agentIds: requested.join(",") }
     );
     if (!res.ok) {
-      guardSessionExpired(stdout, "get-agents-by-ids");
+      guardSessionExpired2(stdout, "get-agents-by-ids");
       const parseErr = new Error("onchainos agent get --agent-ids failed");
       logger.error(
         LogEvent.ONCHAINOS_CLI_ERROR,
@@ -85237,7 +85367,7 @@ async function fetchAgentsByIds(agentIds) {
   return result;
 }
 async function fetchAgentByAddress(communicationAddress) {
-  console.log(
+  logWithTimestamp(
     `[onchainos] executing: onchainos agent get-by-address --communication-address ${communicationAddress} --chain-index ${ONCHAINOS_CHAIN_INDEX}`
   );
   let stdout;
@@ -85252,11 +85382,11 @@ async function fetchAgentByAddress(communicationAddress) {
       ONCHAINOS_CHAIN_INDEX
     ]));
   } catch (err2) {
-    guardCatchSessionExpired(err2, "get-agent-by-address");
+    guardCatchSessionExpired2(err2, "get-agent-by-address");
     throw err2;
   }
   if (stderr) {
-    console.log(`[onchainos] stderr (get-agent-by-address): ${stderr}`);
+    logWithTimestamp(`[onchainos] stderr (get-agent-by-address): ${stderr}`);
   }
   const res = parseCliJson(
     stdout,
@@ -85264,7 +85394,7 @@ async function fetchAgentByAddress(communicationAddress) {
     { communicationAddress, chainIndex: ONCHAINOS_CHAIN_INDEX }
   );
   if (!res.ok) {
-    guardSessionExpired(stdout, "get-agent-by-address");
+    guardSessionExpired2(stdout, "get-agent-by-address");
     const parseErr = new Error("onchainos agent get-by-address failed");
     logger.error(
       LogEvent.ONCHAINOS_CLI_ERROR,
@@ -85303,7 +85433,7 @@ async function listAllAgentsWithMetadata(previousFingerprint) {
   const changed = previousFingerprint === void 0 || previousFingerprint !== fingerprint;
   const stderrLines = stderrs.map(filterNoisyAgentIdentityLog).filter((line) => line.length > 0);
   for (const line of stderrLines) {
-    console.log(`[onchainos] stderr (${line})`);
+    logWithTimestamp(`[onchainos] stderr (${line})`);
   }
   return {
     allAgents: agents,
@@ -85331,11 +85461,11 @@ function filterNoisyAgentIdentityLog(stderr) {
 }
 async function notifyAgentsWakeup(agentIds) {
   if (agentIds.length === 0) {
-    console.log("[onchainos] wakeup-notify: agentIds empty, skipping");
+    logWithTimestamp("[onchainos] wakeup-notify: agentIds empty, skipping");
     return;
   }
   const ids = agentIds.join(",");
-  console.log(`[onchainos] sending wakeup-notify (agent-ids=${ids})`);
+  logWithTimestamp(`[onchainos] sending wakeup-notify (agent-ids=${ids})`);
   try {
     const { stderr } = await exec([
       "agent",
@@ -85344,19 +85474,19 @@ async function notifyAgentsWakeup(agentIds) {
       ids
     ]);
     if (stderr) {
-      console.log(`[onchainos] stderr (wakeup-notify): ${stderr}`);
+      logWithTimestamp(`[onchainos] stderr (wakeup-notify): ${stderr}`);
     }
-    console.log(`[onchainos] wakeup-notify succeeded (agent-ids=${ids})`);
+    logWithTimestamp(`[onchainos] wakeup-notify succeeded (agent-ids=${ids})`);
   } catch (err2) {
-    guardCatchSessionExpired(err2, "wakeup-notify");
-    console.log(
+    guardCatchSessionExpired2(err2, "wakeup-notify");
+    logWithTimestamp(
       `[onchainos] wakeup-notify failed (agent-ids=${ids}):`,
       err2?.message ?? err2
     );
   }
 }
 async function sendHeartbeat(chainIndex) {
-  console.log(`[onchainos] sending heartbeat (chain-index=${chainIndex})`);
+  logWithTimestamp(`[onchainos] sending heartbeat (chain-index=${chainIndex})`);
   try {
     const { stderr } = await exec([
       "agent",
@@ -85365,16 +85495,16 @@ async function sendHeartbeat(chainIndex) {
       chainIndex
     ]);
     if (stderr) {
-      console.log(`[onchainos] stderr (heartbeat): ${stderr}`);
+      logWithTimestamp(`[onchainos] stderr (heartbeat): ${stderr}`);
     }
-    console.log(`[onchainos] heartbeat sent`);
+    logWithTimestamp(`[onchainos] heartbeat sent`);
   } catch (err2) {
-    guardCatchSessionExpired(err2, "heartbeat");
+    guardCatchSessionExpired2(err2, "heartbeat");
     throw err2;
   }
 }
 async function checkMessageEligible(params) {
-  console.log(
+  logWithTimestamp(
     `[onchainos] checking message-eligible: job=${params.jobId} direction=${params.direction} providerSecurityRate=${params.providerSecurityRate}`
   );
   let stdout;
@@ -85403,11 +85533,11 @@ async function checkMessageEligible(params) {
       String(params.providerSecurityRate)
     ]));
   } catch (err2) {
-    guardCatchSessionExpired(err2, "message-eligible");
+    guardCatchSessionExpired2(err2, "message-eligible");
     throw new Error("message-eligible-cli-error", { cause: err2 });
   }
   if (stderr) {
-    console.log(`[onchainos] stderr (message-eligible): ${stderr}`);
+    logWithTimestamp(`[onchainos] stderr (message-eligible): ${stderr}`);
   }
   let res;
   try {
@@ -85426,8 +85556,8 @@ async function checkMessageEligible(params) {
     throw new Error("message-eligible-json-parse-failed", { cause: err2 });
   }
   if (!res.ok) {
-    guardSessionExpired(stdout, "message-eligible");
-    console.warn(
+    guardSessionExpired2(stdout, "message-eligible");
+    warnWithTimestamp(
       `[onchainos] message-eligible ok=false: ${stdout.slice(0, 200)}`
     );
     logger.error(
@@ -85449,62 +85579,30 @@ async function checkMessageEligible(params) {
     );
     throw new Error("message-eligible-ok-false");
   }
-  console.log(
+  logWithTimestamp(
     `[onchainos] message-eligible result: eligible=${res.data.eligible}`
   );
   return res.data;
 }
-async function fetchSystemConfig() {
-  console.log(`[onchainos] fetching system-config`);
-  let stdout;
-  let stderr;
-  try {
-    ({ stdout, stderr } = await exec(["agent", "system-config"]));
-  } catch (err2) {
-    guardCatchSessionExpired(err2, "system-config");
-    throw err2;
-  }
-  if (stderr) {
-    console.log(`[onchainos] stderr (system-config): ${stderr}`);
-  }
-  const res = parseCliJson(
-    stdout,
-    "system-config"
-  );
-  if (!res.ok) {
-    guardSessionExpired(stdout, "system-config");
-    const parseErr = new Error(`onchainos agent system-config failed`);
-    logger.error(
-      LogEvent.ONCHAINOS_CLI_ERROR,
-      parseErr,
-      cliOkFalseExtras(stdout, "system-config")
-    );
-    throw parseErr;
-  }
-  console.log(
-    `[onchainos] fetched system-config: ${Object.keys(res.data).length} keys`
-  );
-  return res.data;
-}
 async function fetchSensitiveWords() {
-  console.log(`[onchainos] fetching sensitive words`);
+  logWithTimestamp(`[onchainos] fetching sensitive words`);
   let stdout;
   let stderr;
   try {
     ({ stdout, stderr } = await exec(["agent", "sensitive-words"]));
   } catch (err2) {
-    guardCatchSessionExpired(err2, "sensitive-words");
+    guardCatchSessionExpired2(err2, "sensitive-words");
     throw err2;
   }
   if (stderr) {
-    console.log(`[onchainos] stderr (sensitive-words): ${stderr}`);
+    logWithTimestamp(`[onchainos] stderr (sensitive-words): ${stderr}`);
   }
   const res = parseCliJson(
     stdout,
     "sensitive-words"
   );
   if (!res.ok) {
-    guardSessionExpired(stdout, "sensitive-words");
+    guardSessionExpired2(stdout, "sensitive-words");
     const parseErr = new Error(`onchainos agent sensitive-words failed`);
     logger.error(
       LogEvent.ONCHAINOS_CLI_ERROR,
@@ -85522,7 +85620,7 @@ async function fetchSensitiveWords() {
     }
   }
   const result = [...words];
-  console.log(
+  logWithTimestamp(
     `[onchainos] fetched ${res.data.length} sensitive word entries \u2192 ${result.length} unique words`
   );
   return result;
@@ -85640,7 +85738,7 @@ function setOpenClawWebSocketFactoryForTests(factory) {
 }
 function clearClient() {
   if (sharedClient) {
-    console.error(`${LOG_PREFIX} clear client`);
+    errorWithTimestamp(`${LOG_PREFIX} clear client`);
     sharedClient.close();
   }
   sharedClient = null;
@@ -85668,7 +85766,7 @@ async function ensureClient(timeoutMs) {
     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(
+    errorWithTimestamp(
       `${LOG_PREFIX} protocol fallback from=${firstProtocol} to=${fallbackProtocol} remainingMs=${remainingMs}: ${formatErrorMessage(err2)}`
     );
     const fallbackClient = new MinimalGatewayClient(config, fallbackProtocol);
@@ -85680,7 +85778,7 @@ async function ensureClient(timeoutMs) {
 }
 function stopOpenClawGateway() {
   if (!sharedClient) {
-    console.error(`${LOG_PREFIX} stop requested with no active client`);
+    errorWithTimestamp(`${LOG_PREFIX} stop requested with no active client`);
     return;
   }
   clearClient();
@@ -85688,12 +85786,12 @@ function stopOpenClawGateway() {
 async function callOpenClawGateway(opts) {
   const timeoutMs = opts.timeoutMs ?? DEFAULT_TIMEOUT_MS;
   const startedAt = Date.now();
-  console.error(`${LOG_PREFIX} rpc start method=${opts.method} timeoutMs=${timeoutMs}`);
+  errorWithTimestamp(`${LOG_PREFIX} rpc start method=${opts.method} timeoutMs=${timeoutMs}`);
   for (let attempt = 0; ; attempt += 1) {
     try {
       const client = await ensureClient(timeoutMs);
       const result = await client.request(opts.method, opts.params, { timeoutMs });
-      console.error(`${LOG_PREFIX} rpc ok method=${opts.method} durationMs=${Date.now() - startedAt} attempts=${attempt + 1}`);
+      errorWithTimestamp(`${LOG_PREFIX} rpc ok method=${opts.method} durationMs=${Date.now() - startedAt} attempts=${attempt + 1}`);
       return result;
     } catch (err2) {
       const message = err2 instanceof Error ? err2.message : String(err2);
@@ -85702,13 +85800,13 @@ async function callOpenClawGateway(opts) {
         clearClient();
       }
       if (isGatewayStartingError(err2) && delayMs !== void 0 && Date.now() + delayMs - startedAt < timeoutMs) {
-        console.error(
+        errorWithTimestamp(
           `${LOG_PREFIX} rpc retry method=${opts.method} attempt=${attempt + 1} delayMs=${delayMs}: ${message}`
         );
         await sleep(delayMs);
         continue;
       }
-      console.error(
+      errorWithTimestamp(
         `${LOG_PREFIX} rpc failed method=${opts.method} durationMs=${Date.now() - startedAt} attempts=${attempt + 1}: ${message}`
       );
       if (isGatewayStartingError(err2)) {
@@ -85804,7 +85902,7 @@ var MinimalGatewayClient = class {
     return this.ready && !this.closed && this.ws?.readyState === 1;
   }
   async connect(timeoutMs) {
-    console.error(
+    errorWithTimestamp(
       `${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);
@@ -85861,7 +85959,7 @@ var MinimalGatewayClient = class {
         }
       });
     });
-    console.error(`${LOG_PREFIX} hello ok instanceId=${this.instanceId} protocol=${this.protocolVersion}`);
+    errorWithTimestamp(`${LOG_PREFIX} hello ok instanceId=${this.instanceId} protocol=${this.protocolVersion}`);
   }
   request(method, params, options = {}) {
     if (method === "connect") {
@@ -85937,7 +86035,7 @@ var MinimalGatewayClient = class {
     try {
       frame = JSON.parse(String(raw));
     } catch (err2) {
-      console.error(`${LOG_PREFIX} invalid frame: ${err2 instanceof Error ? err2.message : String(err2)}`);
+      errorWithTimestamp(`${LOG_PREFIX} invalid frame: ${err2 instanceof Error ? err2.message : String(err2)}`);
       return;
     }
     if (frame.type !== "res") {
@@ -85959,7 +86057,7 @@ var MinimalGatewayClient = class {
     pending.reject(toGatewayError(frame.error));
   }
   handleClose(code2, reason) {
-    console.error(`${LOG_PREFIX} closed instanceId=${this.instanceId} code=${code2 ?? 0} reason=${reason || "no reason"}`);
+    errorWithTimestamp(`${LOG_PREFIX} closed instanceId=${this.instanceId} code=${code2 ?? 0} reason=${reason || "no reason"}`);
     this.ready = false;
     for (const [id, pending] of this.pending) {
       clearTimeout(pending.timer);
@@ -85983,7 +86081,7 @@ function readSyncedGatewayConfig(env) {
       token: synced.token
     };
   } catch (err2) {
-    console.error(`${LOG_PREFIX} failed to read synced gateway config: ${err2 instanceof Error ? err2.message : String(err2)}`);
+    errorWithTimestamp(`${LOG_PREFIX} failed to read synced gateway config: ${err2 instanceof Error ? err2.message : String(err2)}`);
     return null;
   }
 }
@@ -85994,7 +86092,7 @@ function buildConnectParams(config, instanceId, protocolVersion) {
     client: {
       id: "gateway-client",
       displayName: "okx-a2a-node",
-      version: "0.0.13-beta-d0ec14bc63-260622192924",
+      version: "0.0.13",
       platform: "node",
       mode: "backend",
       instanceId
@@ -86005,7 +86103,7 @@ function buildConnectParams(config, instanceId, protocolVersion) {
     commands: [],
     permissions: {},
     locale: Intl.DateTimeFormat().resolvedOptions().locale || "en-US",
-    userAgent: `okx-a2a-node/${"0.0.13-beta-d0ec14bc63-260622192924"}`,
+    userAgent: `okx-a2a-node/${"0.0.13"}`,
     auth: {
       ...config.token ? { token: config.token } : {},
       ...config.password ? { password: config.password } : {}
@@ -86130,313 +86228,6 @@ function safeDecode(value) {
   }
 }
 
-// src/openclaw-route.ts
-var import_node_fs13 = require("node:fs");
-var import_node_os5 = require("node:os");
-var import_node_path17 = require("node:path");
-var OPENCLAW_GATEWAY_ROUTE_GROUP_ID = "__openclaw_gateway_route__";
-var CURRENT_GATEWAY_SESSION_KEYS_ENV = "OKX_A2A_CURRENT_GATEWAY_SESSION_KEYS";
-var NON_DELIVERY_CHANNELS = /* @__PURE__ */ new Set(["heartbeat", "cron", "webhook", "voice"]);
-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 null;
-}
-function bindOpenClawGatewayRouteFromEnv(store, input, env = process.env) {
-  const jobId = normalizeText(input.jobId);
-  if (!jobId) {
-    return null;
-  }
-  let routes = readOpenClawRouteEntries(store, jobId);
-  let firstBound = null;
-  for (const candidate of currentOpenClawGatewaySessionCandidates(env, input.gatewaySessionKeys)) {
-    if (!candidate.ok) {
-      logOpenClawRouteSkip(candidate.reason, {
-        jobId,
-        sessionKey: candidate.sessionKey,
-        existingRoute: resolveOpenClawGatewayRoute(store, { jobId })
-      });
-      continue;
-    }
-    const channel = channelFromOpenClawGatewaySessionKey(candidate.sessionKey);
-    if (!channel) {
-      logOpenClawRouteSkip("invalid_gateway_session_key", {
-        jobId,
-        sessionKey: candidate.sessionKey,
-        existingRoute: resolveOpenClawGatewayRoute(store, { jobId })
-      });
-      continue;
-    }
-    const existingRoute = routes.find((route2) => route2.platform === channel) ?? null;
-    const route = existingRoute ?? buildOpenClawRouteEntry(candidate.sessionKey, channel);
-    routes = persistOpenClawRouteBinding(routes, route);
-    firstBound ??= route.sessionKey;
-  }
-  if (firstBound) {
-    const binding = store.setJobProviderGatewayRoutes({ jobId, provider: "openclaw", routes });
-    if (binding.provider !== "openclaw") {
-      return null;
-    }
-    return firstBound;
-  }
-  return resolveOpenClawGatewayRoute(store, { jobId })?.sessionKey ?? null;
-}
-function currentOpenClawGatewaySessionCandidates(env = process.env, explicitSessionKeys) {
-  const platform = normalizeText(env.OKX_A2A_CURRENT_GATEWAY_PLATFORM);
-  const chatId = normalizeText(env.OKX_A2A_CURRENT_GATEWAY_CHAT_ID);
-  const threadId = normalizeText(env.OKX_A2A_CURRENT_GATEWAY_THREAD_ID);
-  const rawKeys = [
-    ...Array.isArray(explicitSessionKeys) ? explicitSessionKeys : [],
-    ...readGatewaySessionKeysEnv(env),
-    normalizeText(env.OKX_A2A_CURRENT_GATEWAY_SESSION_KEY),
-    platform && chatId ? deriveOpenClawGatewaySessionKey({ platform, chatId, threadId }) : null,
-    normalizeText(env.OKX_A2A_CURRENT_SESSION_KEY),
-    ...readSingleActiveOriginSessionKey(env)
-  ];
-  const seen = /* @__PURE__ */ new Set();
-  const candidates = [];
-  for (const key of rawKeys) {
-    const normalized = normalizeText(key);
-    if (!normalized || seen.has(normalized)) {
-      continue;
-    }
-    seen.add(normalized);
-    candidates.push(validateOpenClawGatewaySessionKey(normalized));
-  }
-  if (candidates.length > 0) {
-    return candidates;
-  }
-  return [{ ok: false, reason: "missing_gateway_session_key" }];
-}
-function resolveOpenClawGatewayRoute(store, input) {
-  return resolveOpenClawGatewayRoutes(store, input)[0] ?? null;
-}
-function resolveOpenClawGatewayRoutes(store, input) {
-  const jobId = normalizeText(input.jobId) ?? inferJobIdFromSessionKey2(normalizeText(input.sessionKey));
-  if (jobId) {
-    return readOpenClawRouteEntries(store, jobId).map((route) => toOpenClawGatewayRoute(route, jobId));
-  }
-  return [];
-}
-function isValidOpenClawGatewaySessionKey(sessionKey) {
-  return validateOpenClawGatewaySessionKey(sessionKey).ok;
-}
-function buildOpenClawRouteEntry(sessionKey, channel) {
-  const parsed = parseOpenClawGatewaySessionKey(sessionKey);
-  return {
-    platform: channel,
-    sessionKey,
-    gatewaySessionKey: sessionKey,
-    ...parsed.chatId ? { chatId: parsed.chatId } : {},
-    ...parsed.threadId ? { threadId: parsed.threadId } : {},
-    updatedAt: (/* @__PURE__ */ new Date()).toISOString()
-  };
-}
-function persistOpenClawRouteBinding(routes, route) {
-  const nextRoute = {
-    ...route,
-    updatedAt: (/* @__PURE__ */ new Date()).toISOString()
-  };
-  if (routes.some((existing) => existing.platform === nextRoute.platform)) {
-    return routes;
-  }
-  return [...routes, nextRoute];
-}
-function toOpenClawGatewayRoute(route, jobId) {
-  const sessionKey = route.gatewaySessionKey || route.sessionKey;
-  return {
-    sessionKey,
-    jobId,
-    routeSessionKey: route.sessionKey,
-    updatedAt: route.updatedAt ?? "",
-    channel: route.platform
-  };
-}
-function readOpenClawRouteEntries(store, jobId) {
-  const binding = store?.getJobProviderBinding(jobId);
-  if (binding?.provider !== "openclaw") {
-    return [];
-  }
-  const routes = binding.gatewayRoutes ?? [];
-  const seenChannels = /* @__PURE__ */ new Set();
-  const validRoutes = [];
-  for (const route of routes) {
-    const sessionKey = normalizeText(route.gatewaySessionKey) ?? normalizeText(route.sessionKey);
-    const channel = channelFromOpenClawGatewaySessionKey(sessionKey);
-    if (!sessionKey || !channel || seenChannels.has(channel)) {
-      continue;
-    }
-    seenChannels.add(channel);
-    validRoutes.push({
-      platform: channel,
-      sessionKey: route.sessionKey,
-      gatewaySessionKey: sessionKey,
-      ...route.chatId ? { chatId: route.chatId } : {},
-      ...route.threadId ? { threadId: route.threadId } : {},
-      ...route.updatedAt ? { updatedAt: route.updatedAt } : {}
-    });
-  }
-  return validRoutes;
-}
-function parseOpenClawGatewaySessionKey(sessionKey) {
-  const parts = sessionKey.split(":");
-  if (parts.length < 4 || parts[0] !== "agent") {
-    return {};
-  }
-  const platform = parts[2];
-  const targetKind = parts[3];
-  if (platform === "discord" && targetKind === "thread") {
-    return {
-      ...parts[4] ? { chatId: parts[4] } : {},
-      ...parts[5] ? { threadId: parts[5] } : {}
-    };
-  }
-  if (platform === "discord" && targetKind === "channel") {
-    return parts[4] ? { chatId: parts[4] } : {};
-  }
-  if (platform === "discord" && targetKind === "dm") {
-    return parts[4] ? { chatId: parts[4] } : {};
-  }
-  if (platform === "telegram" && targetKind === "direct") {
-    return parts[4] ? { chatId: parts[4] } : {};
-  }
-  if (platform === "telegram" && targetKind === "group") {
-    return {
-      ...parts[4] ? { chatId: parts[4] } : {},
-      ...parts[6] ? { threadId: parts[6] } : {}
-    };
-  }
-  return {};
-}
-function validateOpenClawGatewaySessionKey(sessionKey) {
-  const key = normalizeText(sessionKey);
-  if (!key) {
-    return { ok: false, reason: "missing_gateway_session_key" };
-  }
-  if (key.startsWith("backup:")) {
-    return { ok: false, reason: "internal_gateway_session_key", sessionKey: key };
-  }
-  if (key === "agent:main") {
-    return { ok: true, sessionKey: key };
-  }
-  const parts = key.split(":");
-  if (parts.length < 4 || parts[0] !== "agent" || !parts[1]) {
-    return { ok: false, reason: "invalid_gateway_session_key", sessionKey: key };
-  }
-  const platform = parts[2];
-  if (!platform || platform === "okx-a2a" || NON_DELIVERY_CHANNELS.has(platform)) {
-    return { ok: false, reason: "internal_gateway_session_key", sessionKey: key };
-  }
-  return { ok: true, sessionKey: key };
-}
-function channelFromOpenClawGatewaySessionKey(sessionKey) {
-  const key = normalizeText(sessionKey);
-  if (!key) {
-    return null;
-  }
-  if (key === "agent:main") {
-    return "main";
-  }
-  const validation = validateOpenClawGatewaySessionKey(key);
-  if (!validation.ok) {
-    return null;
-  }
-  return key.split(":")[2] ?? null;
-}
-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}`;
-  }
-  return threadId ? `agent:main:${input.platform}:thread:${chatId}:${threadId}` : `agent:main:${input.platform}:dm:${chatId}`;
-}
-function readGatewaySessionKeysEnv(env) {
-  const raw = normalizeText(env[CURRENT_GATEWAY_SESSION_KEYS_ENV]);
-  if (!raw) {
-    return [];
-  }
-  try {
-    const parsed = JSON.parse(raw);
-    if (Array.isArray(parsed)) {
-      return parsed.filter((item) => typeof item === "string" && item.trim().length > 0);
-    }
-  } catch {
-  }
-  return raw.split(",").map((item) => item.trim()).filter(Boolean);
-}
-function readSingleActiveOriginSessionKey(env) {
-  const path = (0, import_node_path17.join)(resolveTaskHome2(env), "run", "gateway-route-origins.json");
-  if (!(0, import_node_fs13.existsSync)(path)) {
-    return [];
-  }
-  try {
-    const parsed = JSON.parse((0, import_node_fs13.readFileSync)(path, "utf8"));
-    if (!isRecord2(parsed) || !Array.isArray(parsed.origins)) {
-      return [];
-    }
-    const now = Date.now();
-    const valid = parsed.origins.filter((item) => isRecord2(item)).map((item) => ({
-      sessionKey: normalizeText(typeof item.sessionKey === "string" ? item.sessionKey : null),
-      count: typeof item.count === "number" && Number.isFinite(item.count) ? item.count : 0,
-      updatedAt: typeof item.updatedAt === "number" && Number.isFinite(item.updatedAt) ? item.updatedAt : 0
-    })).filter((item) => item.sessionKey && item.count > 0 && now - item.updatedAt <= ACTIVE_ORIGIN_TTL_MS && validateOpenClawGatewaySessionKey(item.sessionKey).ok);
-    const sessionKeys = [...new Set(valid.map((item) => item.sessionKey).filter(Boolean))];
-    return sessionKeys.length === 1 ? sessionKeys : [];
-  } catch (err2) {
-    console.error(
-      `[openclaw-route] failed to read active gateway route origin state: ${err2 instanceof Error ? err2.message : String(err2)}`
-    );
-    return [];
-  }
-}
-function resolveTaskHome2(env) {
-  return env.OKX_AGENT_TASK_HOME?.trim() || (0, import_node_path17.join)((0, import_node_os5.homedir)(), ".okx-agent-task");
-}
-function logOpenClawRouteSkip(reason, input) {
-  if (reason === "missing_gateway_session_key") {
-    return;
-  }
-  console.error(
-    `[openclaw-route] skipped gateway route bind reason=${reason} jobId=${input.jobId} sessionKey=${input.sessionKey ?? "(none)"} existingRoute=${input.existingRoute?.sessionKey ?? "(none)"}`
-  );
-}
-function inferJobIdFromSessionKey2(sessionKey) {
-  if (!sessionKey) {
-    return null;
-  }
-  const parts = sessionKey.split(":");
-  if (parts.length >= 2 && parts[0] === "job") {
-    return safeDecode2(parts[1]);
-  }
-  if (sessionKey.startsWith("backup:")) {
-    return safeDecode2(sessionKey.slice("backup:".length));
-  }
-  const gatewayJob = /(?:^|[?&:])job=([^:&]+)/.exec(sessionKey);
-  if (gatewayJob?.[1]) {
-    return safeDecode2(gatewayJob[1]);
-  }
-  return null;
-}
-function normalizeText(value) {
-  const text = value?.trim();
-  return text ? text : null;
-}
-function isRecord2(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function safeDecode2(value) {
-  try {
-    return decodeURIComponent(value);
-  } catch {
-    return value;
-  }
-}
-
 // src/outbound-behavior.ts
 var SqliteOutboundBehavior = class {
   provider;
@@ -86524,7 +86315,7 @@ function assertLatestUserFanoutDelivered(operation, payload) {
   const result = payload;
   const dispatched = Array.isArray(result.dispatched) ? result.dispatched.length : null;
   const failed = Array.isArray(result.failed) ? result.failed.length : null;
-  if (dispatched === 0 || result.ok === false && dispatched === null) {
+  if (result.ok === false || dispatched === 0) {
     throw Object.assign(
       new Error(
         `${operation} did not deliver to any OpenClaw user session (dispatched=${dispatched ?? "unknown"} failed=${failed ?? "unknown"})`
@@ -86545,10 +86336,10 @@ var GatewayOutboundBehavior = class {
   }
   async createSession(input) {
     const gatewaySessionKey = this.resolveGatewaySessionKey(input);
-    console.error(`${GATEWAY_OUTBOUND_LOG_PREFIX} createSession sessionKey=${input.sessionKey} gatewaySessionKey=${gatewaySessionKey}`);
+    errorWithTimestamp(`${GATEWAY_OUTBOUND_LOG_PREFIX} createSession sessionKey=${input.sessionKey} gatewaySessionKey=${gatewaySessionKey}`);
     try {
       await this.gateway.callSessionsCreate({ key: gatewaySessionKey });
-      console.error(`${GATEWAY_OUTBOUND_LOG_PREFIX} createSession ok sessionKey=${input.sessionKey} gatewaySessionKey=${gatewaySessionKey}`);
+      errorWithTimestamp(`${GATEWAY_OUTBOUND_LOG_PREFIX} createSession ok sessionKey=${input.sessionKey} gatewaySessionKey=${gatewaySessionKey}`);
       logger.info(LogEvent.SESSION_CREATED, gatewayOutboundExtra("sessions.create", {
         sessionKey: input.sessionKey,
         gatewaySessionKey,
@@ -86566,7 +86357,7 @@ var GatewayOutboundBehavior = class {
   async deleteSession(input) {
     const stored = this.sessionMetaStore?.getSession(input.sessionKey);
     const gatewaySessionKey = this.resolveGatewaySessionKey(input);
-    console.error(`${GATEWAY_OUTBOUND_LOG_PREFIX} deleteSession sessionKey=${input.sessionKey} gatewaySessionKey=${gatewaySessionKey}`);
+    errorWithTimestamp(`${GATEWAY_OUTBOUND_LOG_PREFIX} deleteSession sessionKey=${input.sessionKey} gatewaySessionKey=${gatewaySessionKey}`);
     try {
       const result = await this.gateway.callDeleteSessions({
         sessionKey: input.sessionKey,
@@ -86574,7 +86365,7 @@ var GatewayOutboundBehavior = class {
         ...stored?.myAgentId ? { myAgentId: stored.myAgentId } : {},
         ...stored?.toAgentId ? { toAgentId: stored.toAgentId } : {}
       });
-      console.error(`${GATEWAY_OUTBOUND_LOG_PREFIX} deleteSession ok sessionKey=${input.sessionKey} gatewaySessionKey=${gatewaySessionKey} deleted=${result.deleted ?? "(unknown)"}`);
+      errorWithTimestamp(`${GATEWAY_OUTBOUND_LOG_PREFIX} deleteSession ok sessionKey=${input.sessionKey} gatewaySessionKey=${gatewaySessionKey} deleted=${result.deleted ?? "(unknown)"}`);
       logger.info(LogEvent.SESSION_DELETED, gatewayOutboundExtra("okx-a2a.delete_sessions", {
         sessionKey: input.sessionKey,
         gatewaySessionKey,
@@ -86590,7 +86381,7 @@ var GatewayOutboundBehavior = class {
   }
   async dispatchSessionMessage(input) {
     const gatewaySessionKey = this.resolveGatewaySessionKey(input);
-    console.error(
+    errorWithTimestamp(
       `${GATEWAY_OUTBOUND_LOG_PREFIX} dispatchSessionMessage sessionKey=${input.sessionKey} gatewaySessionKey=${gatewaySessionKey} jobId=${input.jobId ?? "(none)"} agentId=${input.agentId ?? "(none)"} messageId=${input.messageId ?? "(none)"}`
     );
     try {
@@ -86599,7 +86390,7 @@ var GatewayOutboundBehavior = class {
         message: input.content,
         ...input.messageId ? { idempotencyKey: input.messageId } : {}
       });
-      console.error(
+      errorWithTimestamp(
         `${GATEWAY_OUTBOUND_LOG_PREFIX} dispatchSessionMessage ok sessionKey=${input.sessionKey} gatewaySessionKey=${gatewaySessionKey} messageId=${input.messageId ?? "(none)"}`
       );
       logger.info(LogEvent.SESSION_DISPATCHED, gatewayOutboundExtra("sessions.send", {
@@ -86628,7 +86419,7 @@ var GatewayOutboundBehavior = class {
         jobId: input.jobId ?? null,
         messageId: input.messageId ?? null
       });
-      console.error(
+      errorWithTimestamp(
         `${GATEWAY_OUTBOUND_LOG_PREFIX} dispatchSessionMessage buffered sessionKey=${input.sessionKey} gatewaySessionKey=${gatewaySessionKey} messageId=${input.messageId ?? "(none)"}: ${err2 instanceof Error ? err2.message : String(err2)}`
       );
       logger.error(LogEvent.GATEWAY_REQUEST_FAILED, err2 instanceof Error ? err2 : new Error(String(err2)), gatewayOutboundExtra("sessions.send", {
@@ -86658,22 +86449,13 @@ var GatewayOutboundBehavior = class {
     });
   }
   async dispatchUser(input) {
-    const routed = this.resolveUserGatewaySessionKey(input);
-    if (routed) {
-      await this.dispatchUserToGatewaySession(input, routed);
-      return null;
-    }
-    console.error(
+    errorWithTimestamp(
       `${GATEWAY_OUTBOUND_LOG_PREFIX} dispatchUser latestUserSessions jobId=${input.jobId ?? "(none)"} idempotencyKey=${input.idempotencyKey ?? "(none)"}`
     );
     try {
-      const result = await this.gateway.callDispatchUserToLatestSessions({
-        content: input.userContent,
-        ...input.jobId ? { jobId: input.jobId } : {},
-        ...input.sessionKey ? { currentSessionKey: input.sessionKey } : {}
-      });
+      const result = await this.gateway.callDispatchUserToLatestSessions({ content: input.userContent });
       assertLatestUserFanoutDelivered("okx-a2a.dispatch_user", result);
-      console.error(`${GATEWAY_OUTBOUND_LOG_PREFIX} dispatchUser latestUserSessions ok`);
+      errorWithTimestamp(`${GATEWAY_OUTBOUND_LOG_PREFIX} dispatchUser latestUserSessions ok`);
       logger.info(LogEvent.USER_DISPATCHED, gatewayOutboundExtra("okx-a2a.dispatch_user", {
         jobId: input.jobId ?? "",
         status: "delivered"
@@ -86694,7 +86476,7 @@ var GatewayOutboundBehavior = class {
         jobId: input.jobId ?? null,
         messageId: input.idempotencyKey ?? null
       });
-      console.error(
+      errorWithTimestamp(
         `${GATEWAY_OUTBOUND_LOG_PREFIX} dispatchUser latestUserSessions buffered idempotencyKey=${input.idempotencyKey ?? "(none)"}: ${err2 instanceof Error ? err2.message : String(err2)}`
       );
       logger.error(LogEvent.USER_DISPATCH_FAILED, err2 instanceof Error ? err2 : new Error(String(err2)), gatewayOutboundExtra("okx-a2a.dispatch_user", {
@@ -86709,93 +86491,17 @@ var GatewayOutboundBehavior = class {
     }
     return null;
   }
-  resolveUserGatewaySessionKey(input) {
-    const routes = resolveOpenClawGatewayRoutes(this.sessionMetaStore, input);
-    if (routes.length > 0) {
-      return { sessionKeys: routes.map((route) => route.sessionKey), source: "stored_openclaw_routes" };
-    }
-    if (input.sessionKey?.startsWith("agent:")) {
-      return isValidOpenClawGatewaySessionKey(input.sessionKey) ? { sessionKeys: [input.sessionKey], source: "explicit_gateway_session" } : null;
-    }
-    return null;
-  }
-  async dispatchUserToGatewaySession(input, routed) {
-    const gatewaySessionKey = routed.sessionKeys.join(",");
-    console.error(
-      `${GATEWAY_OUTBOUND_LOG_PREFIX} dispatchUser routed sessionKey=${input.sessionKey ?? "(none)"} gatewaySessionKey=${gatewaySessionKey} source=${routed.source} jobId=${input.jobId ?? "(none)"} idempotencyKey=${input.idempotencyKey ?? "(none)"}`
-    );
-    try {
-      const result = await this.gateway.callDispatchUserToLatestSessions({
-        content: input.userContent,
-        label: "okx-a2a",
-        ...routed.source === "stored_openclaw_routes" ? { sessionKeys: routed.sessionKeys } : { sessionKey: routed.sessionKeys[0] }
-      });
-      assertLatestUserFanoutDelivered("okx-a2a.dispatch_user", result);
-      console.error(`${GATEWAY_OUTBOUND_LOG_PREFIX} dispatchUser routed ok gatewaySessionKey=${gatewaySessionKey} source=${routed.source}`);
-      logger.info(LogEvent.USER_DISPATCHED, gatewayOutboundExtra("okx-a2a.dispatch_user", {
-        sessionKey: input.sessionKey ?? "",
-        gatewaySessionKey,
-        jobId: input.jobId ?? "",
-        source: routed.source,
-        status: "delivered"
-      }));
-    } catch (err2) {
-      if (!this.store || !isRetryableOpenClawGatewayError(err2)) {
-        logger.error(LogEvent.USER_DISPATCH_FAILED, err2 instanceof Error ? err2 : new Error(String(err2)), gatewayOutboundExtra("okx-a2a.dispatch_user", {
-          sessionKey: input.sessionKey ?? "",
-          gatewaySessionKey,
-          jobId: input.jobId ?? "",
-          source: routed.source,
-          status: "failed"
-        }));
-        throw err2;
-      }
-      this.store.enqueuePendingGatewayDelivery({
-        kind: "chat_inject",
-        provider: this.provider,
-        sessionKey: routed.sessionKeys[0] ?? "openclaw:routed-user-sessions",
-        content: input.userContent,
-        jobId: input.jobId ?? null,
-        messageId: input.idempotencyKey ?? null
-      });
-      console.error(
-        `${GATEWAY_OUTBOUND_LOG_PREFIX} dispatchUser routed buffered gatewaySessionKey=${gatewaySessionKey} source=${routed.source} idempotencyKey=${input.idempotencyKey ?? "(none)"}: ${err2 instanceof Error ? err2.message : String(err2)}`
-      );
-      logger.error(LogEvent.USER_DISPATCH_FAILED, err2 instanceof Error ? err2 : new Error(String(err2)), gatewayOutboundExtra("okx-a2a.dispatch_user", {
-        sessionKey: input.sessionKey ?? "",
-        gatewaySessionKey,
-        jobId: input.jobId ?? "",
-        source: routed.source,
-        status: "buffered"
-      }));
-      logger.info(LogEvent.GATEWAY_DELIVERY_BUFFERED, gatewayOutboundExtra("okx-a2a.dispatch_user", {
-        sessionKey: input.sessionKey ?? "",
-        gatewaySessionKey,
-        jobId: input.jobId ?? "",
-        messageId: input.idempotencyKey ?? "",
-        source: routed.source,
-        status: "buffered"
-      }));
-    }
-  }
   async promptUser(input) {
-    const routed = this.resolveUserGatewaySessionKey(input);
-    if (routed) {
-      await this.promptUserToGatewaySession(input, routed);
-      return null;
-    }
-    console.error(
+    errorWithTimestamp(
       `${GATEWAY_OUTBOUND_LOG_PREFIX} promptUser latestUserSessions jobId=${input.jobId ?? "(none)"} idempotencyKey=${input.idempotencyKey ?? "(none)"}`
     );
     try {
       const result = await this.gateway.callPromptUserToLatestSessions({
         userContent: input.userContent,
-        llmContent: input.llmContent,
-        ...input.jobId ? { jobId: input.jobId } : {},
-        ...input.sessionKey ? { currentSessionKey: input.sessionKey } : {}
+        llmContent: input.llmContent
       });
       assertLatestUserFanoutDelivered("okx-a2a.prompt_user", result);
-      console.error(`${GATEWAY_OUTBOUND_LOG_PREFIX} promptUser latestUserSessions ok`);
+      errorWithTimestamp(`${GATEWAY_OUTBOUND_LOG_PREFIX} promptUser latestUserSessions ok`);
       logger.info(LogEvent.PROMPT_USER_CHECKPOINT, gatewayOutboundExtra("okx-a2a.prompt_user", {
         jobId: input.jobId ?? "",
         status: "delivered"
@@ -86817,7 +86523,7 @@ var GatewayOutboundBehavior = class {
         jobId: input.jobId ?? null,
         messageId: input.idempotencyKey ?? null
       });
-      console.error(
+      errorWithTimestamp(
         `${GATEWAY_OUTBOUND_LOG_PREFIX} promptUser latestUserSessions buffered idempotencyKey=${input.idempotencyKey ?? "(none)"}: ${err2 instanceof Error ? err2.message : String(err2)}`
       );
       logger.error(LogEvent.PROMPT_USER_FAILED, err2 instanceof Error ? err2 : new Error(String(err2)), gatewayOutboundExtra("okx-a2a.prompt_user", {
@@ -86832,66 +86538,6 @@ var GatewayOutboundBehavior = class {
     }
     return null;
   }
-  async promptUserToGatewaySession(input, routed) {
-    const gatewaySessionKey = routed.sessionKeys.join(",");
-    console.error(
-      `${GATEWAY_OUTBOUND_LOG_PREFIX} promptUser routed sessionKey=${input.sessionKey ?? "(none)"} gatewaySessionKey=${gatewaySessionKey} source=${routed.source} jobId=${input.jobId ?? "(none)"} idempotencyKey=${input.idempotencyKey ?? "(none)"}`
-    );
-    try {
-      const result = await this.gateway.callPromptUserToLatestSessions({
-        userContent: input.userContent,
-        llmContent: input.llmContent,
-        ...routed.source === "stored_openclaw_routes" ? { sessionKeys: routed.sessionKeys } : { sessionKey: routed.sessionKeys[0] }
-      });
-      assertLatestUserFanoutDelivered("okx-a2a.prompt_user", result);
-      console.error(`${GATEWAY_OUTBOUND_LOG_PREFIX} promptUser routed ok gatewaySessionKey=${gatewaySessionKey} source=${routed.source}`);
-      logger.info(LogEvent.PROMPT_USER_CHECKPOINT, gatewayOutboundExtra("routed_prompt_user", {
-        sessionKey: input.sessionKey ?? "",
-        gatewaySessionKey,
-        jobId: input.jobId ?? "",
-        source: routed.source,
-        status: "delivered"
-      }));
-    } catch (err2) {
-      if (!this.store || !isRetryableOpenClawGatewayError(err2)) {
-        logger.error(LogEvent.PROMPT_USER_FAILED, err2 instanceof Error ? err2 : new Error(String(err2)), gatewayOutboundExtra("routed_prompt_user", {
-          sessionKey: input.sessionKey ?? "",
-          gatewaySessionKey,
-          jobId: input.jobId ?? "",
-          source: routed.source,
-          status: "failed"
-        }));
-        throw err2;
-      }
-      this.store.enqueuePendingGatewayDelivery({
-        kind: "chat_inject",
-        provider: this.provider,
-        sessionKey: routed.sessionKeys[0] ?? "openclaw:routed-user-sessions",
-        content: input.userContent,
-        llmContent: input.llmContent,
-        jobId: input.jobId ?? null,
-        messageId: input.idempotencyKey ?? null
-      });
-      console.error(
-        `${GATEWAY_OUTBOUND_LOG_PREFIX} promptUser routed buffered gatewaySessionKey=${gatewaySessionKey} source=${routed.source} idempotencyKey=${input.idempotencyKey ?? "(none)"}: ${err2 instanceof Error ? err2.message : String(err2)}`
-      );
-      logger.error(LogEvent.PROMPT_USER_FAILED, err2 instanceof Error ? err2 : new Error(String(err2)), gatewayOutboundExtra("routed_prompt_user", {
-        sessionKey: input.sessionKey ?? "",
-        gatewaySessionKey,
-        jobId: input.jobId ?? "",
-        source: routed.source,
-        status: "buffered"
-      }));
-      logger.info(LogEvent.GATEWAY_DELIVERY_BUFFERED, gatewayOutboundExtra("routed_prompt_user", {
-        sessionKey: input.sessionKey ?? "",
-        gatewaySessionKey,
-        jobId: input.jobId ?? "",
-        messageId: input.idempotencyKey ?? "",
-        source: routed.source,
-        status: "buffered"
-      }));
-    }
-  }
 };
 function createOutboundBehavior(provider, deps) {
   if (provider === "openclaw") {
@@ -86980,27 +86626,15 @@ function resolveOutboundProvider(store, input) {
   if (input.override) {
     return input.override;
   }
-  if (input.jobId && resolveOpenClawGatewayRoute(store, { jobId: input.jobId })) {
-    return "openclaw";
-  }
   try {
-    const configured = resolveConfiguredAiProviderForJob({
+    return resolveConfiguredAiProviderForJob({
       store,
       jobId: input.jobId,
       env: process.env
-    });
-    if (configured) {
-      return configured;
-    }
+    }) ?? "codex";
   } catch {
+    return "codex";
   }
-  if (readSyncedOpenClawGatewayConfig(store.homeDir)) {
-    if (input.jobId?.trim()) {
-      return store.bindJobProviderIfMissing({ jobId: input.jobId.trim(), provider: "openclaw" }).binding.provider;
-    }
-    return "openclaw";
-  }
-  return "codex";
 }
 async function notifyAgentMessageToUserAttention(input) {
   const ownedStore = input.store ? null : new SessionStore();
@@ -87019,12 +86653,12 @@ async function notifyAgentMessageToUserAttention(input) {
       sessionKey: input.sessionKey ?? null,
       idempotencyKey
     });
-    console.log(
+    logWithTimestamp(
       `[notifyAgentMessageToUserAttention] provider=${provider} direction=${input.direction} job=${input.jobId} item=${item?.id ?? "(gateway)"}`
     );
     return item;
   } catch (err2) {
-    console.log(
+    logWithTimestamp(
       `[notifyAgentMessageToUserAttention] failed direction=${input.direction} job=${input.jobId}:`,
       err2
     );
@@ -87050,12 +86684,12 @@ async function notifySystemMessageToUser(input) {
       sessionKey: input.sessionKey ?? null,
       idempotencyKey
     });
-    console.log(
+    logWithTimestamp(
       `[notifySystemMessageToUser] provider=${provider} title=${input.title} item=${item?.id ?? "(gateway)"}`
     );
     return item;
   } catch (err2) {
-    console.log(
+    logWithTimestamp(
       `[notifySystemMessageToUser] failed title=${input.title}:`,
       err2
     );
@@ -87114,7 +86748,7 @@ function assertRecipientAvailable(agent) {
   }
 }
 function logRecipientStatusLookupFailed(context, err2) {
-  console.log(`[okx-agent-task] recipient status lookup failed, continuing (${context}):`, err2);
+  logWithTimestamp(`[okx-agent-task] recipient status lookup failed, continuing (${context}):`, err2);
 }
 function bindOutboundJobProviderToCurrentDefault(sessionStore, jobId) {
   if (!jobId || jobId === BACKUP_JOB_ID) {
@@ -87126,15 +86760,12 @@ function bindOutboundJobProviderToCurrentDefault(sessionStore, jobId) {
       jobId
     });
     if (result?.created) {
-      console.log(`[okx-agent-task] job provider bound from outbound-xmtp: job=${jobId} provider=${result.provider}`);
+      logWithTimestamp(`[okx-agent-task] job provider bound from outbound-xmtp: job=${jobId} provider=${result.provider}`);
     }
   } catch (err2) {
-    console.log(`[okx-agent-task] job provider bind failed from outbound-xmtp: job=${jobId}`, err2);
+    logWithTimestamp(`[okx-agent-task] job provider bind failed from outbound-xmtp: job=${jobId}`, err2);
   }
 }
-function bindOutboundOpenClawRouteIfCurrent(sessionStore, jobId, gatewaySessionKeys) {
-  bindOpenClawGatewayRouteFromEnv(sessionStore, { jobId, gatewaySessionKeys });
-}
 function buildTaskPayload(replyToMessageId) {
   return {
     taskMinVersion: TASK_MIN_VERSION,
@@ -87280,13 +86911,13 @@ async function assertOutboundEligible(params) {
       providerSecurityRate
     });
   } catch (err2) {
-    console.log(
+    logWithTimestamp(
       `[okx-agent-task] outbound message-eligible call failed, letting send continue: senderAgentId=${senderAgent.agentId} receiverAgentId=${receiverAgent.agentId} job=${jobId} group=${groupId}`,
       err2
     );
     return;
   }
-  console.log(
+  logWithTimestamp(
     `[okx-agent-task] outbound message-eligible: senderAgentId=${senderAgent.agentId} receiverAgentId=${receiverAgent.agentId} job=${jobId} group=${groupId} result=${JSON.stringify(result)}`
   );
   if (!result.eligible) {
@@ -87362,7 +86993,7 @@ async function refreshCachedBlockedAgentById(agentId, cached) {
     const [remote] = await fetchAgentsByIds([agentId]);
     if (remote?.agentId) {
       cacheResolvedAgent(remote);
-      console.log(
+      logWithTimestamp(
         `[okx-agent-task] refreshed blocked recipient cache by agentId=${agentId}: oldStatus=${cached.status} newStatus=${remote.status}`
       );
       return remote;
@@ -87380,7 +87011,7 @@ async function refreshCachedBlockedAgentByAddress(communicationAddress, cached)
     const remote = await fetchAgentByAddress(communicationAddress);
     if (remote?.agentId) {
       cacheResolvedAgent(remote);
-      console.log(
+      logWithTimestamp(
         `[okx-agent-task] refreshed blocked recipient cache by address=${communicationAddress}: oldStatus=${cached.status} newStatus=${remote.status}`
       );
       return remote;
@@ -87434,7 +87065,7 @@ async function resolveRemoteByAgentId(params) {
       const fallbackAgent = await resolveAgentByAddressFromCacheOrNetwork(service, fallbackAddress);
       remoteAgent = fallbackAgent ?? remoteAgent;
     } catch (err2) {
-      console.log(
+      logWithTimestamp(
         `[okx-agent-task] remote agent lookup failed for ${fallbackAddress}, continuing without receiverAgentId:`,
         err2
       );
@@ -87466,7 +87097,7 @@ async function resolveRemote(params) {
     try {
       remoteAgent = await resolveAgentByAddressFromCacheOrNetwork(service, toXmtpAddress);
     } catch (err2) {
-      console.log(
+      logWithTimestamp(
         `[okx-agent-task] remote agent lookup failed for ${toXmtpAddress}, continuing without receiverAgentId:`,
         err2
       );
@@ -87497,7 +87128,7 @@ async function resolveRemoteWithoutFile(params) {
     try {
       remoteAgent = await resolveAgentByAddressFromCacheOrNetwork(service, command.toXmtpAddress);
     } catch (err2) {
-      console.log(
+      logWithTimestamp(
         `[okx-agent-task] remote agent lookup failed for ${command.toXmtpAddress}, continuing without receiverAgentId:`,
         err2
       );
@@ -87571,7 +87202,6 @@ async function handleSqliteGroupSendCommand(params) {
         myAgentXmtpAddress: myXmtpAddress,
         toAgentXmtpAddress: remote.toXmtpAddress
       });
-      bindOutboundOpenClawRouteIfCurrent(sessionStore, command.jobId, command.gatewaySessionKeys);
       return { conversation: conversation2, created: created2 };
     }
   );
@@ -87594,7 +87224,7 @@ async function handleSqliteGroupSendCommand(params) {
     receiverAgentId: remote.remoteAgent?.agentId ?? remote.toAgentId ?? null,
     payload: buildTaskPayload(command.replyToMessageId)
   });
-  console.log(`[okx-agent-task] xmtp envelope ${rawText}`);
+  logWithTimestamp(`[okx-agent-task] xmtp envelope ${rawText}`);
   await conversation.send(rawText);
   const messageId = `outbound-${(0, import_node_crypto8.randomUUID)()}`;
   await notifyAgentMessageToUserAttention({
@@ -87615,7 +87245,7 @@ async function handleSqliteGroupSendCommand(params) {
     content: command.message,
     store: sessionStore
   });
-  console.log(
+  logWithTimestamp(
     `[okx-agent-task] sent xmtp message via sqlite session=${sessionKey} group=${conversation.id} created=${created}`
   );
   return { messageId };
@@ -87731,7 +87361,7 @@ async function handleGroupSendCommand(params) {
     receiverAgentId: remoteAgent?.agentId ?? session.toAgentId ?? null,
     payload: buildTaskPayload(command.replyToMessageId)
   });
-  console.log(`[okx-agent-task] xmtp envelope ${rawText}`);
+  logWithTimestamp(`[okx-agent-task] xmtp envelope ${rawText}`);
   await conversation.send(rawText);
   const now = Date.now();
   const messageId = `outbound-${(0, import_node_crypto8.randomUUID)()}`;
@@ -87898,7 +87528,7 @@ async function handleXmtpSendCommand(params) {
     const sessionStore2 = params.sessionStore ?? ownedStore2;
     try {
       bindOutboundJobProviderToCurrentDefault(sessionStore2, command.jobId);
-      bindOutboundOpenClawRouteIfCurrent(sessionStore2, command.jobId, command.gatewaySessionKeys);
+      resolveConfiguredAiProviderForJob({ store: sessionStore2, jobId: command.jobId });
       return await handleSqliteGroupSendCommand({
         command,
         service,
@@ -87912,7 +87542,7 @@ async function handleXmtpSendCommand(params) {
   const sessionStore = params.sessionStore ?? ownedStore;
   try {
     bindOutboundJobProviderToCurrentDefault(sessionStore, command.jobId);
-    bindOutboundOpenClawRouteIfCurrent(sessionStore, command.jobId, command.gatewaySessionKeys);
+    resolveConfiguredAiProviderForJob({ store: sessionStore, jobId: command.jobId });
     const { file, sessionAgentId } = await readFileForSend({
       command,
       store,
@@ -88069,7 +87699,7 @@ function startCommandProcessor(params) {
             timeoutMs: staleTimeoutMs,
             reason: "pending_expired"
           }));
-          console.log(
+          logWithTimestamp(
             `[okx-agent-task] ${command.type} command expired id=${command.id}: ${message}`
           );
           continue;
@@ -88085,7 +87715,7 @@ function startCommandProcessor(params) {
             `${command.type} command timed out after ${formatDuration2(executionTimeoutMs)}`
           );
           await commands.complete(command, result);
-          console.log(formatCommandCompleted(command, result));
+          logWithTimestamp(formatCommandCompleted(command, result));
         } catch (err2) {
           const message = err2 instanceof Error ? err2.message : String(err2);
           await commands.complete(command, {
@@ -88105,7 +87735,7 @@ function startCommandProcessor(params) {
           if (command.type === "xmtp-send") {
             await notifyCommandFailure(params, command, message);
           }
-          console.log(
+          logWithTimestamp(
             `[okx-agent-task] ${command.type} command failed id=${command.id}: ${message}`
           );
         }
@@ -88120,7 +87750,7 @@ function startCommandProcessor(params) {
           reason: "tick_exception"
         }
       );
-      console.log("[okx-agent-task] command processor tick failed:", err2);
+      logWithTimestamp("[okx-agent-task] command processor tick failed:", err2);
     } finally {
       inFlight = false;
     }
@@ -88158,7 +87788,7 @@ function startCommandProcessor(params) {
             timeoutMs: aiStaleTimeoutMs,
             reason: "pending_expired"
           }));
-          console.log(
+          logWithTimestamp(
             `[okx-agent-task] ${command.type}/${command.kind} command expired id=${command.id}: ${message}`
           );
           continue;
@@ -88182,7 +87812,7 @@ function startCommandProcessor(params) {
           reason: "tick_exception"
         }
       );
-      console.log("[okx-agent-task] AI command processor tick failed:", err2);
+      logWithTimestamp("[okx-agent-task] AI command processor tick failed:", err2);
     } finally {
       aiScanInFlight = false;
     }
@@ -88191,7 +87821,7 @@ function startCommandProcessor(params) {
     try {
       const result = await handleDaemonCommand(command, { ...params, aiRunner, commandPendingMs });
       await commands.complete(command, result);
-      console.log(formatCommandCompleted(command, result));
+      logWithTimestamp(formatCommandCompleted(command, result));
     } catch (err2) {
       const message = err2 instanceof Error ? err2.message : String(err2);
       await commands.complete(command, {
@@ -88207,7 +87837,7 @@ function startCommandProcessor(params) {
           reason: isTimeout ? "ai_timeout" : "ai_error"
         })
       );
-      console.log(
+      logWithTimestamp(
         `[okx-agent-task] ${command.type}/${command.kind} command failed id=${command.id}: ${message}`
       );
     } finally {
@@ -88488,7 +88118,7 @@ async function failStaleProcessing(commands, params, staleTimeoutMs, aiStaleTime
     if (entry.command.type === "xmtp-send") {
       await notifyCommandFailure(params, entry.command, message);
     }
-    console.log(
+    logWithTimestamp(
       `[okx-agent-task] recovered stale ${entry.command.type} command id=${entry.command.id}: ${message}`
     );
   }
@@ -88552,9 +88182,9 @@ async function notifyCommandFailure(params, command, message) {
       ].join("\n")
     });
     await notifyUserAttentionChanged(params.homeDir ?? params.sessionStore.homeDir);
-    console.log(`[okx-agent-task] queued xmtp-send failure notification todo=${item.id} command=${command.id}`);
+    logWithTimestamp(`[okx-agent-task] queued xmtp-send failure notification todo=${item.id} command=${command.id}`);
   } catch (err2) {
-    console.log(`[okx-agent-task] failed to notify xmtp-send failure command=${command.id}:`, err2);
+    logWithTimestamp(`[okx-agent-task] failed to notify xmtp-send failure command=${command.id}:`, err2);
   }
 }
 function readPositiveEnv(name2, fallback) {
@@ -88635,7 +88265,7 @@ function extractRawText(content3) {
   }
   return safeStringify(content3);
 }
-function extractXmtpSentAtMs(msg) {
+function extractXmtpSentAtMs2(msg) {
   if (typeof msg.sentAtNs === "bigint") {
     return Number(msg.sentAtNs / 1000000n);
   }
@@ -88773,12 +88403,12 @@ function bindMessageJobProviderToCurrentDefault(deps, jobId, stage = "inbound-xm
       return { allowed: true, created: false, provider: null, currentProvider };
     }
     if (result?.created) {
-      console.log(
+      logWithTimestamp(
         `[okx-agent-task:${deps.myXmtpAddress}] job provider bound from ${stage}: job=${shortenLogValue(jobId)} provider=${result.provider}`
       );
     }
     if (currentProvider && result.provider !== currentProvider) {
-      console.log(
+      logWithTimestamp(
         `[okx-agent-task:${deps.myXmtpAddress}] job provider owner differs from default at ${stage}: job=${shortenLogValue(jobId)} owner=${result.provider} default=${currentProvider}; dispatch will use owner binding`
       );
     }
@@ -88789,7 +88419,7 @@ function bindMessageJobProviderToCurrentDefault(deps, jobId, stage = "inbound-xm
       currentProvider
     };
   } catch (err2) {
-    console.log(
+    logWithTimestamp(
       `[okx-agent-task:${deps.myXmtpAddress}] job provider bind failed from ${stage}: job=${shortenLogValue(jobId)}`,
       err2
     );
@@ -88863,7 +88493,7 @@ async function maybeAllowProviderGroup(deps, chatType, conversationId) {
   try {
     await deps.allowGroup(deps.myXmtpAddress, conversationId);
   } catch (err2) {
-    console.log(
+    logWithTimestamp(
       `[okx-agent-task:${deps.myXmtpAddress}] allowGroup failed for ${conversationId}:`,
       err2
     );
@@ -88887,7 +88517,7 @@ function notifyPendingConversationToBackup(params) {
     messageId: params.messageId
   });
   void Promise.resolve(params.deps.onSessionMessage?.(event)).catch((err2) => {
-    console.log(`[okx-agent-task:${params.deps.myXmtpAddress}] pending conversation backup dispatch failed:`, err2);
+    logWithTimestamp(`[okx-agent-task:${params.deps.myXmtpAddress}] pending conversation backup dispatch failed:`, err2);
   });
 }
 function maybeNotifyInboundAgentMessage(params) {
@@ -88903,7 +88533,7 @@ function maybeNotifyInboundAgentMessage(params) {
       messageId: params.messageId,
       store: params.deps.sessionStore
     }).catch((err2) => {
-      console.log(`[okx-agent-task:${params.deps.myXmtpAddress}] system user notification failed:`, err2);
+      logWithTimestamp(`[okx-agent-task:${params.deps.myXmtpAddress}] system user notification failed:`, err2);
     });
     return;
   }
@@ -88932,7 +88562,7 @@ function maybeNotifyInboundAgentMessage(params) {
     content: content3,
     store: params.deps.sessionStore
   }).catch((err2) => {
-    console.log(`[okx-agent-task:${params.deps.myXmtpAddress}] inbound user notification failed:`, err2);
+    logWithTimestamp(`[okx-agent-task:${params.deps.myXmtpAddress}] inbound user notification failed:`, err2);
   });
 }
 function stringifySystemPayload(payload) {
@@ -89007,7 +88637,7 @@ async function isTrustedDmSender(params) {
   }
   if (!matches(trustedInboxIds)) {
     logger.info(LogEvent.INBOUND_DROP_DM_NON_SYSTEM, { ...dmExtras(), reason: "sender_not_in_system_whitelist" });
-    console.log(
+    logWithTimestamp(
       `[okx-agent-task:${myXmtpAddress}] DM sender not in system whitelist, dropping: senderInboxId=${senderInboxId || "(empty)"}`
     );
     return false;
@@ -89040,7 +88670,7 @@ async function claimedAddressMatchesSender(params) {
     });
     return !!claimedInboxId && !!senderInboxId && claimedInboxId.toLowerCase() === senderInboxId.toLowerCase();
   } catch (err2) {
-    console.log(
+    logWithTimestamp(
       `[okx-agent-task:${myXmtpAddress}] getInboxIdByIdentifier failed, blocking address check:`,
       err2
     );
@@ -89073,7 +88703,7 @@ function recordInvalidXmtpMessageBestEffort(input) {
       store.close();
     }
   } catch (err2) {
-    console.log(`${input.logTag} failed to record invalid xmtp message ${input.messageId}:`, err2);
+    logWithTimestamp(`${input.logTag} failed to record invalid xmtp message ${input.messageId}:`, err2);
   }
 }
 async function verifyInboundA2AGroupMessage(params) {
@@ -89086,13 +88716,14 @@ async function verifyInboundA2AGroupMessage(params) {
     groupId,
     messageId,
     consentState,
-    trustedSystemSender = false
+    trustedSystemSender = false,
+    timing
   } = params;
   if (!isA2AEnvelope(payload)) {
     return true;
   }
   if (trustedSystemSender) {
-    console.log(
+    logWithTimestamp(
       `[okx-agent-task:${myXmtpAddress}] trusted system/security group sender, skipping inbound policy checks: sender=${senderAddress} job=${jobId} group=${groupId}`
     );
     return true;
@@ -89100,14 +88731,20 @@ async function verifyInboundA2AGroupMessage(params) {
   const service = XmtpService.getInstance();
   const myAgent = service.getAgentByAddress(myXmtpAddress);
   const claimedAddress = readString3(payload.fromXmtpAddress);
-  if (claimedAddress && !await claimedAddressMatchesSender({
-    myXmtpAddress,
-    claimedAddress,
-    senderAddress,
-    senderInboxId,
-    messageId,
-    conversationId: groupId
-  })) {
+  let claimedAddressMatches = true;
+  if (claimedAddress) {
+    const addressCheckStartedAt = Date.now();
+    claimedAddressMatches = await claimedAddressMatchesSender({
+      myXmtpAddress,
+      claimedAddress,
+      senderAddress,
+      senderInboxId,
+      messageId,
+      conversationId: groupId
+    });
+    timing?.mark("addressCheck", addressCheckStartedAt);
+  }
+  if (claimedAddress && !claimedAddressMatches) {
     const shouldAutoDeny = consentState === import_node_bindings2.ConsentState.Unknown && (myAgent?.role === 1 /* CLIENT */ || myAgent?.role == null);
     let autoDenyAttempted = false;
     let autoDenySucceeded = false;
@@ -89115,7 +88752,9 @@ async function verifyInboundA2AGroupMessage(params) {
     if (shouldAutoDeny) {
       autoDenyAttempted = true;
       try {
+        const denyStartedAt = Date.now();
         autoDenySucceeded = await service.denyGroup(myXmtpAddress, groupId);
+        timing?.mark("autoDeny", denyStartedAt);
       } catch (err2) {
         autoDenyError = err2 instanceof Error ? err2.message : String(err2);
         logger.error(LogEvent.GROUP_CONSENT_UPDATE_FAILED, err2 instanceof Error ? err2 : new Error(String(err2)), {
@@ -89131,7 +88770,7 @@ async function verifyInboundA2AGroupMessage(params) {
         });
       }
     }
-    console.log(
+    logWithTimestamp(
       `[okx-agent-task:${myXmtpAddress}] address spoofing detected, dropping: claimed=${claimedAddress} actual=${senderAddress} autoDeny=${autoDenyAttempted ? String(autoDenySucceeded) : "skipped"}`
     );
     recordInvalidXmtpMessageBestEffort({
@@ -89159,7 +88798,8 @@ async function verifyInboundA2AGroupMessage(params) {
       action: autoDenyAttempted ? "auto-deny" : "drop",
       autoDenyAttempted: String(autoDenyAttempted),
       autoDenySucceeded: String(autoDenySucceeded),
-      autoDenyError
+      autoDenyError,
+      ...timing?.extras()
     });
     return false;
   }
@@ -89170,6 +88810,7 @@ async function verifyInboundA2AGroupMessage(params) {
     const isSenderClient = senderRole === 1 /* CLIENT */;
     const providerSecurityRate = (isSenderClient ? myAgent.securityRate : XmtpService.getInstance().getAgentStatusByAgentId(senderAgentId)?.securityRate) ?? 0;
     try {
+      const eligibilityStartedAt = Date.now();
       const result = await checkMessageEligible({
         agentId: myAgent.agentId,
         clientAgentId: isSenderClient ? senderAgentId : myAgent.agentId,
@@ -89181,11 +88822,12 @@ async function verifyInboundA2AGroupMessage(params) {
         direction: isSenderClient ? "client_to_provider" : "provider_to_client",
         providerSecurityRate
       });
-      console.log(
+      timing?.mark("eligibilityCheck", eligibilityStartedAt);
+      logWithTimestamp(
         `[okx-agent-task:${myXmtpAddress}] inbound message-eligible: senderAgentId=${senderAgentId} job=${jobId} group=${groupId} result=${JSON.stringify(result)}`
       );
       if (!result.eligible) {
-        console.log(
+        logWithTimestamp(
           `[okx-agent-task:${myXmtpAddress}] message-eligible check failed, dropping: sender=${senderAddress} job=${jobId} reason=${result.reason ?? ""}`
         );
         logger.info(LogEvent.INBOUND_BLOCKED_INELIGIBLE, {
@@ -89199,7 +88841,8 @@ async function verifyInboundA2AGroupMessage(params) {
           direction: isSenderClient ? "client_to_provider" : "provider_to_client",
           providerSecurityRate: String(providerSecurityRate),
           stage: "inbound/eligibility_check",
-          reason: result.reason ?? ""
+          reason: result.reason ?? "",
+          ...timing?.extras()
         });
         recordInvalidXmtpMessageBestEffort({
           messageId,
@@ -89216,7 +88859,7 @@ async function verifyInboundA2AGroupMessage(params) {
         return false;
       }
     } catch (err2) {
-      console.log(
+      logWithTimestamp(
         `[okx-agent-task:${myXmtpAddress}] message-eligible call failed, letting message through:`,
         err2
       );
@@ -89231,7 +88874,8 @@ async function verifyInboundA2AGroupMessage(params) {
         direction: isSenderClient ? "client_to_provider" : "provider_to_client",
         providerSecurityRate: String(providerSecurityRate),
         stage: "inbound/eligibility_check",
-        reason: "exception"
+        reason: "exception",
+        ...timing?.extras()
       });
     }
   }
@@ -89240,11 +88884,13 @@ async function verifyInboundA2AGroupMessage(params) {
     return true;
   }
   try {
+    const sensitiveStartedAt = Date.now();
     const hitWord = await service.checkSensitiveWord(content3);
+    timing?.mark("sensitiveCheck", sensitiveStartedAt);
     if (!hitWord) {
       return true;
     }
-    console.log(
+    logWithTimestamp(
       `[okx-agent-task:${myXmtpAddress}] sensitive word matched, dropping: job=${jobId} group=${groupId}`
     );
     logger.info(LogEvent.INBOUND_BLOCKED_SENSITIVE, {
@@ -89257,7 +88903,8 @@ async function verifyInboundA2AGroupMessage(params) {
       messageId,
       stage: "inbound/sensitive_check",
       reason: "sensitive_word",
-      hitWord
+      hitWord,
+      ...timing?.extras()
     });
     recordInvalidXmtpMessageBestEffort({
       messageId,
@@ -89273,7 +88920,7 @@ async function verifyInboundA2AGroupMessage(params) {
     });
     return false;
   } catch (err2) {
-    console.log(
+    logWithTimestamp(
       `[okx-agent-task:${myXmtpAddress}] checkSensitiveWord errored, letting message through:`,
       err2
     );
@@ -89286,31 +88933,44 @@ async function verifyInboundA2AGroupMessage(params) {
       conversationId: groupId,
       messageId,
       stage: "inbound/sensitive_check",
-      reason: "exception"
+      reason: "exception",
+      ...timing?.extras()
     });
   }
   return true;
 }
 async function processFileMessage(ctx, deps, options = {}) {
   const messageId = ctx.message.id ?? "";
+  const timing = createInboundTimingTracker(extractXmtpSentAtMs2(ctx.message));
   if (messageId && !tryMarkProcessed(messageId)) {
-    console.log(`[okx-agent-task:${deps.myXmtpAddress}] duplicate message ignored: ${messageId}`);
+    logWithTimestamp(`[okx-agent-task:${deps.myXmtpAddress}] duplicate message ignored: ${messageId}`);
     return false;
   }
   const { chatType, conversationId } = getConversationInfo(ctx.conversation);
+  const commonDeliveryExtras = (extra = {}) => timing.extras({
+    ...agentExtras({ walletAddress: deps.myXmtpAddress }),
+    conversationId,
+    messageId,
+    chatType,
+    ...extra
+  });
   if (chatType === "dm") {
+    const dmTrustStartedAt = Date.now();
     const trusted = await isTrustedDmSender({
       myXmtpAddress: deps.myXmtpAddress,
       senderInboxId: ctx.message.senderInboxId ?? "",
       messageId,
       conversationId
     });
+    timing.mark("dmTrustCheck", dmTrustStartedAt);
     if (!trusted) {
       return true;
     }
   }
+  const parseStartedAt = Date.now();
   const rawText = extractRawText(ctx.message.content);
   const parsed = parsePayload(rawText);
+  timing.mark("payloadParse", parseStartedAt);
   const systemNotification = chatType === "dm" && parsed.parsed ? extractSystemNotification(parsed.payload) : null;
   if (systemNotification) {
     const systemMessageId = messageId || `system-${(0, import_node_crypto9.randomUUID)()}`;
@@ -89326,7 +88986,7 @@ async function processFileMessage(ctx, deps, options = {}) {
           reason: "system_dm_missing_agent_id"
         }
       );
-      console.log(
+      logWithTimestamp(
         `[okx-agent-task:${deps.myXmtpAddress}] system DM missing agentId, dropping message=${shortenLogValue(systemMessageId)}`
       );
       return true;
@@ -89344,28 +89004,59 @@ async function processFileMessage(ctx, deps, options = {}) {
           reason: "invalid_direct_communication_payload"
         }
       );
-      console.log(
+      logWithTimestamp(
         `[okx-agent-task:${deps.myXmtpAddress}] invalid direct communication system DM, dropping message=${shortenLogValue(systemMessageId)}`
       );
       return true;
     }
+    const providerBindStartedAt = Date.now();
     const providerGate = bindMessageJobProviderToCurrentDefault(deps, systemNotification.jobId, "system-notification");
+    timing.mark("providerBind", providerBindStartedAt);
     if (!providerGate.allowed) {
       return true;
     }
+    logger.info(LogEvent.SYSTEM_NOTIFICATION_RECEIVED, {
+      ...agentExtras({ walletAddress: deps.myXmtpAddress, onchainosAgentId: systemNotification.agentId }),
+      taskId: systemNotification.jobId ?? "",
+      agentId: systemNotification.agentId ?? "",
+      providerAgentId: systemNotification.providerAgentId ?? "",
+      clientAgentId: systemNotification.clientAgentId ?? "",
+      messageId: systemMessageId,
+      systemEvent: systemNotification.event ?? "",
+      stage: "inbound/system_notification_received",
+      isDirectCommunication: String(systemNotification.isDirectCommunication),
+      providerBinding: providerGate.provider ?? "",
+      providerBindingCreated: String(providerGate.created)
+    });
+    const routeResolveStartedAt = Date.now();
     const targets = directTarget ? [{
       sessionKey: directTarget.sessionKey,
       route: "job",
       jobId: directTarget.jobId,
       agentId: directTarget.myAgentId
     }] : resolveSystemNotificationTargets(deps, systemNotification);
+    timing.mark("routeResolve", routeResolveStartedAt);
     if (directTarget) {
       upsertDirectCommunicationSession(deps, directTarget);
-      console.log(
+      logWithTimestamp(
         `[okx-agent-task:${deps.myXmtpAddress}] direct communication session prepared session=${directTarget.sessionKey} job=${shortenLogValue(directTarget.jobId)} myAgent=${directTarget.myAgentId} toAgent=${directTarget.toAgentId}`
       );
     }
     const primaryTarget = targets[0];
+    logger.info(LogEvent.SYSTEM_NOTIFICATION_ROUTED, {
+      ...agentExtras({ walletAddress: deps.myXmtpAddress, onchainosAgentId: systemNotification.agentId }),
+      taskId: systemNotification.jobId ?? "",
+      agentId: primaryTarget?.agentId ?? systemNotification.agentId ?? "",
+      providerAgentId: systemNotification.providerAgentId ?? "",
+      clientAgentId: systemNotification.clientAgentId ?? "",
+      messageId: systemMessageId,
+      sessionKey: primaryTarget?.sessionKey ?? SYSTEM_NOTIFICATION_SESSION_KEY,
+      route: primaryTarget ? `system/${primaryTarget.route}` : "system/none",
+      targetCount: String(targets.length),
+      systemEvent: systemNotification.event ?? "",
+      stage: "inbound/system_notification_routed",
+      isDirectCommunication: String(systemNotification.isDirectCommunication)
+    });
     if (!options.skipNotify) {
       maybeNotifyInboundAgentMessage({
         deps,
@@ -89377,24 +89068,40 @@ async function processFileMessage(ctx, deps, options = {}) {
       });
     }
     for (const target of targets) {
+      const dispatchStartedAt = Date.now();
       void Promise.resolve(deps.onSessionMessage?.({
         sessionKey: target.sessionKey,
         content: rawText,
         messageId: systemMessageId,
         jobId: target.jobId ?? null,
         agentId: target.agentId ?? null
-      })).catch((err2) => {
-        console.log(`[okx-agent-task:${deps.myXmtpAddress}] onSessionMessage failed:`, err2);
+      })).then(() => {
+        timing.mark("sessionDispatch", dispatchStartedAt);
+        logger.info(LogEvent.INBOUND_DELIVERED, commonDeliveryExtras({
+          taskId: target.jobId ?? "",
+          agentId: target.agentId ?? "",
+          sessionKey: target.sessionKey,
+          messageId: systemMessageId,
+          route: `system/${target.route}`,
+          stage: "inbound/system_session_dispatch",
+          dispatchTarget: deps.onSessionMessage ? "session" : "none"
+        }));
+      }).catch((err2) => {
+        logWithTimestamp(`[okx-agent-task:${deps.myXmtpAddress}] onSessionMessage failed:`, err2);
       });
-      console.log(
+      logWithTimestamp(
         `[okx-agent-task:${deps.myXmtpAddress}] session dispatch queued route=system/${target.route} session=${target.sessionKey} message=${shortenLogValue(systemMessageId)} ${summarizePayloadForLog(parsed.payload)}`
       );
     }
     return true;
   }
+  const routeStartedAt = Date.now();
   const route = routeMessage(chatType, parsed.parsed, parsed.payload);
+  timing.mark("routeResolve", routeStartedAt);
   if (route.route === "job") {
+    const providerBindStartedAt = Date.now();
     const providerGate = bindMessageJobProviderToCurrentDefault(deps, route.jobId, "inbound-xmtp");
+    timing.mark("providerBind", providerBindStartedAt);
     if (!providerGate.allowed) {
       return true;
     }
@@ -89404,12 +89111,14 @@ async function processFileMessage(ctx, deps, options = {}) {
     payload: parsed.parsed ? parsed.payload : null,
     myXmtpAddress: deps.myXmtpAddress
   }) : null;
-  const xmtpSentAtMs = extractXmtpSentAtMs(ctx.message);
+  const xmtpSentAtMs = extractXmtpSentAtMs2(ctx.message);
   let senderAddress = "";
   try {
+    const senderStartedAt = Date.now();
     senderAddress = await ctx.getSenderAddress();
+    timing.mark("senderResolve", senderStartedAt);
   } catch (err2) {
-    console.log(
+    logWithTimestamp(
       `[okx-agent-task:${deps.myXmtpAddress}] getSenderAddress failed for ${messageId || "(no-id)"}:`,
       err2
     );
@@ -89422,7 +89131,7 @@ async function processFileMessage(ctx, deps, options = {}) {
       senderInboxId: ctx.message.senderInboxId ?? ""
     });
     if (payloadObject?.msgType !== A2A_MESSAGE_TYPE && !trustedSystemSender) {
-      console.log(
+      logWithTimestamp(
         `[okx-agent-task:${deps.myXmtpAddress}] group message unsupported msgType, dropping: msgType=${String(payloadObject?.msgType ?? "(missing)")} job=${shortenLogValue(route.jobId)} group=${conversationId}`
       );
       logger.info(LogEvent.INBOUND_DROP_UNSUPPORTED_MSGTYPE, {
@@ -89436,7 +89145,8 @@ async function processFileMessage(ctx, deps, options = {}) {
         msgType: readString3(payloadObject?.msgType) ?? "",
         msgTypeType: typeof payloadObject?.msgType,
         stage: "inbound/payload_parse",
-        reason: "unsupported_msg_type"
+        reason: "unsupported_msg_type",
+        ...timing.extras()
       });
       return true;
     }
@@ -89453,7 +89163,8 @@ async function processFileMessage(ctx, deps, options = {}) {
       groupId: conversationId,
       messageId,
       consentState: ctx.conversation instanceof Group ? ctx.conversation.consentState : void 0,
-      trustedSystemSender
+      trustedSystemSender,
+      timing
     });
     if (!accepted) {
       return true;
@@ -89471,7 +89182,7 @@ async function processFileMessage(ctx, deps, options = {}) {
       localAgentRole: localAgent?.role ?? null,
       hasExistingSession: !!existingSession
     })) {
-      console.log(
+      logWithTimestamp(
         `[okx-agent-task:${deps.myXmtpAddress}] buyer inbound group kept pending: session=${sessionKey} job=${shortenLogValue(route.jobId)} group=${conversationId} consent=${String(consentState)} message=${shortenLogValue(routedMessageId)}`
       );
       logger.info(LogEvent.INBOUND_BUYER_PENDING, {
@@ -89484,7 +89195,8 @@ async function processFileMessage(ctx, deps, options = {}) {
         messageId: routedMessageId,
         consentState: String(consentState),
         stage: "inbound/buyer_pending",
-        reason: "unknown_group_without_session"
+        reason: "unknown_group_without_session",
+        ...timing.extras()
       });
       if (!options.skipNotify) {
         notifyPendingConversationToBackup({
@@ -89500,7 +89212,7 @@ async function processFileMessage(ctx, deps, options = {}) {
           idempotencyKey: `pending-conversation:${conversationId}`,
           store: deps.sessionStore
         }).catch((err2) => {
-          console.log(`[okx-agent-task:${deps.myXmtpAddress}] pending conversation user notification failed:`, err2);
+          logWithTimestamp(`[okx-agent-task:${deps.myXmtpAddress}] pending conversation user notification failed:`, err2);
         });
       }
       return true;
@@ -89514,14 +89226,29 @@ async function processFileMessage(ctx, deps, options = {}) {
       myAgentXmtpAddress: deps.myXmtpAddress,
       toAgentXmtpAddress: senderAddress || null
     });
+    const dispatchStartedAt = Date.now();
     void Promise.resolve(deps.onSessionMessage?.({
       sessionKey,
       content: rawText,
       messageId: routedMessageId,
       jobId: route.jobId,
       agentId: myAgentId
-    })).catch((err2) => {
-      console.log(`[okx-agent-task:${deps.myXmtpAddress}] onSessionMessage failed:`, err2);
+    })).then(() => {
+      timing.mark("sessionDispatch", dispatchStartedAt);
+      logger.info(LogEvent.INBOUND_DELIVERED, commonDeliveryExtras({
+        taskId: route.jobId,
+        agentId: myAgentId ?? "",
+        peerWalletAddress: senderAddress,
+        peerInboxId: ctx.message.senderInboxId ?? "",
+        peerAgentId: toAgentId ?? "",
+        sessionKey,
+        messageId: routedMessageId,
+        route: "group",
+        stage: "inbound/group_session_dispatch",
+        dispatchTarget: deps.onSessionMessage ? "session" : "none"
+      }));
+    }).catch((err2) => {
+      logWithTimestamp(`[okx-agent-task:${deps.myXmtpAddress}] onSessionMessage failed:`, err2);
     });
     if (!options.skipNotify) {
       maybeNotifyInboundAgentMessage({
@@ -89535,7 +89262,7 @@ async function processFileMessage(ctx, deps, options = {}) {
       });
     }
     void maybeAllowProviderGroup(deps, chatType, conversationId);
-    console.log(
+    logWithTimestamp(
       `[okx-agent-task:${deps.myXmtpAddress}] session dispatch queued route=group session=${sessionKey} message=${shortenLogValue(routedMessageId)} ${summarizePayloadForLog(parsed.payload)}`
     );
     return true;
@@ -89555,7 +89282,9 @@ async function processFileMessage(ctx, deps, options = {}) {
     rawText,
     payload: parsed.parsed ? parsed.payload : null
   };
+  const storeAppendStartedAt = Date.now();
   await deps.store.append(route.jobId, stored, sessionAgentId);
+  timing.mark("storeAppend", storeAppendStartedAt);
   if ((route.route === "job" || parsed.parsed && !isA2AEnvelope(stored.payload)) && !options.skipNotify) {
     const payloadObject = isPlainObject3(stored.payload) ? stored.payload : null;
     const sender = isPlainObject3(payloadObject?.sender) ? payloadObject.sender : null;
@@ -89588,17 +89317,31 @@ async function processFileMessage(ctx, deps, options = {}) {
   }
   if (route.route === "job" && !options.skipAi) {
     const jobFilePath = deps.store.jobFilePath(route.jobId, sessionAgentId);
+    const dispatchStartedAt = Date.now();
     void Promise.resolve(deps.onJobMessageStored?.({
       jobId: route.jobId,
       jobFilePath,
       sessionAgentId,
       message: stored
-    })).catch((err2) => {
-      console.log(`[okx-agent-task:${deps.myXmtpAddress}] onJobMessageStored failed:`, err2);
+    })).then(() => {
+      timing.mark("jobDispatch", dispatchStartedAt);
+      logger.info(LogEvent.INBOUND_DELIVERED, commonDeliveryExtras({
+        taskId: route.jobId,
+        peerWalletAddress: senderAddress,
+        peerInboxId: ctx.message.senderInboxId ?? "",
+        sessionAgentId: sessionAgentId ?? "",
+        messageId: stored.id,
+        route: route.route,
+        routeReason: route.routeReason,
+        stage: "inbound/job_store_dispatch",
+        dispatchTarget: deps.onJobMessageStored ? "job" : "none"
+      }));
+    }).catch((err2) => {
+      logWithTimestamp(`[okx-agent-task:${deps.myXmtpAddress}] onJobMessageStored failed:`, err2);
     });
   }
   void maybeAllowProviderGroup(deps, chatType, conversationId);
-  console.log(
+  logWithTimestamp(
     `[okx-agent-task:${deps.myXmtpAddress}] stored ${chatType} message route=${route.route} job=${shortenLogValue(route.jobId)} reason=${route.routeReason} message=${shortenLogValue(stored.id)} ${summarizePayloadForLog(stored.payload)}`
   );
   return true;
@@ -89606,16 +89349,34 @@ async function processFileMessage(ctx, deps, options = {}) {
 function createFileMessageHandler(deps) {
   return async (ctx, _next) => {
     const msg = ctx.message;
+    const inboundCtx = ctx;
+    const xmtpReceivedAtMs = Date.now();
+    const xmtpSentAtMs = extractXmtpSentAtMs2(inboundCtx.message);
+    const { chatType, conversationId } = getConversationInfo(ctx.conversation);
+    logger.info(LogEvent.INBOUND_HANDLER_ENTERED, {
+      ...agentExtras({ walletAddress: deps.myXmtpAddress }),
+      ...jobIdExtras(inboundCtx.message.content),
+      source: "live",
+      stage: "inbound/handler_entered",
+      chatType,
+      conversationId,
+      messageId: inboundCtx.message.id ?? "",
+      kind: msg.kind ?? "unknown",
+      senderInboxId: inboundCtx.message.senderInboxId ?? "",
+      xmtpSentAtMs: String(xmtpSentAtMs),
+      xmtpReceivedAtMs: String(xmtpReceivedAtMs),
+      xmtpDeliveryMs: String(safeDuration(xmtpReceivedAtMs, xmtpSentAtMs))
+    });
     if (msg.kind && msg.kind !== "application") {
       return;
     }
     try {
       const handled = await processFileMessage(ctx, deps);
       if (handled) {
-        deps.onMessageProcessed?.(extractXmtpSentAtMs(ctx.message));
+        deps.onMessageProcessed?.(extractXmtpSentAtMs2(ctx.message));
       }
     } catch (err2) {
-      console.log(`[okx-agent-task:${deps.myXmtpAddress}] process message failed:`, err2);
+      logWithTimestamp(`[okx-agent-task:${deps.myXmtpAddress}] process message failed:`, err2);
     }
   };
 }
@@ -89664,7 +89425,7 @@ function isA2AEnvelope(payload) {
 
 // ../core/src/xmtp-sdk/onchainos/signer.ts
 async function onchainosSign(agentId, keyUuid, walletAddress, message) {
-  console.log(
+  logWithTimestamp(
     `[onchainos-signer] executing: onchainos agent xmtp-sign --key-uuid ${keyUuid} --message <${message.length} chars>`
   );
   let stdout;
@@ -89686,7 +89447,7 @@ async function onchainosSign(agentId, keyUuid, walletAddress, message) {
     throw err2;
   }
   if (stderr) {
-    console.log(`[onchainos-signer] stderr: ${stderr}`);
+    logWithTimestamp(`[onchainos-signer] stderr: ${stderr}`);
   }
   const res = parseCliJson(stdout, "xmtp-sign", {
     onchainosAgentId: agentId,
@@ -89711,7 +89472,7 @@ async function onchainosSign(agentId, keyUuid, walletAddress, message) {
     );
     throw signErr;
   }
-  console.log(
+  logWithTimestamp(
     `[onchainos-signer] sign success, signature=${res.data.signature.slice(0, 20)}...`
   );
   return toBytes(res.data.signature);
@@ -89720,7 +89481,7 @@ function createOnchainosSigner(agent) {
   const address = agent.communicationAddress.toLowerCase();
   const keyUuid = agent.keyUuid;
   const agentId = agent.agentId;
-  console.log(
+  logWithTimestamp(
     `[onchainos-signer] creating signer for ${address} (keyUuid=${keyUuid})`
   );
   return {
@@ -89730,7 +89491,7 @@ function createOnchainosSigner(agent) {
       identifierKind: 0
     }),
     signMessage: async (message) => {
-      console.log(`[onchainos-signer] signing message for ${address}`);
+      logWithTimestamp(`[onchainos-signer] signing message for ${address}`);
       return await onchainosSign(agentId, keyUuid, address, message);
     }
   };
@@ -89888,10 +89649,545 @@ function userWatchEventDeliveredSentryExtra(event) {
 var environment = process.env.SENTRY_ENV === "dev" ? "dev" : "prod";
 var SENTRY_CONFIG = {
   projectName: "okx/openclaw-okx-a2a-extension",
-  release: "0.0.13-beta-d0ec14bc63-260622192924",
+  release: "0.0.13",
   environment
 };
 
+// src/forced-update.ts
+var import_node_child_process7 = require("node:child_process");
+
+// src/update-cli.ts
+var import_node_child_process6 = require("node:child_process");
+var import_promises6 = require("node:fs/promises");
+var import_node_os5 = require("node:os");
+var import_node_path17 = require("node:path");
+var UPDATE_PACKAGES = {
+  node: "@okxweb3/a2a-node",
+  openclaw: "@okxweb3/a2a-openclaw",
+  hermes: "@okxweb3/a2a-hermes"
+};
+function isPrereleaseVersion(version2) {
+  return /\d+\.\d+\.\d+-[0-9A-Za-z.-]+/.test(version2);
+}
+async function normalizeHermesOkxA2aPluginConfig(configFile = resolveHermesConfigPath()) {
+  let content3;
+  try {
+    content3 = await (0, import_promises6.readFile)(configFile, "utf8");
+  } catch (error) {
+    if (isNodeError(error) && error.code === "ENOENT") {
+      return false;
+    }
+    throw error;
+  }
+  const normalized = normalizeHermesPluginConfigContent(content3);
+  if (!normalized.changed) {
+    return false;
+  }
+  await (0, import_promises6.writeFile)(configFile, normalized.content);
+  console.log(`[update] normalized Hermes plugins.enabled okx-a2a entry in ${configFile}`);
+  return true;
+}
+function normalizeHermesPluginConfigContent(content3) {
+  const trailingNewline = content3.endsWith("\n");
+  const duplicateRepair = removeDuplicateInlineEnabledHeaders(content3.replace(/\n$/, "").split(/\n/));
+  const lines = duplicateRepair.lines;
+  let changed = duplicateRepair.changed;
+  let hasOkxA2a = false;
+  let inPlugins = false;
+  let pluginsIndent = -1;
+  let inEnabled = false;
+  let enabledIndent = -1;
+  let emittedOkxA2a = false;
+  const output = [];
+  for (const line of lines) {
+    const currentIndent = lineIndent(line);
+    const significant = line.trim() !== "" && !line.trimStart().startsWith("#");
+    const parsedListValue = parseYamlListValue(line);
+    if (inEnabled && significant && (currentIndent < enabledIndent || currentIndent === enabledIndent && !parsedListValue)) {
+      inEnabled = false;
+      emittedOkxA2a = false;
+    }
+    if (inPlugins && significant && currentIndent <= pluginsIndent && !isPluginsHeader(line)) {
+      inPlugins = false;
+      inEnabled = false;
+      emittedOkxA2a = false;
+    }
+    if (isPluginsHeader(line)) {
+      inPlugins = true;
+      pluginsIndent = currentIndent;
+      output.push(line);
+      continue;
+    }
+    if (inPlugins && isEnabledHeader(line) && currentIndent > pluginsIndent) {
+      inEnabled = true;
+      enabledIndent = currentIndent;
+      emittedOkxA2a = false;
+      output.push(line);
+      continue;
+    }
+    const inlineEnabled = inPlugins ? parseInlineEnabledList(line) : null;
+    if (inlineEnabled && currentIndent > pluginsIndent) {
+      const normalized = normalizeInlineEnabledList(inlineEnabled);
+      output.push(...normalized.lines);
+      changed ||= normalized.changed;
+      hasOkxA2a ||= normalized.hasOkxA2a;
+      continue;
+    }
+    if (inEnabled) {
+      const parsed = parsedListValue;
+      if (parsed && (parsed.value === "okx-a2a" || parsed.value === "platforms/okx-a2a")) {
+        hasOkxA2a = true;
+        if (!emittedOkxA2a) {
+          const normalized = `${parsed.indent}- okx-a2a`;
+          output.push(normalized);
+          changed ||= normalized !== line;
+          emittedOkxA2a = true;
+        } else {
+          changed = true;
+        }
+        continue;
+      }
+    }
+    output.push(line);
+  }
+  return { content: `${output.join("\n")}${trailingNewline ? "\n" : ""}`, changed, hasOkxA2a };
+}
+function removeDuplicateInlineEnabledHeaders(lines) {
+  let changed = false;
+  let inPlugins = false;
+  let pluginsIndent = -1;
+  const output = [];
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    const currentIndent = lineIndent(line);
+    const significant = line.trim() !== "" && !line.trimStart().startsWith("#");
+    if (inPlugins && significant && currentIndent <= pluginsIndent && !isPluginsHeader(line)) {
+      inPlugins = false;
+    }
+    if (isPluginsHeader(line)) {
+      inPlugins = true;
+      pluginsIndent = currentIndent;
+      output.push(line);
+      continue;
+    }
+    if (inPlugins && isEmptyInlineEnabledList(line) && hasLaterEnabledHeaderInPlugins(lines, i + 1, pluginsIndent)) {
+      changed = true;
+      continue;
+    }
+    output.push(line);
+  }
+  return { lines: output, changed };
+}
+function hasLaterEnabledHeaderInPlugins(lines, startIndex, pluginsIndent) {
+  for (let i = startIndex; i < lines.length; i++) {
+    const line = lines[i];
+    const significant = line.trim() !== "" && !line.trimStart().startsWith("#");
+    if (significant && lineIndent(line) <= pluginsIndent) {
+      return false;
+    }
+    if (isEnabledHeader(line) || parseInlineEnabledList(line)) {
+      return true;
+    }
+  }
+  return false;
+}
+function isEmptyInlineEnabledList(line) {
+  const inline = parseInlineEnabledList(line);
+  return !!inline && inline.values.length === 0;
+}
+function resolveHermesConfigPath() {
+  return (0, import_node_path17.join)(process.env.HERMES_HOME ?? (0, import_node_path17.join)((0, import_node_os5.homedir)(), ".hermes"), "config.yaml");
+}
+function lineIndent(line) {
+  const match = line.match(/^\s*/);
+  return match?.[0].length ?? 0;
+}
+function isPluginsHeader(line) {
+  return /^[\s]*plugins:[\s]*(?:#.*)?$/.test(line);
+}
+function isEnabledHeader(line) {
+  return /^[\s]*enabled:[\s]*(?:#.*)?$/.test(line);
+}
+function parseInlineEnabledList(line) {
+  const match = line.match(/^(\s*)enabled:\s*\[(.*)\]\s*(?:#.*)?$/);
+  if (!match) {
+    return null;
+  }
+  const values = (match[2] ?? "").split(",").map((value) => value.trim().replace(/^["']|["']$/g, "")).filter(Boolean);
+  return { indent: match[1] ?? "", values };
+}
+function normalizeInlineEnabledList(input) {
+  let hasOkxA2a = false;
+  const values = [];
+  for (const value of input.values) {
+    if (value === "okx-a2a" || value === "platforms/okx-a2a") {
+      hasOkxA2a = true;
+      if (!values.includes("okx-a2a")) {
+        values.push("okx-a2a");
+      }
+      continue;
+    }
+    values.push(value);
+  }
+  return {
+    lines: values.length > 0 ? [`${input.indent}enabled:`, ...values.map((value) => `${input.indent}  - ${value}`)] : [`${input.indent}enabled: []`],
+    changed: hasOkxA2a,
+    hasOkxA2a
+  };
+}
+function parseYamlListValue(line) {
+  const match = line.match(/^(\s*)-\s*(?:"([^"]*)"|'([^']*)'|([^#\s]+))(?:\s*(?:#.*)?)?$/);
+  if (!match) {
+    return null;
+  }
+  return {
+    indent: match[1] ?? "",
+    value: match[2] ?? match[3] ?? match[4] ?? ""
+  };
+}
+function isNodeError(error) {
+  return error instanceof Error && "code" in error;
+}
+async function getInstalledGatewayPluginVersion(target) {
+  if (target === "hermes") {
+    return await getInstalledHermesPluginVersion() ?? await getGlobalNpmPackageVersion(UPDATE_PACKAGES.hermes);
+  }
+  return (await getInstalledOpenClawPluginInfo()).version;
+}
+async function getInstalledOpenClawPluginInfo() {
+  let result = await runCommandCaptureOptional("openclaw", ["plugins", "list", "--json"]);
+  if (!result.ok) {
+    result = await runCommandCaptureOptional("openclaw", ["plugins", "list"]);
+  }
+  if (!result.ok) {
+    return { installed: false, version: null };
+  }
+  return parseOpenClawPluginList(result.stdout);
+}
+function parseOpenClawPluginList(output) {
+  if (!output.trim()) {
+    return { installed: false, version: null };
+  }
+  try {
+    return findOpenClawPluginInJson(JSON.parse(output));
+  } catch {
+    return {
+      installed: output.includes(UPDATE_PACKAGES.openclaw) || /(^|[\s@/])okx-a2a($|[\s@])/.test(output),
+      version: parsePackageVersionFromText(output)
+    };
+  }
+}
+function findOpenClawPluginInJson(value) {
+  if (Array.isArray(value)) {
+    for (const item of value) {
+      const found = findOpenClawPluginInJson(item);
+      if (found.installed) {
+        return found;
+      }
+    }
+    return { installed: false, version: null };
+  }
+  if (!value || typeof value !== "object") {
+    return { installed: false, version: null };
+  }
+  const record = value;
+  if (isOpenClawPluginRecord(record)) {
+    return { installed: true, version: readVersionField(record) };
+  }
+  const dependencies = record.dependencies;
+  if (dependencies && typeof dependencies === "object") {
+    const dependency = dependencies[UPDATE_PACKAGES.openclaw] ?? dependencies["okx-a2a"];
+    if (dependency && typeof dependency === "object") {
+      return { installed: true, version: readVersionField(dependency) };
+    }
+  }
+  for (const key of ["plugins", "items", "data", "installed"]) {
+    const child = record[key];
+    if (child !== void 0) {
+      const found = findOpenClawPluginInJson(child);
+      if (found.installed) {
+        return found;
+      }
+    }
+  }
+  return { installed: false, version: null };
+}
+function isOpenClawPluginRecord(record) {
+  return Object.values(record).some((value) => {
+    if (typeof value !== "string") {
+      return false;
+    }
+    return value === "okx-a2a" || value === UPDATE_PACKAGES.openclaw || value.endsWith("/okx-a2a");
+  });
+}
+function readVersionField(record) {
+  for (const key of ["version", "installedVersion", "packageVersion"]) {
+    const value = record[key];
+    if (typeof value === "string" && value.trim()) {
+      return value.trim();
+    }
+  }
+  return null;
+}
+function parsePackageVersionFromText(output) {
+  return output.match(/@okxweb3\/a2a-openclaw@([0-9A-Za-z.+-]+)/)?.[1] ?? null;
+}
+async function getInstalledHermesPluginVersion() {
+  const pluginYaml = (0, import_node_path17.join)(process.env.HERMES_HOME ?? (0, import_node_path17.join)((0, import_node_os5.homedir)(), ".hermes"), "plugins", "platforms", "okx-a2a", "plugin.yaml");
+  try {
+    const content3 = await (0, import_promises6.readFile)(pluginYaml, "utf8");
+    return parsePluginYamlVersion(content3);
+  } catch (error) {
+    if (isNodeError(error) && error.code === "ENOENT") {
+      return null;
+    }
+    throw error;
+  }
+}
+function parsePluginYamlVersion(content3) {
+  for (const line of content3.split(/\r?\n/)) {
+    const match = line.match(/^\s*version:\s*(?:"([^"]+)"|'([^']+)'|([^#\s]+))/);
+    if (match) {
+      return match[1] ?? match[2] ?? match[3] ?? null;
+    }
+  }
+  return null;
+}
+async function getGlobalNpmPackageVersion(packageName) {
+  const result = await runCommandCaptureOptional("npm", ["list", "-g", packageName, "--depth=0", "--json"]);
+  if (!result.ok) {
+    return null;
+  }
+  try {
+    const parsed = JSON.parse(result.stdout);
+    return parsed.dependencies?.[packageName]?.version ?? null;
+  } catch {
+    return null;
+  }
+}
+async function runCommandCaptureOptional(command, args) {
+  return await new Promise((resolvePromise) => {
+    const child = (0, import_node_child_process6.spawn)(command, args, { stdio: ["ignore", "pipe", "ignore"] });
+    let stdout = "";
+    child.stdout.setEncoding("utf8");
+    child.stdout.on("data", (chunk) => {
+      stdout += chunk;
+    });
+    child.on("error", () => {
+      resolvePromise({ ok: false, stdout });
+    });
+    child.on("close", (code2) => {
+      resolvePromise({ ok: code2 === 0, stdout });
+    });
+  });
+}
+
+// src/forced-update.ts
+var SEMVER_RE2 = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*)?$/;
+function normalizeSemverInput2(value) {
+  return value.trim().replace(/^v/, "");
+}
+function parseSemver2(value) {
+  const match = SEMVER_RE2.exec(normalizeSemverInput2(value));
+  if (!match) {
+    return null;
+  }
+  return {
+    major: Number(match[1]),
+    minor: Number(match[2]),
+    patch: Number(match[3]),
+    prerelease: match[4] ? match[4].split(".") : []
+  };
+}
+function comparePrereleaseId2(a, b) {
+  const aIsNumber = /^\d+$/.test(a);
+  const bIsNumber = /^\d+$/.test(b);
+  if (aIsNumber && bIsNumber) {
+    const an = Number(a);
+    const bn = Number(b);
+    return an < bn ? -1 : an > bn ? 1 : 0;
+  }
+  if (aIsNumber) {
+    return -1;
+  }
+  if (bIsNumber) {
+    return 1;
+  }
+  return a < b ? -1 : a > b ? 1 : 0;
+}
+function compareSemver2(a, b) {
+  if (a.major !== b.major) {
+    return a.major < b.major ? -1 : 1;
+  }
+  if (a.minor !== b.minor) {
+    return a.minor < b.minor ? -1 : 1;
+  }
+  if (a.patch !== b.patch) {
+    return a.patch < b.patch ? -1 : 1;
+  }
+  if (a.prerelease.length === 0 && b.prerelease.length === 0) {
+    return 0;
+  }
+  if (a.prerelease.length === 0) {
+    return 1;
+  }
+  if (b.prerelease.length === 0) {
+    return -1;
+  }
+  const len = Math.min(a.prerelease.length, b.prerelease.length);
+  for (let i = 0; i < len; i++) {
+    const diff = comparePrereleaseId2(a.prerelease[i], b.prerelease[i]);
+    if (diff !== 0) {
+      return diff;
+    }
+  }
+  if (a.prerelease.length !== b.prerelease.length) {
+    return a.prerelease.length < b.prerelease.length ? -1 : 1;
+  }
+  return 0;
+}
+function isBelowRequiredVersion(currentVersion, minVersion) {
+  const min = minVersion?.trim();
+  if (!min) {
+    return false;
+  }
+  const parsedMin = parseSemver2(min);
+  if (!parsedMin) {
+    logWithTimestamp(`[okx-agent-task] ignoring invalid forced minVersion=${min}`);
+    return false;
+  }
+  const current = currentVersion?.trim();
+  if (!current) {
+    return true;
+  }
+  const parsedCurrent = parseSemver2(current);
+  if (!parsedCurrent) {
+    logWithTimestamp(`[okx-agent-task] current version is invalid, forcing update current=${current} min=${min}`);
+    return true;
+  }
+  return compareSemver2(parsedCurrent, parsedMin) < 0;
+}
+async function ensureCommunicationMinVersions(input) {
+  const runUpdate = input.runUpdate ?? runOkxA2aForcedUpdate;
+  const cliMinVersion = input.systemConfig.minVersion.cli;
+  const currentCliVersion = input.currentCliVersion ?? "0.0.13";
+  if (isBelowRequiredVersion(currentCliVersion, cliMinVersion)) {
+    await forceUpdate({
+      target: "cli",
+      currentVersion: currentCliVersion,
+      minVersion: cliMinVersion,
+      stage: input.stage,
+      runUpdate
+    });
+    return { updated: true, target: "cli", currentVersion: currentCliVersion, minVersion: cliMinVersion };
+  }
+  const provider = resolveConfiguredAiProvider({ store: input.sessionStore, env: input.env });
+  const gatewayTarget = providerToGatewayTarget(provider);
+  if (!gatewayTarget) {
+    logWithTimestamp(`[okx-agent-task] forced minVersion gateway check skipped provider=${provider ?? "(not set)"}`);
+    return { updated: false };
+  }
+  const minVersion = input.systemConfig.minVersion[gatewayTarget];
+  if (!minVersion) {
+    return { updated: false, target: gatewayTarget };
+  }
+  const getGatewayVersion = input.getGatewayVersion ?? getInstalledGatewayPluginVersion;
+  const currentVersion = await getGatewayVersion(gatewayTarget);
+  if (!isBelowRequiredVersion(currentVersion, minVersion)) {
+    return { updated: false, target: gatewayTarget, currentVersion, minVersion };
+  }
+  await forceUpdate({
+    target: gatewayTarget,
+    currentVersion,
+    minVersion,
+    stage: input.stage,
+    runUpdate
+  });
+  return { updated: true, target: gatewayTarget, currentVersion, minVersion };
+}
+function providerToGatewayTarget(provider) {
+  return provider === "openclaw" || provider === "hermes" ? provider : null;
+}
+async function forceUpdate(input) {
+  const startedAt = Date.now();
+  logWithTimestamp(
+    `[okx-agent-task] forced update required target=${input.target} current=${input.currentVersion ?? "(unknown)"} min=${input.minVersion} stage=${input.stage}`
+  );
+  logger.info(LogEvent.FORCED_UPDATE_STARTED, forcedUpdateSentryExtra(input, startedAt, {
+    status: "started",
+    reason: "forced_update_required"
+  }));
+  try {
+    await input.runUpdate(input.target);
+    logger.info(LogEvent.FORCED_UPDATE_SUCCEEDED, forcedUpdateSentryExtra(input, startedAt, {
+      status: "succeeded",
+      reason: "update_completed"
+    }));
+  } catch (err2) {
+    const error = err2 instanceof Error ? err2 : new Error(String(err2));
+    logger.error(LogEvent.FORCED_UPDATE_FAILED, error, forcedUpdateSentryExtra(input, startedAt, {
+      status: "failed",
+      reason: "update_failed",
+      errorName: error.name,
+      errorMessage: error.message,
+      errorStack: error.stack ?? "",
+      ...forcedUpdateErrorDetails(err2)
+    }));
+    throw err2;
+  }
+}
+function forcedUpdateSentryExtra(input, startedAt, extra) {
+  return {
+    component: "node_listener",
+    stage: input.stage,
+    updateTarget: input.target,
+    currentVersion: input.currentVersion ?? "",
+    minVersion: input.minVersion,
+    durationMs: String(Date.now() - startedAt),
+    ...extra
+  };
+}
+function forcedUpdateErrorDetails(err2) {
+  if (!err2 || typeof err2 !== "object") {
+    return {};
+  }
+  const record = err2;
+  return {
+    exitCode: record.exitCode ?? record.code ?? "",
+    signal: record.signal ?? ""
+  };
+}
+function runOkxA2aForcedUpdate(target) {
+  const args = [
+    "update",
+    ...target === "cli" ? [] : [target],
+    "--release",
+    "latest",
+    "--restart",
+    "--yes"
+  ];
+  return new Promise((resolvePromise, reject) => {
+    const child = (0, import_node_child_process7.spawn)("okx-a2a", args, {
+      stdio: "inherit",
+      env: {
+        ...process.env,
+        OKX_A2A_FORCED_UPDATE_TARGET: target
+      }
+    });
+    child.on("error", reject);
+    child.on("close", (code2, signal) => {
+      if (code2 === 0) {
+        resolvePromise();
+        return;
+      }
+      reject(Object.assign(
+        new Error(`okx-a2a ${args.join(" ")} failed with ${signal ? `signal=${signal}` : `code=${code2}`}`),
+        { exitCode: code2, signal }
+      ));
+    });
+  });
+}
+
 // src/listener.ts
 var OFFLINE_REPLAY_SYNC_INTERVAL = 5;
 function shouldRunOfflineReplay(syncCount, interval = OFFLINE_REPLAY_SYNC_INTERVAL) {
@@ -89908,9 +90204,9 @@ function stopClients(service) {
   for (const [address, client] of service.getClients()) {
     try {
       client.stop();
-      console.log(`[okx-agent-task] stopped XMTP client ${address}`);
+      logWithTimestamp(`[okx-agent-task] stopped XMTP client ${address}`);
     } catch (err2) {
-      console.log(`[okx-agent-task] failed to stop XMTP client ${address}:`, err2);
+      logWithTimestamp(`[okx-agent-task] failed to stop XMTP client ${address}:`, err2);
     }
   }
 }
@@ -89918,12 +90214,12 @@ async function runListener(options = {}) {
   const paths = resolveTaskPaths(options.homeDir);
   const daemonLock = await acquireDaemonLock(paths, process.argv[1] ?? "okx-a2a");
   if (!daemonLock) {
-    console.log(
+    logWithTimestamp(
       `[okx-agent-task] another daemon is already running for home=${paths.homeDir}; exiting before starting listeners`
     );
     return;
   }
-  console.log(
+  logWithTimestamp(
     `[okx-agent-task] daemon lock acquired pid=${daemonLock.metadata.pid} lock=${paths.daemonLockPath}`
   );
   try {
@@ -89947,17 +90243,17 @@ async function runListenerWithLock(options, paths) {
           stage: "user_attention_ipc_wake",
           reason: "server_error"
         });
-        console.log("[okx-agent-task] user_attention IPC wake error:", err2);
+        logWithTimestamp("[okx-agent-task] user_attention IPC wake error:", err2);
       }
     });
-    console.log(`[okx-agent-task] user_attention IPC wake listening at ${userAttentionEvents.path}`);
+    logWithTimestamp(`[okx-agent-task] user_attention IPC wake listening at ${userAttentionEvents.path}`);
   } catch (err2) {
     logger.error(LogEvent.IPC_FAILED, err2 instanceof Error ? err2 : new Error(String(err2)), {
       component: "node_listener",
       stage: "user_attention_ipc_start",
       reason: "start_failed"
     });
-    console.log("[okx-agent-task] failed to start user_attention IPC wake; watchers will use polling fallback:", err2);
+    logWithTimestamp("[okx-agent-task] failed to start user_attention IPC wake; watchers will use polling fallback:", err2);
   }
   const watcherCoordinator = startUserAttentionWatcherCoordinator({
     store: sessionStore,
@@ -89967,16 +90263,18 @@ async function runListenerWithLock(options, paths) {
         stage: "user_attention_watcher",
         reason: "watcher_error"
       });
-      console.log("[okx-agent-task] user_attention watcher coordinator error:", err2);
+      logWithTimestamp("[okx-agent-task] user_attention watcher coordinator error:", err2);
     }
   });
-  console.log("[okx-agent-task] user_attention watcher coordinator scanning SQLite watcher state");
+  logWithTimestamp("[okx-agent-task] user_attention watcher coordinator scanning SQLite watcher state");
   const service = XmtpService.getInstance();
   service.setDataDir(paths.xmtpDir);
   service.setTools({
     listAllAgentsWithMetadata: async (previousFingerprint) => listAllAgentsWithMetadata(previousFingerprint),
     fetchSensitiveWords: async () => fetchSensitiveWords(),
-    fetchSystemConfig: async () => fetchSystemConfig(),
+    fetchSystemConfig: async () => fetchSystemConfig({
+      notifySessionExpired: (command) => service.tools.notifySessionExpired?.(command)
+    }),
     notifyAgentsWakeup: async (agentIds) => notifyAgentsWakeup(agentIds),
     createSigner: (agent) => createOnchainosSigner(agent),
     createInboundMiddleware: (deps) => createMiddlewareFromCoreDeps(store, deps, {
@@ -90007,13 +90305,23 @@ async function runListenerWithLock(options, paths) {
       }));
     }
   });
-  service.setPluginVersion("0.0.13-beta-d0ec14bc63-260622192924");
+  service.setCliVersion("0.0.13");
   await service.init();
-  const pluginVersionStatus = service.pluginVersionStatus;
-  if (pluginVersionStatus.unavailable) {
-    throw new Error(
-      `@okxweb3/a2a-node v${"0.0.13-beta-d0ec14bc63-260622192924"} is below the required minimum v${pluginVersionStatus.minVersion}`
+  const startupVersionCheck = await ensureCommunicationMinVersions({
+    systemConfig: service.getSystemConfig(),
+    sessionStore,
+    stage: "startup"
+  });
+  if (startupVersionCheck.updated) {
+    logWithTimestamp(
+      `[okx-agent-task] forced update executed during startup target=${startupVersionCheck.target}; exiting current listener so restarted daemon can take over`
     );
+    await watcherCoordinator.stop();
+    await userAttentionEvents?.close();
+    stopClients(service);
+    sessionStore.close();
+    commands.close();
+    return;
   }
   const systemConfig = service.getSystemConfig();
   if (systemConfig.sentryDsn) {
@@ -90023,17 +90331,17 @@ async function runListenerWithLock(options, paths) {
       agentPlatform: "node"
     });
   } else {
-    console.error(
+    errorWithTimestamp(
       "[okx-agent-task] system-config did not return sentryDsn; Sentry not initialized"
     );
     logger.error(LogEvent.SENTRY_INIT_SKIPPED, void 0, {
       onchainosAgentId: "*",
       reason: "system-config missing sentryDsn",
       pluginId: "@okxweb3/a2a-node",
-      pluginVersion: "0.0.13-beta-d0ec14bc63-260622192924"
+      pluginVersion: "0.0.13"
     });
   }
-  console.log(
+  logWithTimestamp(
     `[okx-agent-task] listener initialized, clients=${service.getClients().size}, home=${store.homeDir}`
   );
   let syncInFlight = false;
@@ -90050,7 +90358,7 @@ async function runListenerWithLock(options, paths) {
       const shouldReplay = shouldRunOfflineReplay(offlineReplaySyncCount);
       offlineReplaySyncCount = nextOfflineReplaySyncCount(offlineReplaySyncCount);
       if (!shouldHeartbeat) {
-        console.log("[okx-agent-task] no active agents, skipping heartbeat");
+        logWithTimestamp("[okx-agent-task] no active agents, skipping heartbeat");
       }
       const skippedTiming = { durationMs: 0 };
       const [heartbeatResult, replayResult] = await Promise.all([
@@ -90068,7 +90376,7 @@ async function runListenerWithLock(options, paths) {
           chainIndex: ONCHAINOS_CHAIN_INDEX,
           communicationClass: "onchainos_or_network"
         });
-        console.log(`[okx-agent-task] heartbeat failed duration=${heartbeatMs}ms:`, heartbeatResult.error);
+        logWithTimestamp(`[okx-agent-task] heartbeat failed duration=${heartbeatMs}ms:`, heartbeatResult.error);
       }
       if (shouldReplay && replayResult.error) {
         logger.error(LogEvent.OFFLINE_REPLAY_FAILED, replayResult.error instanceof Error ? replayResult.error : new Error(String(replayResult.error)), {
@@ -90078,10 +90386,10 @@ async function runListenerWithLock(options, paths) {
           durationMs: String(replayMs),
           communicationClass: "xmtp_replay_or_storage"
         });
-        console.log(`[okx-agent-task] offline replay failed duration=${replayMs}ms:`, replayResult.error);
+        logWithTimestamp(`[okx-agent-task] offline replay failed duration=${replayMs}ms:`, replayResult.error);
       }
       const replaySummary = shouldReplay ? replayResult.value : void 0;
-      console.log(
+      logWithTimestamp(
         `[okx-agent-task] sync tick agents=${refresh.agentCount} changed=${refresh.changed ? "yes" : "no"} added=${refresh.added.length} removed=${refresh.removed.length} replayed=${replaySummary?.replayed ?? 0}`
       );
     } catch (err2) {
@@ -90091,7 +90399,7 @@ async function runListenerWithLock(options, paths) {
         durationMs: String(Date.now() - tickStartedAt),
         reason: "sync_tick_exception"
       });
-      console.log(`[okx-agent-task] sync tick failed total=${Date.now() - tickStartedAt}ms:`, err2);
+      logWithTimestamp(`[okx-agent-task] sync tick failed total=${Date.now() - tickStartedAt}ms:`, err2);
     } finally {
       syncInFlight = false;
     }
@@ -90107,7 +90415,7 @@ async function runListenerWithLock(options, paths) {
       clearInterval(timer);
     }
     intervalSec = Math.max(10, nextIntervalSec);
-    console.log(`[okx-agent-task] scheduled sync interval ${intervalSec}s`);
+    logWithTimestamp(`[okx-agent-task] scheduled sync interval ${intervalSec}s`);
     timer = setInterval(() => {
       void syncTick();
     }, intervalSec * 1e3);
@@ -90122,9 +90430,21 @@ async function runListenerWithLock(options, paths) {
       if (stopping) {
         return;
       }
+      const versionCheck = await ensureCommunicationMinVersions({
+        systemConfig: service.getSystemConfig(),
+        sessionStore,
+        stage: "system_config_refresh"
+      });
+      if (versionCheck.updated) {
+        logWithTimestamp(
+          `[okx-agent-task] forced update executed after system-config refresh target=${versionCheck.target}; stopping current listener`
+        );
+        process.kill(process.pid, "SIGTERM");
+        return;
+      }
       const nextIntervalSec = Math.max(10, service.getSystemConfig().heartbeatInterval);
       if (nextIntervalSec !== previousIntervalSec) {
-        console.log(
+        logWithTimestamp(
           `[okx-agent-task] heartbeat interval changed from ${previousIntervalSec}s to ${nextIntervalSec}s; rescheduling sync timer`
         );
         scheduleSyncTimer(nextIntervalSec);
@@ -90135,7 +90455,7 @@ async function runListenerWithLock(options, paths) {
         stage: "system_config_refresh",
         reason: "refresh_failed"
       });
-      console.log("[okx-agent-task] system-config refresh failed:", err2);
+      logWithTimestamp("[okx-agent-task] system-config refresh failed:", err2);
     }
   };
   scheduleSyncTimer(intervalSec);
@@ -90155,9 +90475,9 @@ async function runListenerWithLock(options, paths) {
         return;
       }
       stopping = true;
-      console.log(`[okx-agent-task] received ${signal}, stopping listener`);
+      logWithTimestamp(`[okx-agent-task] received ${signal}, stopping listener`);
       const forceResolve = setTimeout(() => {
-        console.log("[okx-agent-task] listener shutdown timed out; forcing process exit");
+        logWithTimestamp("[okx-agent-task] listener shutdown timed out; forcing process exit");
         resolve4();
       }, SHUTDOWN_FORCE_RESOLVE_MS);
       void (async () => {
@@ -90175,7 +90495,7 @@ async function runListenerWithLock(options, paths) {
             stage: "user_attention_ipc_close",
             reason: "close_failed"
           });
-          console.log("[okx-agent-task] failed to close user_attention IPC wake:", err2);
+          logWithTimestamp("[okx-agent-task] failed to close user_attention IPC wake:", err2);
         }
         stopClients(service);
         sessionStore.close();
@@ -90196,117 +90516,6 @@ async function timeSettled(fn) {
     return { durationMs: Date.now() - startedAt, error };
   }
 }
-
-// src/update-cli.ts
-var import_promises6 = require("node:fs/promises");
-var import_node_os6 = require("node:os");
-var import_node_path18 = require("node:path");
-function isPrereleaseVersion(version2) {
-  return /\d+\.\d+\.\d+-[0-9A-Za-z.-]+/.test(version2);
-}
-async function normalizeHermesOkxA2aPluginConfig(configFile = resolveHermesConfigPath()) {
-  let content3;
-  try {
-    content3 = await (0, import_promises6.readFile)(configFile, "utf8");
-  } catch (error) {
-    if (isNodeError(error) && error.code === "ENOENT") {
-      return false;
-    }
-    throw error;
-  }
-  const trailingNewline = content3.endsWith("\n");
-  const lines = content3.replace(/\n$/, "").split(/\n/);
-  let changed = false;
-  let inPlugins = false;
-  let pluginsIndent = -1;
-  let inEnabled = false;
-  let enabledIndent = -1;
-  let emittedOkxA2a = false;
-  const output = [];
-  for (const line of lines) {
-    const currentIndent = lineIndent(line);
-    const significant = line.trim() !== "" && !line.trimStart().startsWith("#");
-    const parsedListValue = parseYamlListValue(line);
-    if (inEnabled && significant && (currentIndent < enabledIndent || currentIndent === enabledIndent && !parsedListValue)) {
-      inEnabled = false;
-      emittedOkxA2a = false;
-    }
-    if (inPlugins && significant && currentIndent <= pluginsIndent && !isPluginsHeader(line)) {
-      inPlugins = false;
-      inEnabled = false;
-      emittedOkxA2a = false;
-    }
-    if (isPluginsHeader(line)) {
-      inPlugins = true;
-      pluginsIndent = currentIndent;
-      output.push(line);
-      continue;
-    }
-    if (inPlugins && isEnabledHeader(line) && currentIndent > pluginsIndent) {
-      inEnabled = true;
-      enabledIndent = currentIndent;
-      emittedOkxA2a = false;
-      output.push(line);
-      continue;
-    }
-    if (inEnabled) {
-      const parsed = parsedListValue;
-      if (parsed && (parsed.value === "okx-a2a" || parsed.value === "platforms/okx-a2a")) {
-        if (!emittedOkxA2a) {
-          const normalized = `${parsed.indent}- okx-a2a`;
-          output.push(normalized);
-          changed ||= normalized !== line;
-          emittedOkxA2a = true;
-        } else {
-          changed = true;
-        }
-        continue;
-      }
-    }
-    output.push(line);
-  }
-  if (!changed) {
-    return false;
-  }
-  await (0, import_promises6.writeFile)(configFile, `${output.join("\n")}${trailingNewline ? "\n" : ""}`);
-  console.log(`[update] normalized Hermes plugins.enabled okx-a2a entry in ${configFile}`);
-  return true;
-}
-function resolveHermesConfigPath() {
-  return (0, import_node_path18.join)(process.env.HERMES_HOME ?? (0, import_node_path18.join)((0, import_node_os6.homedir)(), ".hermes"), "config.yaml");
-}
-function lineIndent(line) {
-  const match = line.match(/^\s*/);
-  return match?.[0].length ?? 0;
-}
-function isPluginsHeader(line) {
-  return /^[\s]*plugins:[\s]*(?:#.*)?$/.test(line);
-}
-function isEnabledHeader(line) {
-  return /^[\s]*enabled:[\s]*(?:#.*)?$/.test(line);
-}
-function parseYamlListValue(line) {
-  const match = line.match(/^(\s*)-\s*(?:"([^"]*)"|'([^']*)'|([^#\s]+))(?:\s*(?:#.*)?)?$/);
-  if (!match) {
-    return null;
-  }
-  return {
-    indent: match[1] ?? "",
-    value: match[2] ?? match[3] ?? match[4] ?? ""
-  };
-}
-function isNodeError(error) {
-  return error instanceof Error && "code" in error;
-}
-function parsePluginYamlVersion(content3) {
-  for (const line of content3.split(/\r?\n/)) {
-    const match = line.match(/^\s*version:\s*(?:"([^"]+)"|'([^']+)'|([^#\s]+))/);
-    if (match) {
-      return match[1] ?? match[2] ?? match[3] ?? null;
-    }
-  }
-  return null;
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AI_PROVIDERS,
@@ -90318,7 +90527,6 @@ function parsePluginYamlVersion(content3) {
   GatewayOutboundBehavior,
   InvalidXmtpMessageStore,
   OFFLINE_REPLAY_SYNC_INTERVAL,
-  OPENCLAW_GATEWAY_ROUTE_GROUP_ID,
   SYSTEM_NOTIFICATION_SESSION_KEY,
   SessionStore,
   SqliteOutboundBehavior,
@@ -90332,7 +90540,6 @@ function parsePluginYamlVersion(content3) {
   bindJobProviderToCurrentDefaultIfMissing,
   bindJobProviderToCurrentRuntimeIfMissing,
   bindMessageJobProviderToCurrentDefault,
-  bindOpenClawGatewayRouteFromEnv,
   buildAgentMessageNotice,
   buildAiAdapterCommand,
   buildAiProviderEnv,
@@ -90353,11 +90560,11 @@ function parsePluginYamlVersion(content3) {
   createFileMessageHandler,
   createOutboundBehavior,
   createUserAttentionWatchParentMonitor,
-  currentOpenClawGatewaySessionKey,
   detectAiProviders,
   detectCurrentAiProvider,
   detectGatewayInvocation,
   detectRuntime,
+  ensureCommunicationMinVersions,
   ensureDefaultAiProvider,
   extractAiSessionId,
   extractXmtpSentAtMs,
@@ -90365,6 +90572,7 @@ function parsePluginYamlVersion(content3) {
   handleXmtpSendCommand,
   hasAiRuntimeMarker,
   heartbeatUserAttentionWatcher,
+  isBelowRequiredVersion,
   isOriginalParentProcessAlive,
   isPrereleaseVersion,
   isRetryableOpenClawGatewayError,
@@ -90387,8 +90595,6 @@ function parsePluginYamlVersion(content3) {
   resolveConfiguredAiProviderForJob,
   resolveDirectCommunicationSessionTarget,
   resolveOpenClawGatewayConfig,
-  resolveOpenClawGatewayRoute,
-  resolveOpenClawGatewayRoutes,
   resolveSystemNotificationTargets,
   resolveTaskConfigPath,
   resolveTaskHome,