@okxweb3/a2a-node 0.0.16 → 0.0.17-beta-db5dca184d-260624150845

package/dist/index.js

@@ -67974,6 +67974,7 @@ __export(index_exports, {
   detectCurrentAiProvider: () => detectCurrentAiProvider,
   detectGatewayInvocation: () => detectGatewayInvocation,
   detectRuntime: () => detectRuntime,
+  ensureDaemonReady: () => ensureDaemonReady,
   ensureDefaultAiProvider: () => ensureDefaultAiProvider,
   extractAiSessionId: () => extractAiSessionId,
   extractXmtpSentAtMs: () => extractXmtpSentAtMs2,
@@ -68297,7 +68298,7 @@ var SessionStore = class {
     `);
   }
   ensurePendingGatewayDeliveriesSchema() {
-    const expectedKindCheck = "kind IN ('session_send', 'chat_inject', 'dispatch_user_latest', 'prompt_user_latest')";
+    const expectedKindCheck = this.pendingGatewayDeliveryKindCheck();
     this.db.exec(`
       CREATE TABLE IF NOT EXISTS pending_gateway_deliveries (
         id TEXT PRIMARY KEY,
@@ -68308,6 +68309,9 @@ var SessionStore = class {
         content TEXT NOT NULL,
         llm_content TEXT,
         message_id TEXT UNIQUE,
+        attention_id TEXT,
+        delivery_state_json TEXT,
+        payload_json TEXT,
         attempts INTEGER NOT NULL DEFAULT 0,
         last_error TEXT,
         created_at TEXT NOT NULL,
@@ -68315,7 +68319,7 @@ var SessionStore = class {
       )
     `);
     const row = this.db.prepare("SELECT sql FROM sqlite_master WHERE type='table' AND name='pending_gateway_deliveries'").get();
-    if (row?.sql?.includes("dispatch_user_latest")) {
+    if (row?.sql?.includes("attention_id") && row.sql.includes("delivery_state_json") && row.sql.includes("payload_json")) {
       return;
     }
     this.db.exec("ALTER TABLE pending_gateway_deliveries RENAME TO pending_gateway_deliveries_old");
@@ -68329,6 +68333,9 @@ var SessionStore = class {
         content TEXT NOT NULL,
         llm_content TEXT,
         message_id TEXT UNIQUE,
+        attention_id TEXT,
+        delivery_state_json TEXT,
+        payload_json TEXT,
         attempts INTEGER NOT NULL DEFAULT 0,
         last_error TEXT,
         created_at TEXT NOT NULL,
@@ -68338,15 +68345,19 @@ var SessionStore = class {
     this.db.exec(`
       INSERT INTO pending_gateway_deliveries (
         id, kind, provider, session_key, job_id, content, llm_content,
-        message_id, attempts, last_error, created_at, last_attempt_at
+        message_id, attention_id, delivery_state_json, payload_json,
+        attempts, last_error, created_at, last_attempt_at
       )
       SELECT
         id, kind, provider, session_key, job_id, content, llm_content,
-        message_id, attempts, last_error, created_at, last_attempt_at
+        message_id, NULL, NULL, NULL, attempts, last_error, created_at, last_attempt_at
       FROM pending_gateway_deliveries_old
     `);
     this.db.exec("DROP TABLE pending_gateway_deliveries_old");
   }
+  pendingGatewayDeliveryKindCheck() {
+    return "kind IN ('session_send', 'chat_inject', 'dispatch_user_latest', 'prompt_user_latest')";
+  }
   close() {
     this.db.close();
   }
@@ -69076,9 +69087,10 @@ var SessionStore = class {
       this.db.prepare(`
         INSERT INTO pending_gateway_deliveries (
           id, kind, provider, session_key, job_id, content, llm_content,
-          message_id, attempts, last_error, created_at, last_attempt_at
+          message_id, attention_id, delivery_state_json, payload_json,
+          attempts, last_error, created_at, last_attempt_at
         )
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?, 0, NULL, ?, NULL)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 0, NULL, ?, NULL)
       `).run(
         id,
         input.kind,
@@ -69088,6 +69100,9 @@ var SessionStore = class {
         input.content,
         input.llmContent ?? null,
         messageId,
+        input.attentionId ?? null,
+        input.deliveryStateJson ?? null,
+        input.payloadJson ?? null,
         createdAt
       );
       const row = this.getPendingGatewayDelivery(id);
@@ -69365,6 +69380,9 @@ function mapPendingGatewayDeliveryRow(row) {
     ...row.job_id ? { jobId: row.job_id } : {},
     ...row.llm_content ? { llmContent: row.llm_content } : {},
     ...row.message_id ? { messageId: row.message_id } : {},
+    ...row.attention_id ? { attentionId: row.attention_id } : {},
+    ...row.delivery_state_json ? { deliveryStateJson: row.delivery_state_json } : {},
+    ...row.payload_json ? { payloadJson: row.payload_json } : {},
     ...row.last_error ? { lastError: row.last_error } : {},
     ...row.last_attempt_at ? { lastAttemptAt: row.last_attempt_at } : {}
   };
@@ -69508,6 +69526,19 @@ async function readDaemonLock(lockPath) {
   const running = Number.isInteger(metadata.pid) && metadata.pid > 0 && isProcessAlive(metadata.pid);
   return { metadata, running, stale: !running, path: lockPath };
 }
+async function markDaemonReady(lockPath) {
+  const current = await readDaemonLock(lockPath);
+  const metadata = current.metadata;
+  if (!metadata || metadata.pid !== process.pid) {
+    return;
+  }
+  await (0, import_promises.writeFile)(ownerPath(lockPath), `${JSON.stringify({
+    ...metadata,
+    ready: true,
+    readyAt: (/* @__PURE__ */ new Date()).toISOString()
+  }, null, 2)}
+`, "utf8");
+}
 async function removeLock(lockPath) {
   await (0, import_promises.rm)(lockPath, { recursive: true, force: true });
 }
@@ -69518,7 +69549,8 @@ async function acquireDaemonLock(paths, entry) {
     cwd: process.cwd(),
     entry,
     homeDir: paths.homeDir,
-    capabilities: DAEMON_CAPABILITIES
+    capabilities: DAEMON_CAPABILITIES,
+    ready: false
   };
   ensureTaskDir(paths.runDir);
   for (let attempt = 0; attempt < 2; attempt += 1) {
@@ -69568,6 +69600,9 @@ async function chmodBestEffort(path, mode) {
 var STOP_GRACE_MS = 5e3;
 var FORCE_KILL_GRACE_MS = 5e3;
 var START_EXIT_CHECK_MS = 750;
+var DEFAULT_READY_TIMEOUT_MS = 12e4;
+var READY_POLL_MS = 250;
+var DAEMON_READY_TIMEOUT_ENV = "OKX_A2A_DAEMON_READY_TIMEOUT_MS";
 async function readPid(pidPath) {
   try {
     const raw = await (0, import_promises2.readFile)(pidPath, "utf8");
@@ -69627,12 +69662,17 @@ async function getDaemonStatus(homeDir) {
   const pid = await readPid(paths.pidPath);
   const lock = await readDaemonLock(paths.daemonLockPath);
   const lockPid = lock.metadata?.pid ?? null;
+  const lockReadyStateKnown = !!lock.metadata && (typeof lock.metadata.ready === "boolean" || typeof lock.metadata.readyAt === "string");
+  const lockReady = lockReadyStateKnown ? lock.metadata?.ready === true || typeof lock.metadata?.readyAt === "string" : true;
   if (lock.running) {
     return {
       running: true,
       pid: lockPid ?? pid,
       stale: false,
       capabilities: lock.metadata?.capabilities ?? [],
+      ready: lockReady,
+      readyAt: lock.metadata?.readyAt ?? null,
+      readyStateKnown: lockReadyStateKnown,
       pidPath: paths.pidPath,
       lockPath: paths.daemonLockPath,
       lockPid,
@@ -69645,6 +69685,9 @@ async function getDaemonStatus(homeDir) {
       pid: null,
       stale: lock.stale,
       capabilities: [],
+      ready: false,
+      readyAt: null,
+      readyStateKnown: false,
       pidPath: paths.pidPath,
       lockPath: paths.daemonLockPath,
       lockPid,
@@ -69657,6 +69700,9 @@ async function getDaemonStatus(homeDir) {
     pid,
     stale: !running || lock.stale,
     capabilities: running ? lock.metadata?.capabilities ?? [] : [],
+    ready: running && !lockReadyStateKnown ? true : running && lockReady,
+    readyAt: running ? lock.metadata?.readyAt ?? null : null,
+    readyStateKnown: running && lockReadyStateKnown,
     pidPath: paths.pidPath,
     lockPath: paths.daemonLockPath,
     lockPid,
@@ -69722,6 +69768,9 @@ async function startDaemon(homeDir) {
     pid: child.pid ?? null,
     stale: false,
     capabilities: DAEMON_CAPABILITIES,
+    ready: false,
+    readyAt: null,
+    readyStateKnown: true,
     pidPath: paths.pidPath,
     lockPath: paths.daemonLockPath,
     lockPid: child.pid ?? null,
@@ -69765,6 +69814,9 @@ async function stopDaemon(homeDir) {
       pid: current.pid,
       stale: false,
       capabilities: [],
+      ready: false,
+      readyAt: null,
+      readyStateKnown: false,
       pidPath: paths.pidPath,
       lockPath: paths.daemonLockPath,
       lockPid: current.lockPid,
@@ -69788,6 +69840,9 @@ async function stopDaemon(homeDir) {
     pid: current.pid,
     stale: false,
     capabilities: exited ? [] : current.capabilities,
+    ready: !exited && current.ready,
+    readyAt: !exited ? current.readyAt : null,
+    readyStateKnown: !exited && current.readyStateKnown,
     pidPath: paths.pidPath,
     lockPath: paths.daemonLockPath,
     lockPid: current.lockPid,
@@ -69796,6 +69851,115 @@ async function stopDaemon(homeDir) {
     forced
   };
 }
+async function ensureDaemonReady(options = {}) {
+  const paths = resolveTaskPaths(options.homeDir);
+  const commandName = options.commandName ?? "command";
+  const timeoutMs = options.timeoutMs ?? readReadyTimeoutMs(options.env ?? process.env);
+  let status = await getDaemonStatus(options.homeDir);
+  let started = false;
+  let logPath = paths.listenerLogPath;
+  if (!status.running) {
+    options.stderr?.write(`[okx-a2a] ${commandName} requires the daemon; starting daemon...
+`);
+    const startResult = await startDaemon(options.homeDir);
+    started = startResult.started;
+    logPath = startResult.logPath;
+    status = startResult;
+    if (!status.running) {
+      throw new Error(
+        `${commandName} requires the daemon, but automatic daemon start failed. Check ${logPath} or run \`okx-a2a daemon restart\`.`
+      );
+    }
+    status = await waitForDaemonReady({
+      homeDir: options.homeDir,
+      timeoutMs,
+      requiredCapabilities: options.requiredCapabilities,
+      requireKnownReadyState: true,
+      logPath,
+      commandName
+    });
+    options.stderr?.write(`[okx-a2a] daemon ready pid=${status.pid ?? "(unknown)"} log=${logPath}
+`);
+  } else if (status.readyStateKnown && !status.ready) {
+    status = await waitForDaemonReady({
+      homeDir: options.homeDir,
+      timeoutMs,
+      requiredCapabilities: options.requiredCapabilities,
+      requireKnownReadyState: false,
+      logPath,
+      commandName
+    });
+  }
+  assertRequiredCapabilities(status, options.requiredCapabilities, commandName);
+  return {
+    ...status,
+    started,
+    logPath
+  };
+}
+async function waitForDaemonReady(options) {
+  const deadline = Date.now() + Math.max(0, options.timeoutMs);
+  let lastStatus = await getDaemonStatus(options.homeDir);
+  while (Date.now() <= deadline) {
+    const status = await getDaemonStatus(options.homeDir);
+    lastStatus = status;
+    if (!status.running) {
+      if (status.stale) {
+        throw new Error(
+          `${options.commandName} requires the daemon, but the daemon exited before becoming ready. Check ${options.logPath} or run \`okx-a2a daemon restart\`.`
+        );
+      }
+    } else if (isReadyForCommand(status, options.requiredCapabilities, options.requireKnownReadyState)) {
+      return status;
+    } else if (status.ready && findMissingCapabilities(status, options.requiredCapabilities).length > 0) {
+      assertRequiredCapabilities(status, options.requiredCapabilities, options.commandName);
+    }
+    await sleep(Math.min(READY_POLL_MS, Math.max(1, deadline - Date.now() + 1)));
+  }
+  const missing = findMissingCapabilities(lastStatus, options.requiredCapabilities);
+  const capabilitySuffix = missing.length > 0 ? ` missingCapabilities=${missing.join(",")}` : "";
+  throw new Error(
+    `${options.commandName} requires the daemon, but it did not become ready within ${options.timeoutMs}ms${capabilitySuffix}. Check ${options.logPath} or run \`okx-a2a daemon restart\`.`
+  );
+}
+function isReadyForCommand(status, requiredCapabilities, requireKnownReadyState = false) {
+  if (!status.running) {
+    return false;
+  }
+  if (requireKnownReadyState && !status.readyStateKnown) {
+    return false;
+  }
+  if (status.readyStateKnown && !status.ready) {
+    return false;
+  }
+  return findMissingCapabilities(status, requiredCapabilities).length === 0;
+}
+function assertRequiredCapabilities(status, requiredCapabilities, commandName) {
+  const missing = findMissingCapabilities(status, requiredCapabilities);
+  if (missing.length === 0) {
+    return;
+  }
+  throw new Error(
+    `${commandName} requires a daemon with ${missing.join(",")} support. Run \`okx-a2a daemon restart\` first.`
+  );
+}
+function findMissingCapabilities(status, requiredCapabilities) {
+  if (!requiredCapabilities || requiredCapabilities.length === 0) {
+    return [];
+  }
+  return requiredCapabilities.filter((capability) => !status.capabilities.includes(capability));
+}
+function readReadyTimeoutMs(env) {
+  const raw = env[DAEMON_READY_TIMEOUT_ENV]?.trim();
+  if (!raw) {
+    return DEFAULT_READY_TIMEOUT_MS;
+  }
+  const parsed = Number(raw);
+  return Number.isFinite(parsed) && parsed > 0 ? parsed : DEFAULT_READY_TIMEOUT_MS;
+}
+function sleep(ms) {
+  return new Promise((resolve4) => setTimeout(resolve4, ms));
+}
 
 // ../core/src/log.ts
 function formatLogTimestamp(date = /* @__PURE__ */ new Date()) {
@@ -85915,7 +86079,7 @@ async function callOpenClawGateway(opts) {
         errorWithTimestamp(
           `${LOG_PREFIX} rpc retry method=${opts.method} attempt=${attempt + 1} delayMs=${delayMs}: ${message}`
         );
-        await sleep(delayMs);
+        await sleep2(delayMs);
         continue;
       }
       errorWithTimestamp(
@@ -85994,7 +86158,7 @@ function isGatewayStartingError(err2) {
   const e = err2;
   return String(e?.details?.reason ?? "") === "startup-sidecars" || String(e?.message ?? "").toLowerCase().includes("gateway starting");
 }
-async function sleep(ms) {
+async function sleep2(ms) {
   await new Promise((resolve4) => setTimeout(resolve4, ms));
 }
 var MinimalGatewayClient = class {
@@ -86204,7 +86368,7 @@ function buildConnectParams(config, instanceId, protocolVersion) {
     client: {
       id: "gateway-client",
       displayName: "okx-a2a-node",
-      version: "0.0.16",
+      version: "0.0.17-beta-db5dca184d-260624150845",
       platform: "node",
       mode: "backend",
       instanceId
@@ -86215,7 +86379,7 @@ function buildConnectParams(config, instanceId, protocolVersion) {
     commands: [],
     permissions: {},
     locale: Intl.DateTimeFormat().resolvedOptions().locale || "en-US",
-    userAgent: `okx-a2a-node/${"0.0.16"}`,
+    userAgent: `okx-a2a-node/${"0.0.17-beta-db5dca184d-260624150845"}`,
     auth: {
       ...config.token ? { token: config.token } : {},
       ...config.password ? { password: config.password } : {}
@@ -90364,7 +90528,7 @@ function userWatchEventDeliveredSentryExtra(event) {
 var environment = process.env.SENTRY_ENV === "dev" ? "dev" : "prod";
 var SENTRY_CONFIG = {
   projectName: "okx/openclaw-okx-a2a-extension",
-  release: "0.0.16",
+  release: "0.0.17-beta-db5dca184d-260624150845",
   environment
 };
 
@@ -90499,12 +90663,12 @@ async function runListenerWithLock(options, paths) {
       }));
     }
   });
-  service.setPluginVersion("0.0.16");
+  service.setPluginVersion("0.0.17-beta-db5dca184d-260624150845");
   await service.init();
   const pluginVersionStatus = service.pluginVersionStatus;
   if (pluginVersionStatus.unavailable) {
     throw new Error(
-      `@okxweb3/a2a-node v${"0.0.16"} is below the required minimum v${pluginVersionStatus.minVersion}`
+      `@okxweb3/a2a-node v${"0.0.17-beta-db5dca184d-260624150845"} is below the required minimum v${pluginVersionStatus.minVersion}`
     );
   }
   const systemConfig = service.getSystemConfig();
@@ -90522,7 +90686,7 @@ async function runListenerWithLock(options, paths) {
       onchainosAgentId: "*",
       reason: "system-config missing sentryDsn",
       pluginId: "@okxweb3/a2a-node",
-      pluginVersion: "0.0.16"
+      pluginVersion: "0.0.17-beta-db5dca184d-260624150845"
     });
   }
   logWithTimestamp(
@@ -90783,6 +90947,8 @@ async function runListenerWithLock(options, paths) {
     sessionStore,
     homeDir: options.homeDir
   });
+  await markDaemonReady(paths.daemonLockPath);
+  logWithTimestamp(`[okx-agent-task] daemon ready lock=${paths.daemonLockPath}`);
   await new Promise((resolve4) => {
     const shutdown = (signal) => {
       if (stopping) {
@@ -91085,6 +91251,7 @@ function parsePluginYamlVersion(content3) {
   detectCurrentAiProvider,
   detectGatewayInvocation,
   detectRuntime,
+  ensureDaemonReady,
   ensureDefaultAiProvider,
   extractAiSessionId,
   extractXmtpSentAtMs,

package/package.json

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