@okxweb3/a2a-node 0.0.17 → 0.0.18-beta-8614cb2a91-260625165344

package/dist/cli.js

@@ -212,6 +212,18 @@ function normalizeOptionalJobId(jobId) {
   const normalized = jobId?.trim();
   return normalized ? normalized : null;
 }
+function normalizeOptionalExpireTime(expireTime) {
+  if (expireTime === null || expireTime === void 0) {
+    return null;
+  }
+  if (!Number.isSafeInteger(expireTime) || expireTime < 0) {
+    throw new Error("expireTime must be a non-negative integer Unix timestamp in seconds");
+  }
+  return expireTime;
+}
+function activeUserAttentionSql() {
+  return "(expire_time IS NULL OR expire_time >= ?)";
+}
 function normalizeJobIdList(jobIds) {
   return [...new Set(jobIds.map((jobId) => normalizeOptionalJobId(jobId)).filter(isNonNullString))];
 }
@@ -290,6 +302,7 @@ function mapAttentionRow(row) {
     ...mapChoices(row.choices_json ?? null),
     userContent: row.user_content,
     ...row.idempotency_key ? { idempotencyKey: row.idempotency_key } : {},
+    ...typeof row.expire_time === "number" ? { expireTime: row.expire_time } : {},
     createdAt: row.created_at,
     ...row.handled_at ? { handledAt: row.handled_at } : {}
   };
@@ -501,6 +514,7 @@ var init_session_store = __esm({
         choices_json TEXT,
         user_content TEXT NOT NULL,
         idempotency_key TEXT UNIQUE,
+        expire_time INTEGER,
         created_at TEXT NOT NULL,
         handled_at TEXT,
         deleted_at TEXT,
@@ -515,6 +529,7 @@ var init_session_store = __esm({
         this.ensureColumn("user_attention", "deleted_at", "TEXT");
         this.ensureColumn("user_attention", "seen", "INTEGER NOT NULL DEFAULT 0");
         this.ensureColumn("user_attention", "provider", "TEXT CHECK (provider IN ('codex', 'claude', 'hermes', 'openclaw') OR provider IS NULL)");
+        this.ensureColumn("user_attention", "expire_time", "INTEGER");
         this.db.exec(`
       CREATE INDEX IF NOT EXISTS idx_user_attention_provider_status_created
       ON user_attention(provider, status, created_at)
@@ -932,6 +947,7 @@ var init_session_store = __esm({
         }
         const provider = normalizeOptionalProvider(input.provider);
         const choicesJson = normalizeChoicesJson(input.choices);
+        const expireTime = normalizeOptionalExpireTime(input.expireTime);
         return this.transaction(() => {
           if (input.idempotencyKey) {
             const existing = this.getUserAttentionByIdempotencyKey(input.idempotencyKey);
@@ -947,15 +963,15 @@ var init_session_store = __esm({
           const statement = input.idempotencyKey ? this.db.prepare(`
             INSERT OR IGNORE INTO user_attention (
               id, kind, provider, status, job_id, session_key, llm_content, choices_json, user_content,
-              idempotency_key, created_at, handled_at
+              idempotency_key, expire_time, created_at, handled_at
             )
-            VALUES (?, ?, ?, 'pending', ?, ?, ?, ?, ?, ?, ?, NULL)
+            VALUES (?, ?, ?, 'pending', ?, ?, ?, ?, ?, ?, ?, ?, NULL)
           `) : this.db.prepare(`
             INSERT INTO user_attention (
               id, kind, provider, status, job_id, session_key, llm_content, choices_json, user_content,
-              idempotency_key, created_at, handled_at
+              idempotency_key, expire_time, created_at, handled_at
             )
-            VALUES (?, ?, ?, 'pending', ?, ?, ?, ?, ?, NULL, ?, NULL)
+            VALUES (?, ?, ?, 'pending', ?, ?, ?, ?, ?, NULL, ?, ?, NULL)
           `);
           if (input.idempotencyKey) {
             statement.run(
@@ -968,6 +984,7 @@ var init_session_store = __esm({
               choicesJson,
               input.userContent,
               input.idempotencyKey,
+              expireTime,
               createdAt
             );
             const existing = this.getUserAttentionByIdempotencyKey(input.idempotencyKey);
@@ -985,6 +1002,7 @@ var init_session_store = __esm({
             input.llmContent ?? null,
             choicesJson,
             input.userContent,
+            expireTime,
             createdAt
           );
           const item = this.getUserAttention(id);
@@ -1001,6 +1019,8 @@ var init_session_store = __esm({
         if (!options.includeHandled) {
           conditions.push("status = 'pending'");
         }
+        conditions.push(activeUserAttentionSql());
+        values.push(this.currentUnixSeconds());
         if (options.provider) {
           assertAiProvider(options.provider);
           conditions.push("provider = ?");
@@ -1042,19 +1062,21 @@ var init_session_store = __esm({
         AND status = 'pending'
         AND seen = 0
         AND deleted_at IS NULL
+        AND ${activeUserAttentionSql()}
         ${watchFilter.sql}
       ORDER BY created_at DESC, id DESC
       LIMIT 1
-    `).get(...watchFilter.values);
+    `).get(this.currentUnixSeconds(), ...watchFilter.values);
         const notifications = this.db.prepare(`
       SELECT * FROM user_attention
       WHERE kind = 'notification'
         AND status = 'pending'
         AND seen = 0
         AND deleted_at IS NULL
+        AND ${activeUserAttentionSql()}
         ${watchFilter.sql}
       ORDER BY created_at ASC, id ASC
-    `).all(...watchFilter.values);
+    `).all(this.currentUnixSeconds(), ...watchFilter.values);
         if (!decision && notifications.length === 0) {
           return { items: [], hasDecision: false };
         }
@@ -1276,9 +1298,10 @@ var init_session_store = __esm({
         AND status = 'pending'
         AND seen = 1
         AND deleted_at IS NULL
+        AND ${activeUserAttentionSql()}
         ${providerFilter}
       ORDER BY created_at ASC, id ASC
-    `).all(...values);
+    `).all(this.currentUnixSeconds(), ...values);
         return rows.map(mapAttentionRow);
       }
       markUserAttentionHandled(ids) {
@@ -1489,6 +1512,9 @@ var init_session_store = __esm({
       timestamp() {
         return this.now().toISOString();
       }
+      currentUnixSeconds() {
+        return Math.floor(this.now().getTime() / 1e3);
+      }
     };
   }
 });
@@ -7551,7 +7577,7 @@ function buildConnectParams(config, instanceId, protocolVersion) {
     client: {
       id: "gateway-client",
       displayName: "okx-a2a-node",
-      version: "0.0.17",
+      version: "0.0.18-beta-8614cb2a91-260625165344",
       platform: "node",
       mode: "backend",
       instanceId
@@ -7562,7 +7588,7 @@ function buildConnectParams(config, instanceId, protocolVersion) {
     commands: [],
     permissions: {},
     locale: Intl.DateTimeFormat().resolvedOptions().locale || "en-US",
-    userAgent: `okx-a2a-node/${"0.0.17"}`,
+    userAgent: `okx-a2a-node/${"0.0.18-beta-8614cb2a91-260625165344"}`,
     auth: {
       ...config.token ? { token: config.token } : {},
       ...config.password ? { password: config.password } : {}
@@ -24001,6 +24027,9 @@ var init_sentry_logger = __esm({
 });
 
 // src/outbound-behavior.ts
+function resolveUserDeliveryId(input) {
+  return input.idempotencyKey?.trim() || (0, import_node_crypto5.randomUUID)();
+}
 function gatewayOutboundExtra(operation, extra = {}) {
   return {
     source: "node_gateway_outbound",
@@ -24058,11 +24087,12 @@ function createOutboundBehavior(provider, deps) {
   }
   return new SqliteOutboundBehavior(provider, deps);
 }
-var SqliteOutboundBehavior, DEFAULT_GATEWAY_PORT2, GATEWAY_OUTBOUND_LOG_PREFIX, GatewayOutboundBehavior;
+var import_node_crypto5, SqliteOutboundBehavior, DEFAULT_GATEWAY_PORT2, GATEWAY_OUTBOUND_LOG_PREFIX, GatewayOutboundBehavior;
 var init_outbound_behavior = __esm({
   "src/outbound-behavior.ts"() {
     "use strict";
     init_log();
+    import_node_crypto5 = require("node:crypto");
     init_user_attention_ipc();
     init_openclaw_gateway();
     init_openclaw_session_key();
@@ -24110,7 +24140,8 @@ var init_outbound_behavior = __esm({
           userContent: input.userContent,
           jobId: input.jobId ?? null,
           sessionKey: input.sessionKey ?? null,
-          idempotencyKey: input.idempotencyKey ?? null
+          idempotencyKey: input.idempotencyKey ?? null,
+          expireTime: input.expireTime ?? null
         });
         await notifyUserAttentionChanged(this.store.homeDir);
         return item;
@@ -24124,7 +24155,8 @@ var init_outbound_behavior = __esm({
           choices: input.choices ?? null,
           jobId: input.jobId ?? null,
           sessionKey: input.sessionKey ?? null,
-          idempotencyKey: input.idempotencyKey ?? null
+          idempotencyKey: input.idempotencyKey ?? null,
+          expireTime: input.expireTime ?? null
         });
         await notifyUserAttentionChanged(this.store.homeDir);
         return item;
@@ -24271,19 +24303,21 @@ var init_outbound_behavior = __esm({
         });
       }
       async dispatchUser(input) {
+        const deliveryId = resolveUserDeliveryId(input);
         const routed = this.resolveUserGatewaySessionKey(input);
         if (routed) {
-          await this.dispatchUserToGatewaySession(input, routed);
+          await this.dispatchUserToGatewaySession(input, routed, deliveryId);
           return null;
         }
         errorWithTimestamp(
-          `${GATEWAY_OUTBOUND_LOG_PREFIX} dispatchUser latestUserSessions jobId=${input.jobId ?? "(none)"} idempotencyKey=${input.idempotencyKey ?? "(none)"}`
+          `${GATEWAY_OUTBOUND_LOG_PREFIX} dispatchUser latestUserSessions jobId=${input.jobId ?? "(none)"} idempotencyKey=${deliveryId}`
         );
         try {
           const result = await this.gateway.callDispatchUserToLatestSessions({
             content: input.userContent,
             ...input.jobId ? { jobId: input.jobId } : {},
-            ...input.sessionKey ? { currentSessionKey: input.sessionKey } : {}
+            ...input.sessionKey ? { currentSessionKey: input.sessionKey } : {},
+            idempotencyKey: deliveryId
           });
           assertLatestUserFanoutDelivered("okx-a2a.dispatch_user", result);
           this.persistDeliveredFallbackRoutes(input.jobId, result);
@@ -24306,10 +24340,10 @@ var init_outbound_behavior = __esm({
             sessionKey: "openclaw:latest-user-sessions",
             content: input.userContent,
             jobId: input.jobId ?? null,
-            messageId: input.idempotencyKey ?? null
+            messageId: deliveryId
           });
           errorWithTimestamp(
-            `${GATEWAY_OUTBOUND_LOG_PREFIX} dispatchUser latestUserSessions buffered idempotencyKey=${input.idempotencyKey ?? "(none)"}: ${err2 instanceof Error ? err2.message : String(err2)}`
+            `${GATEWAY_OUTBOUND_LOG_PREFIX} dispatchUser latestUserSessions buffered idempotencyKey=${deliveryId}: ${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", {
             jobId: input.jobId ?? "",
@@ -24317,7 +24351,7 @@ var init_outbound_behavior = __esm({
           }));
           logger.info(LogEvent.GATEWAY_DELIVERY_BUFFERED, gatewayOutboundExtra("okx-a2a.dispatch_user", {
             jobId: input.jobId ?? "",
-            messageId: input.idempotencyKey ?? "",
+            messageId: deliveryId,
             status: "buffered"
           }));
         }
@@ -24353,16 +24387,17 @@ var init_outbound_behavior = __esm({
         }
         return null;
       }
-      async dispatchUserToGatewaySession(input, routed) {
+      async dispatchUserToGatewaySession(input, routed, deliveryId) {
         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)"}`
+          `${GATEWAY_OUTBOUND_LOG_PREFIX} dispatchUser routed sessionKey=${input.sessionKey ?? "(none)"} gatewaySessionKey=${gatewaySessionKey} source=${routed.source} jobId=${input.jobId ?? "(none)"} idempotencyKey=${deliveryId}`
         );
         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] }
+            ...routed.source === "stored_openclaw_routes" ? { sessionKeys: routed.sessionKeys } : { sessionKey: routed.sessionKeys[0] },
+            idempotencyKey: deliveryId
           });
           assertLatestUserFanoutDelivered("okx-a2a.dispatch_user", result);
           console.error(`${GATEWAY_OUTBOUND_LOG_PREFIX} dispatchUser routed ok gatewaySessionKey=${gatewaySessionKey} source=${routed.source}`);
@@ -24375,7 +24410,7 @@ var init_outbound_behavior = __esm({
           }));
         } catch (err2) {
           if (routed.source === "stored_openclaw_routes" && isNoDeliverableUserSessionError(err2)) {
-            await this.repairDispatchUserRoute(input, gatewaySessionKey, routed.source);
+            await this.repairDispatchUserRoute(input, gatewaySessionKey, routed.source, deliveryId);
             return;
           }
           if (!this.store || !isRetryableOpenClawGatewayError(err2)) {
@@ -24394,10 +24429,10 @@ var init_outbound_behavior = __esm({
             sessionKey: routed.sessionKeys[0] ?? "openclaw:routed-user-sessions",
             content: input.userContent,
             jobId: input.jobId ?? null,
-            messageId: input.idempotencyKey ?? null
+            messageId: deliveryId
           });
           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)}`
+            `${GATEWAY_OUTBOUND_LOG_PREFIX} dispatchUser routed buffered gatewaySessionKey=${gatewaySessionKey} source=${routed.source} idempotencyKey=${deliveryId}: ${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 ?? "",
@@ -24410,20 +24445,21 @@ var init_outbound_behavior = __esm({
             sessionKey: input.sessionKey ?? "",
             gatewaySessionKey,
             jobId: input.jobId ?? "",
-            messageId: input.idempotencyKey ?? "",
+            messageId: deliveryId,
             source: routed.source,
             status: "buffered"
           }));
         }
       }
-      async repairDispatchUserRoute(input, staleGatewaySessionKey, source) {
+      async repairDispatchUserRoute(input, staleGatewaySessionKey, source, deliveryId) {
         console.error(
           `${GATEWAY_OUTBOUND_LOG_PREFIX} dispatchUser routeRepair latestUserSessions staleGatewaySessionKey=${staleGatewaySessionKey} jobId=${input.jobId ?? "(none)"}`
         );
         const result = await this.gateway.callDispatchUserToLatestSessions({
           content: input.userContent,
           ...input.jobId ? { jobId: input.jobId } : {},
-          ...input.sessionKey ? { currentSessionKey: input.sessionKey } : {}
+          ...input.sessionKey ? { currentSessionKey: input.sessionKey } : {},
+          idempotencyKey: deliveryId
         });
         assertLatestUserFanoutDelivered("okx-a2a.dispatch_user", result);
         this.persistDeliveredFallbackRoutes(input.jobId, result, { replaceExisting: true });
@@ -24440,20 +24476,22 @@ var init_outbound_behavior = __esm({
         }));
       }
       async promptUser(input) {
+        const deliveryId = resolveUserDeliveryId(input);
         const routed = this.resolveUserGatewaySessionKey(input);
         if (routed) {
-          await this.promptUserToGatewaySession(input, routed);
+          await this.promptUserToGatewaySession(input, routed, deliveryId);
           return null;
         }
         errorWithTimestamp(
-          `${GATEWAY_OUTBOUND_LOG_PREFIX} promptUser latestUserSessions jobId=${input.jobId ?? "(none)"} idempotencyKey=${input.idempotencyKey ?? "(none)"}`
+          `${GATEWAY_OUTBOUND_LOG_PREFIX} promptUser latestUserSessions jobId=${input.jobId ?? "(none)"} idempotencyKey=${deliveryId}`
         );
         try {
           const result = await this.gateway.callPromptUserToLatestSessions({
             userContent: input.userContent,
             llmContent: input.llmContent,
             ...input.jobId ? { jobId: input.jobId } : {},
-            ...input.sessionKey ? { currentSessionKey: input.sessionKey } : {}
+            ...input.sessionKey ? { currentSessionKey: input.sessionKey } : {},
+            idempotencyKey: deliveryId
           });
           assertLatestUserFanoutDelivered("okx-a2a.prompt_user", result);
           this.persistDeliveredFallbackRoutes(input.jobId, result);
@@ -24477,10 +24515,10 @@ var init_outbound_behavior = __esm({
             content: input.userContent,
             llmContent: input.llmContent,
             jobId: input.jobId ?? null,
-            messageId: input.idempotencyKey ?? null
+            messageId: deliveryId
           });
           errorWithTimestamp(
-            `${GATEWAY_OUTBOUND_LOG_PREFIX} promptUser latestUserSessions buffered idempotencyKey=${input.idempotencyKey ?? "(none)"}: ${err2 instanceof Error ? err2.message : String(err2)}`
+            `${GATEWAY_OUTBOUND_LOG_PREFIX} promptUser latestUserSessions buffered idempotencyKey=${deliveryId}: ${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", {
             jobId: input.jobId ?? "",
@@ -24488,22 +24526,23 @@ var init_outbound_behavior = __esm({
           }));
           logger.info(LogEvent.GATEWAY_DELIVERY_BUFFERED, gatewayOutboundExtra("okx-a2a.prompt_user", {
             jobId: input.jobId ?? "",
-            messageId: input.idempotencyKey ?? "",
+            messageId: deliveryId,
             status: "buffered"
           }));
         }
         return null;
       }
-      async promptUserToGatewaySession(input, routed) {
+      async promptUserToGatewaySession(input, routed, deliveryId) {
         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)"}`
+          `${GATEWAY_OUTBOUND_LOG_PREFIX} promptUser routed sessionKey=${input.sessionKey ?? "(none)"} gatewaySessionKey=${gatewaySessionKey} source=${routed.source} jobId=${input.jobId ?? "(none)"} idempotencyKey=${deliveryId}`
         );
         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] }
+            ...routed.source === "stored_openclaw_routes" ? { sessionKeys: routed.sessionKeys } : { sessionKey: routed.sessionKeys[0] },
+            idempotencyKey: deliveryId
           });
           assertLatestUserFanoutDelivered("okx-a2a.prompt_user", result);
           console.error(`${GATEWAY_OUTBOUND_LOG_PREFIX} promptUser routed ok gatewaySessionKey=${gatewaySessionKey} source=${routed.source}`);
@@ -24516,7 +24555,7 @@ var init_outbound_behavior = __esm({
           }));
         } catch (err2) {
           if (routed.source === "stored_openclaw_routes" && isNoDeliverableUserSessionError(err2)) {
-            await this.repairPromptUserRoute(input, gatewaySessionKey, routed.source);
+            await this.repairPromptUserRoute(input, gatewaySessionKey, routed.source, deliveryId);
             return;
           }
           if (!this.store || !isRetryableOpenClawGatewayError(err2)) {
@@ -24536,10 +24575,10 @@ var init_outbound_behavior = __esm({
             content: input.userContent,
             llmContent: input.llmContent,
             jobId: input.jobId ?? null,
-            messageId: input.idempotencyKey ?? null
+            messageId: deliveryId
           });
           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)}`
+            `${GATEWAY_OUTBOUND_LOG_PREFIX} promptUser routed buffered gatewaySessionKey=${gatewaySessionKey} source=${routed.source} idempotencyKey=${deliveryId}: ${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 ?? "",
@@ -24552,13 +24591,13 @@ var init_outbound_behavior = __esm({
             sessionKey: input.sessionKey ?? "",
             gatewaySessionKey,
             jobId: input.jobId ?? "",
-            messageId: input.idempotencyKey ?? "",
+            messageId: deliveryId,
             source: routed.source,
             status: "buffered"
           }));
         }
       }
-      async repairPromptUserRoute(input, staleGatewaySessionKey, source) {
+      async repairPromptUserRoute(input, staleGatewaySessionKey, source, deliveryId) {
         console.error(
           `${GATEWAY_OUTBOUND_LOG_PREFIX} promptUser routeRepair latestUserSessions staleGatewaySessionKey=${staleGatewaySessionKey} jobId=${input.jobId ?? "(none)"}`
         );
@@ -24566,7 +24605,8 @@ var init_outbound_behavior = __esm({
           userContent: input.userContent,
           llmContent: input.llmContent,
           ...input.jobId ? { jobId: input.jobId } : {},
-          ...input.sessionKey ? { currentSessionKey: input.sessionKey } : {}
+          ...input.sessionKey ? { currentSessionKey: input.sessionKey } : {},
+          idempotencyKey: deliveryId
         });
         assertLatestUserFanoutDelivered("okx-a2a.prompt_user", result);
         this.persistDeliveredFallbackRoutes(input.jobId, result, { replaceExisting: true });
@@ -24708,7 +24748,7 @@ var init_sentry_config = __esm({
     environment = process.env.SENTRY_ENV === "dev" ? "dev" : "prod";
     SENTRY_CONFIG = {
       projectName: "okx/openclaw-okx-a2a-extension",
-      release: "0.0.17",
+      release: "0.0.18-beta-8614cb2a91-260625165344",
       environment
     };
   }
@@ -70552,10 +70592,10 @@ var init_secp256k1 = __esm({
 
 // ../../node_modules/@xmtp/content-type-remote-attachment/dist/index.js
 async function encrypt(plain, secret, additionalData) {
-  const salt = import_node_crypto5.webcrypto.getRandomValues(new Uint8Array(KDFSaltSize));
-  const nonce = import_node_crypto5.webcrypto.getRandomValues(new Uint8Array(AESGCMNonceSize));
+  const salt = import_node_crypto6.webcrypto.getRandomValues(new Uint8Array(KDFSaltSize));
+  const nonce = import_node_crypto6.webcrypto.getRandomValues(new Uint8Array(AESGCMNonceSize));
   const key = await hkdf(secret, salt);
-  const encrypted = await import_node_crypto5.webcrypto.subtle.encrypt(aesGcmParams(nonce), key, plain);
+  const encrypted = await import_node_crypto6.webcrypto.subtle.encrypt(aesGcmParams(nonce), key, plain);
   return new Ciphertext({
     aes256GcmHkdfSha256: {
       payload: new Uint8Array(encrypted),
@@ -70569,7 +70609,7 @@ async function decrypt(encrypted, secret, additionalData) {
     throw new Error("invalid payload ciphertext");
   }
   const key = await hkdf(secret, encrypted.aes256GcmHkdfSha256.hkdfSalt);
-  const decrypted = await import_node_crypto5.webcrypto.subtle.decrypt(aesGcmParams(encrypted.aes256GcmHkdfSha256.gcmNonce), key, encrypted.aes256GcmHkdfSha256.payload);
+  const decrypted = await import_node_crypto6.webcrypto.subtle.decrypt(aesGcmParams(encrypted.aes256GcmHkdfSha256.gcmNonce), key, encrypted.aes256GcmHkdfSha256.payload);
   return new Uint8Array(decrypted);
 }
 function aesGcmParams(nonce, additionalData) {
@@ -70580,18 +70620,18 @@ function aesGcmParams(nonce, additionalData) {
   return spec;
 }
 async function hkdf(secret, salt) {
-  const key = await import_node_crypto5.webcrypto.subtle.importKey("raw", secret, "HKDF", false, [
+  const key = await import_node_crypto6.webcrypto.subtle.importKey("raw", secret, "HKDF", false, [
     "deriveKey"
   ]);
-  return import_node_crypto5.webcrypto.subtle.deriveKey({ name: "HKDF", hash: "SHA-256", salt, info: hkdfNoInfo }, key, { name: "AES-GCM", length: 256 }, false, ["encrypt", "decrypt"]);
+  return import_node_crypto6.webcrypto.subtle.deriveKey({ name: "HKDF", hash: "SHA-256", salt, info: hkdfNoInfo }, key, { name: "AES-GCM", length: 256 }, false, ["encrypt", "decrypt"]);
 }
-var import_proto2, import_node_crypto5, ContentTypeAttachment, AttachmentCodec, KDFSaltSize, AESGCMNonceSize, AESGCMTagLength, Ciphertext, hkdfNoInfo, ContentTypeRemoteAttachment, RemoteAttachmentCodec;
+var import_proto2, import_node_crypto6, ContentTypeAttachment, AttachmentCodec, KDFSaltSize, AESGCMNonceSize, AESGCMTagLength, Ciphertext, hkdfNoInfo, ContentTypeRemoteAttachment, RemoteAttachmentCodec;
 var init_dist6 = __esm({
   "../../node_modules/@xmtp/content-type-remote-attachment/dist/index.js"() {
     init_dist();
     init_secp256k1();
     import_proto2 = __toESM(require_node3(), 1);
-    import_node_crypto5 = require("node:crypto");
+    import_node_crypto6 = require("node:crypto");
     ContentTypeAttachment = new ContentTypeId({
       authorityId: "xmtp.org",
       typeId: "attachment",
@@ -70671,7 +70711,7 @@ var init_dist6 = __esm({
         if (payload.length === 0) {
           throw new Error(`no payload for remote attachment at ${remoteAttachment.url}`);
         }
-        const digestBytes = new Uint8Array(await import_node_crypto5.webcrypto.subtle.digest("SHA-256", payload));
+        const digestBytes = new Uint8Array(await import_node_crypto6.webcrypto.subtle.digest("SHA-256", payload));
         const digest2 = etc.bytesToHex(digestBytes);
         if (digest2 !== remoteAttachment.contentDigest) {
           throw new Error("content digest does not match");
@@ -70695,7 +70735,7 @@ var init_dist6 = __esm({
         return codec.decode(encodedContent, codecRegistry);
       }
       static async encodeEncrypted(content$1, codec) {
-        const secret = import_node_crypto5.webcrypto.getRandomValues(new Uint8Array(32));
+        const secret = import_node_crypto6.webcrypto.getRandomValues(new Uint8Array(32));
         const encodedContent = import_proto2.content.EncodedContent.encode(codec.encode(content$1, {
           codecFor() {
             return void 0;
@@ -70708,7 +70748,7 @@ var init_dist6 = __esm({
         if (!salt || !nonce || !payload) {
           throw new Error("missing encryption key");
         }
-        const digestBytes = new Uint8Array(await import_node_crypto5.webcrypto.subtle.digest("SHA-256", payload));
+        const digestBytes = new Uint8Array(await import_node_crypto6.webcrypto.subtle.digest("SHA-256", payload));
         const digest2 = etc.bytesToHex(digestBytes);
         return {
           digest: digest2,
@@ -86737,14 +86777,14 @@ function buildSystemMessageIdempotencyKey(input) {
   return `system-message:${identity3}`;
 }
 function stableHash(value) {
-  return (0, import_node_crypto6.createHash)("sha256").update(value).digest("hex").slice(0, 24);
+  return (0, import_node_crypto7.createHash)("sha256").update(value).digest("hex").slice(0, 24);
 }
-var import_node_crypto6, DIRECTION_PREFIX, CONTENT_SEPARATOR, ADDRESS_SHORT_HEAD, ADDRESS_SHORT_TAIL, JOB_ID_HEAD, JOB_ID_TAIL, ELLIPSIS, CONTENT_MAX_LINES;
+var import_node_crypto7, DIRECTION_PREFIX, CONTENT_SEPARATOR, ADDRESS_SHORT_HEAD, ADDRESS_SHORT_TAIL, JOB_ID_HEAD, JOB_ID_TAIL, ELLIPSIS, CONTENT_MAX_LINES;
 var init_agent_message_notice = __esm({
   "src/agent-message-notice.ts"() {
     "use strict";
     init_log();
-    import_node_crypto6 = require("node:crypto");
+    import_node_crypto7 = require("node:crypto");
     init_session_store();
     init_ai_provider();
     init_outbound_behavior();
@@ -87266,7 +87306,7 @@ async function handleSqliteGroupSendCommand(params) {
   });
   logWithTimestamp(`[okx-agent-task] xmtp envelope ${rawText}`);
   await conversation.send(rawText);
-  const messageId = `outbound-${(0, import_node_crypto7.randomUUID)()}`;
+  const messageId = `outbound-${(0, import_node_crypto8.randomUUID)()}`;
   await notifyAgentMessageToUserAttention({
     direction: "outbound" /* OUTBOUND */,
     sender: {
@@ -87404,7 +87444,7 @@ async function handleGroupSendCommand(params) {
   logWithTimestamp(`[okx-agent-task] xmtp envelope ${rawText}`);
   await conversation.send(rawText);
   const now = Date.now();
-  const messageId = `outbound-${(0, import_node_crypto7.randomUUID)()}`;
+  const messageId = `outbound-${(0, import_node_crypto8.randomUUID)()}`;
   const stored = {
     id: messageId,
     direction: "outbound",
@@ -87613,7 +87653,7 @@ async function handleXmtpSendCommand(params) {
     const rawText = target.chatType === "group" ? buildGroupReplyRaw(command, target, target.myXmtpAddress, localAgent) : buildDmReplyRaw(command, target, localAgent?.agentId ?? null);
     await conversation.send(rawText);
     const now = Date.now();
-    const messageId = `outbound-${(0, import_node_crypto7.randomUUID)()}`;
+    const messageId = `outbound-${(0, import_node_crypto8.randomUUID)()}`;
     const stored = {
       id: messageId,
       direction: "outbound",
@@ -87659,12 +87699,12 @@ async function handleXmtpSendCommand(params) {
     ownedStore?.close();
   }
 }
-var import_node_crypto7, TASK_MIN_VERSION, sqliteGroupSessionPromises, resolvedAgentByIdCache, resolvedAgentByAddressCache;
+var import_node_crypto8, TASK_MIN_VERSION, sqliteGroupSessionPromises, resolvedAgentByIdCache, resolvedAgentByAddressCache;
 var init_xmtp_send = __esm({
   "src/xmtp-send.ts"() {
     "use strict";
     init_log();
-    import_node_crypto7 = require("node:crypto");
+    import_node_crypto8 = require("node:crypto");
     init_dist4();
     init_envelope();
     init_concurrency2();
@@ -89363,7 +89403,7 @@ function normalizeAttentionProvider(provider) {
   return provider === "unknown" ? null : provider;
 }
 function stableHash2(value) {
-  return (0, import_node_crypto8.createHash)("sha256").update(value).digest("hex").slice(0, 24);
+  return (0, import_node_crypto9.createHash)("sha256").update(value).digest("hex").slice(0, 24);
 }
 function formatCommand(args) {
   return args.map(shellQuote).join(" ");
@@ -89387,12 +89427,12 @@ function shortenJobId2(jobId) {
   }
   return `${jobId.slice(0, 6)}\u2026${jobId.slice(-4)}`;
 }
-var import_node_crypto8, import_node_fs14, import_promises6, import_node_child_process6, import_node_os6, import_node_path18, AiRunner, CODEX_TOOL_FAILURE_MARKER;
+var import_node_crypto9, import_node_fs14, import_promises6, import_node_child_process6, import_node_os6, import_node_path18, AiRunner, CODEX_TOOL_FAILURE_MARKER;
 var init_ai_runner = __esm({
   "src/ai-runner.ts"() {
     "use strict";
     init_log();
-    import_node_crypto8 = require("node:crypto");
+    import_node_crypto9 = require("node:crypto");
     import_node_fs14 = require("node:fs");
     import_promises6 = require("node:fs/promises");
     import_node_child_process6 = require("node:child_process");
@@ -91627,7 +91667,7 @@ async function processFileMessage(ctx, deps, options = {}) {
   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)()}`;
+    const systemMessageId = messageId || `system-${(0, import_node_crypto10.randomUUID)()}`;
     if (!systemNotification.agentId) {
       logger.error(
         LogEvent.INBOUND_DROP_DM_INVALID_PAYLOAD,
@@ -91829,7 +91869,7 @@ async function processFileMessage(ctx, deps, options = {}) {
       toAgentId
     });
     const existingSession = deps.sessionStore?.getSession(sessionKey) ?? null;
-    const routedMessageId = messageId || `group-${(0, import_node_crypto9.randomUUID)()}`;
+    const routedMessageId = messageId || `group-${(0, import_node_crypto10.randomUUID)()}`;
     const consentState = ctx.conversation instanceof Group ? ctx.conversation.consentState : void 0;
     if (shouldKeepInboundGroupPendingForBuyer({
       consentState,
@@ -91922,7 +91962,7 @@ async function processFileMessage(ctx, deps, options = {}) {
     return true;
   }
   const stored = {
-    id: messageId || `local-${(0, import_node_crypto9.randomUUID)()}`,
+    id: messageId || `local-${(0, import_node_crypto10.randomUUID)()}`,
     direction: "inbound",
     route: route.route,
     routeReason: route.routeReason,
@@ -92058,7 +92098,7 @@ function processOfflineFromCoreDeps(store, ctx, deps, options) {
 function buildSystemStoredMessage(params) {
   const now = Date.now();
   return {
-    id: params.id ?? `system-${now}-${(0, import_node_crypto9.randomUUID)()}`,
+    id: params.id ?? `system-${now}-${(0, import_node_crypto10.randomUUID)()}`,
     direction: "system",
     route: "backup",
     routeReason: params.reason,
@@ -92076,12 +92116,12 @@ function buildSystemStoredMessage(params) {
 function isA2AEnvelope(payload) {
   return isPlainObject3(payload) && payload.msgType === A2A_MESSAGE_TYPE;
 }
-var import_node_crypto9, PROCESSED_IDS_MAX, processedMessageIds;
+var import_node_crypto10, PROCESSED_IDS_MAX, processedMessageIds;
 var init_message_handler = __esm({
   "src/message-handler.ts"() {
     "use strict";
     init_log();
-    import_node_crypto9 = require("node:crypto");
+    import_node_crypto10 = require("node:crypto");
     init_dist4();
     init_a2a();
     init_xmtp_sdk();
@@ -92137,7 +92177,7 @@ function isOriginalParentProcessAlive(options) {
 }
 function registerUserAttentionWatcher(options) {
   return options.store.registerUserAttentionWatcher({
-    id: options.id ?? (0, import_node_crypto10.randomUUID)(),
+    id: options.id ?? (0, import_node_crypto11.randomUUID)(),
     provider: options.provider,
     jobId: options.jobId,
     nowMs: options.nowMs ?? Date.now(),
@@ -92216,11 +92256,11 @@ function userWatchEventDeliveredSentryExtra(event) {
     hasDecision: String(event.hasDecision)
   };
 }
-var import_node_crypto10, USER_ATTENTION_WATCH_REPLACED_MESSAGE, USER_ATTENTION_WATCHER_SCAN_MS, USER_ATTENTION_WATCHER_TTL_MS, USER_ATTENTION_WATCH_PARENT_CHECK_MS;
+var import_node_crypto11, USER_ATTENTION_WATCH_REPLACED_MESSAGE, USER_ATTENTION_WATCHER_SCAN_MS, USER_ATTENTION_WATCHER_TTL_MS, USER_ATTENTION_WATCH_PARENT_CHECK_MS;
 var init_user_attention_watchers = __esm({
   "src/user-attention-watchers.ts"() {
     "use strict";
-    import_node_crypto10 = require("node:crypto");
+    import_node_crypto11 = require("node:crypto");
     init_sentry_logger();
     USER_ATTENTION_WATCH_REPLACED_MESSAGE = "Another okx-a2a user watch with the same job scope was started, so this watcher has been closed. Do not run this watch command again automatically, because starting another watcher may interrupt a different session that is already monitoring task progress.";
     USER_ATTENTION_WATCHER_SCAN_MS = 500;
@@ -92460,12 +92500,12 @@ async function runListenerWithLock(options, paths) {
       }));
     }
   });
-  service.setPluginVersion("0.0.17");
+  service.setPluginVersion("0.0.18-beta-8614cb2a91-260625165344");
   await service.init();
   const pluginVersionStatus = service.pluginVersionStatus;
   if (pluginVersionStatus.unavailable) {
     throw new Error(
-      `@okxweb3/a2a-node v${"0.0.17"} is below the required minimum v${pluginVersionStatus.minVersion}`
+      `@okxweb3/a2a-node v${"0.0.18-beta-8614cb2a91-260625165344"} is below the required minimum v${pluginVersionStatus.minVersion}`
     );
   }
   const systemConfig = service.getSystemConfig();
@@ -92483,7 +92523,7 @@ async function runListenerWithLock(options, paths) {
       onchainosAgentId: "*",
       reason: "system-config missing sentryDsn",
       pluginId: "@okxweb3/a2a-node",
-      pluginVersion: "0.0.17"
+      pluginVersion: "0.0.18-beta-8614cb2a91-260625165344"
     });
   }
   logWithTimestamp(
@@ -93012,7 +93052,7 @@ async function uploadFile(params) {
   const attachment = { filename, mimeType, data: new Uint8Array(data) };
   const encrypted = await RemoteAttachmentCodec.encodeEncrypted(attachment, new AttachmentCodec());
   ensureFileDirs();
-  const encryptedPath = (0, import_node_path21.resolve)(FILE_WORK_DIR, `${(0, import_node_crypto11.randomUUID)()}.enc`);
+  const encryptedPath = (0, import_node_path21.resolve)(FILE_WORK_DIR, `${(0, import_node_crypto12.randomUUID)()}.enc`);
   (0, import_node_fs17.writeFileSync)(encryptedPath, encrypted.payload);
   try {
     const stdout = runOnchainos([
@@ -93056,7 +93096,7 @@ async function uploadFile(params) {
 }
 async function downloadFile(params) {
   ensureFileDirs();
-  const encryptedPath = (0, import_node_path21.resolve)(FILE_WORK_DIR, `${(0, import_node_crypto11.randomUUID)()}.enc`);
+  const encryptedPath = (0, import_node_path21.resolve)(FILE_WORK_DIR, `${(0, import_node_crypto12.randomUUID)()}.enc`);
   try {
     const stdout = runOnchainos([
       "agent",
@@ -93081,7 +93121,7 @@ async function downloadFile(params) {
       throw new Error(`file download failed: ${stdout}`);
     }
     const payload = new Uint8Array((0, import_node_fs17.readFileSync)(encryptedPath));
-    const digestBytes = new Uint8Array(await import_node_crypto11.webcrypto.subtle.digest("SHA-256", payload));
+    const digestBytes = new Uint8Array(await import_node_crypto12.webcrypto.subtle.digest("SHA-256", payload));
     const actualDigest = Array.from(digestBytes).map((byte) => byte.toString(16).padStart(2, "0")).join("");
     if (actualDigest !== params.digest) {
       throw new Error(`file download digest verification failed: expected=${params.digest}, actual=${actualDigest}`);
@@ -93089,7 +93129,7 @@ async function downloadFile(params) {
     const decryptedBytes = await decryptAttachmentPayload(payload, params);
     const encodedContent = import_proto4.content.EncodedContent.decode(decryptedBytes);
     const attachment = new AttachmentCodec().decode(encodedContent);
-    const outputFilename = params.filename || attachment.filename || `${(0, import_node_crypto11.randomUUID)()}.bin`;
+    const outputFilename = params.filename || attachment.filename || `${(0, import_node_crypto12.randomUUID)()}.bin`;
     const outputDir = DOWNLOADS_DIR;
     ensureA2aTaskDir(outputDir);
     const outputPath = (0, import_node_path21.resolve)(outputDir, (0, import_node_path21.basename)(outputFilename));
@@ -93106,15 +93146,15 @@ async function decryptAttachmentPayload(payload, params) {
   const secretBytes = new Uint8Array(Buffer.from(params.secret, "base64"));
   const saltBytes = new Uint8Array(Buffer.from(params.salt, "base64"));
   const nonceBytes = new Uint8Array(Buffer.from(params.nonce, "base64"));
-  const hkdfKey = await import_node_crypto11.webcrypto.subtle.importKey("raw", secretBytes, "HKDF", false, ["deriveKey"]);
-  const aesKey = await import_node_crypto11.webcrypto.subtle.deriveKey(
+  const hkdfKey = await import_node_crypto12.webcrypto.subtle.importKey("raw", secretBytes, "HKDF", false, ["deriveKey"]);
+  const aesKey = await import_node_crypto12.webcrypto.subtle.deriveKey(
     { name: "HKDF", hash: "SHA-256", salt: saltBytes, info: new Uint8Array().buffer },
     hkdfKey,
     { name: "AES-GCM", length: 256 },
     false,
     ["decrypt"]
   );
-  return new Uint8Array(await import_node_crypto11.webcrypto.subtle.decrypt({ name: "AES-GCM", iv: nonceBytes }, aesKey, toArrayBuffer(payload)));
+  return new Uint8Array(await import_node_crypto12.webcrypto.subtle.decrypt({ name: "AES-GCM", iv: nonceBytes }, aesKey, toArrayBuffer(payload)));
 }
 function toArrayBuffer(bytes) {
   return bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength);
@@ -93253,12 +93293,12 @@ function readRequiredOption(args, name2) {
   }
   return value;
 }
-var import_node_child_process7, import_node_crypto11, import_node_fs17, import_node_path21, import_proto4, OKX_A2A_PATHS, OKX_A2A_HOME_DIR, FILE_WORK_DIR, DOWNLOADS_DIR, SYSTEM_CONFIG_PATH;
+var import_node_child_process7, import_node_crypto12, import_node_fs17, import_node_path21, import_proto4, OKX_A2A_PATHS, OKX_A2A_HOME_DIR, FILE_WORK_DIR, DOWNLOADS_DIR, SYSTEM_CONFIG_PATH;
 var init_file_cli = __esm({
   "src/file-cli.ts"() {
     "use strict";
     import_node_child_process7 = require("node:child_process");
-    import_node_crypto11 = require("node:crypto");
+    import_node_crypto12 = require("node:crypto");
     import_node_fs17 = require("node:fs");
     import_node_path21 = require("node:path");
     init_dist6();
@@ -93281,12 +93321,29 @@ __export(user_attention_cli_exports, {
   handleUserCommand: () => handleUserCommand
 });
 async function handleUserCommand(args) {
-  if (hasHelpFlag2(args)) {
+  const subcommand = args[0];
+  if (!subcommand || args.every(isHelpArg)) {
     printUserUsage();
     return;
   }
+  if (subcommand === "help") {
+    const helpTarget = args.slice(1).find((arg) => !isHelpArg(arg));
+    if (!helpTarget) {
+      printUserUsage();
+      return;
+    }
+    if (!printUserSubcommandUsage(helpTarget)) {
+      throw new Error(`Unknown user command: ${helpTarget}`);
+    }
+    return;
+  }
+  if (hasHelpFlag2(args.slice(1))) {
+    if (!printUserSubcommandUsage(subcommand)) {
+      throw new Error(`Unknown user command: ${subcommand}`);
+    }
+    return;
+  }
   const commandStartedAt = Date.now();
-  const subcommand = args[0];
   const parsed = parseArgs(args.slice(1));
   const json = parsed.flags.has("json");
   const storeInitStartedAt = Date.now();
@@ -93295,15 +93352,12 @@ async function handleUserCommand(args) {
   let usedOpenClawGateway = false;
   let quietUserAttentionConsole = false;
   try {
-    if (!subcommand || subcommand === "help" || parsed.flags.has("help")) {
-      printUserUsage();
-      return;
-    }
     if (subcommand === "notify") {
       quietUserAttentionConsole = true;
       assertNoUserSessionKey(parsed, subcommand);
       const jobId = readJobId(parsed);
       const provider = resolveUserAttentionProvider(store, jobId);
+      const expireTime = provider === "openclaw" ? null : readExpireTime(parsed);
       const behavior = createOutboundBehavior(provider, { store });
       usedOpenClawGateway = provider === "openclaw";
       const sessionKey = readCurrentSessionKeyFromEnv();
@@ -93313,7 +93367,8 @@ async function handleUserCommand(args) {
           userContent: readRequiredOption2(parsed, "content"),
           jobId,
           sessionKey,
-          idempotencyKey: parsed.options.get("idempotency-key") ?? null
+          idempotencyKey: parsed.options.get("idempotency-key") ?? null,
+          expireTime
         });
       });
       outputOk();
@@ -93324,6 +93379,7 @@ async function handleUserCommand(args) {
       assertNoUserSessionKey(parsed, subcommand);
       const jobId = readJobId(parsed);
       const provider = resolveUserAttentionProvider(store, jobId);
+      const expireTime = provider === "openclaw" ? null : readExpireTime(parsed);
       const behavior = createOutboundBehavior(provider, { store });
       usedOpenClawGateway = provider === "openclaw";
       const sessionKey = readCurrentSessionKeyFromEnv();
@@ -93334,7 +93390,8 @@ async function handleUserCommand(args) {
           llmContent: readRequiredOption2(parsed, "llm-content"),
           jobId,
           sessionKey,
-          idempotencyKey: parsed.options.get("idempotency-key") ?? null
+          idempotencyKey: parsed.options.get("idempotency-key") ?? null,
+          expireTime
         });
       });
       outputOk();
@@ -93402,14 +93459,17 @@ async function handleUserCommand(args) {
   }
 }
 function hasHelpFlag2(args) {
-  return args.some((arg) => arg === "-h" || arg === "--help" || arg === "help");
+  return args.some((arg) => arg === "-h" || arg === "--help");
+}
+function isHelpArg(arg) {
+  return arg === "-h" || arg === "--help" || arg === "help";
 }
 function printUserUsage() {
   console.log(`Usage: okx-a2a user <notify|decision-request|list|outdated-list|consume|check|watch>
 
 Commands:
-  notify --content <text> [--job-id <id>] [--idempotency-key <key>] [--json]
-  decision-request --user-content <text> --llm-content <text> [--job-id <id>] [--idempotency-key <key>] [--json]
+  notify --content <text> [--job-id <id>] [--idempotency-key <key>] [--expire-time <unixSeconds>] [--json]
+  decision-request --user-content <text> --llm-content <text> [--job-id <id>] [--idempotency-key <key>] [--expire-time <unixSeconds>] [--json]
   list [--include-handled] [--provider <provider>|--all-providers] [--job-id <id>] [--limit <n>] [--json]
   outdated-list [--provider <provider>|--all-providers]
   consume [--provider <provider>|--all-providers] [--job-id <id>] [--json]
@@ -93417,6 +93477,87 @@ Commands:
   watch [--once] [--json] [--provider <provider>|--all-providers] [--job-id <id>] [--timeout <seconds>] [--poll-ms <ms>] [--ignore-daemon-status]
 `);
 }
+function printUserSubcommandUsage(subcommand) {
+  switch (subcommand) {
+    case "notify":
+      console.log(`Usage: okx-a2a user notify --content <text> [options]
+
+Options:
+  --content <text>             Notification text shown to the user.
+  --job-id <id>                Bind the notification to a job.
+  --idempotency-key <key>      Reuse an existing notification for duplicate sends.
+  --expire-time <unixSeconds>  Ignore the notification after this absolute Unix timestamp in seconds.
+  --json                       Emit machine-readable JSON output.
+`);
+      return true;
+    case "decision-request":
+      console.log(`Usage: okx-a2a user decision-request --user-content <text> --llm-content <text> [options]
+
+Options:
+  --user-content <text>        Decision prompt shown to the user.
+  --llm-content <text>         Context/instructions for the AI side of the decision.
+  --job-id <id>                Bind the decision request to a job.
+  --idempotency-key <key>      Reuse an existing decision request for duplicate sends.
+  --expire-time <unixSeconds>  Ignore the decision request after this absolute Unix timestamp in seconds.
+  --json                       Emit machine-readable JSON output.
+`);
+      return true;
+    case "list":
+      console.log(`Usage: okx-a2a user list [options]
+
+Options:
+  --include-handled            Include already handled user attention records.
+  --provider <provider>        Filter by provider: codex, claude, hermes, or openclaw.
+  --all-providers              Do not filter by the current/provider-bound runtime.
+  --job-id <id>                Filter by job id.
+  --limit <n>                  Maximum records to return. Defaults to 50.
+  --json                       Emit machine-readable JSON output.
+`);
+      return true;
+    case "outdated-list":
+      console.log(`Usage: okx-a2a user outdated-list [options]
+
+Options:
+  --provider <provider>        Filter by provider: codex, claude, hermes, or openclaw.
+  --all-providers              Do not filter by the current/provider-bound runtime.
+`);
+      return true;
+    case "consume":
+      console.log(`Usage: okx-a2a user consume [options]
+
+Options:
+  --provider <provider>        Filter by provider: codex, claude, hermes, or openclaw.
+  --all-providers              Do not filter by the current/provider-bound runtime.
+  --job-id <id>                Drain records for a specific job.
+  --json                       Emit machine-readable JSON output.
+`);
+      return true;
+    case "check":
+      console.log(`Usage: okx-a2a user check --todo-ids <id,id> [options]
+
+Options:
+  --todo-ids <id,id>           Comma-separated user attention ids to mark handled.
+  --json                       Emit machine-readable JSON output.
+`);
+      return true;
+    case "watch":
+      console.log(`Usage: okx-a2a user watch [options]
+
+Options:
+  --once                       Exit after the first batch of user attention records.
+  --provider <provider>        Filter by provider: codex, claude, hermes, or openclaw.
+  --all-providers              Do not filter by the current/provider-bound runtime.
+  --job-id <id>                Watch records for a specific job.
+  --timeout <seconds>          Stop waiting after this many seconds.
+  --poll-ms <ms>               Polling interval when IPC wake is unavailable. Defaults to 500.
+  --ignore-daemon-status       Read SQLite directly without requiring a running daemon.
+  --json                       Emit machine-readable JSON output.
+`);
+      return true;
+    default:
+      return false;
+  }
+}
 async function watchUserAttention(store, parsed, json) {
   if (parsed.flags.has("from-now")) {
     throw new Error("--from-now has been removed; user watch always returns existing pending items first");
@@ -93638,7 +93779,8 @@ function formatAttentionItem(item) {
   const scope = [
     item.provider ? `provider=${item.provider}` : void 0,
     item.jobId ? `job=${item.jobId}` : void 0,
-    item.sessionKey ? `session=${item.sessionKey}` : void 0
+    item.sessionKey ? `session=${item.sessionKey}` : void 0,
+    item.expireTime !== void 0 ? `expireTime=${item.expireTime}` : void 0
   ].filter(Boolean).join(" ");
   const prefix = `  ${item.id} ${item.kind} ${item.status}`;
   return `${prefix}${scope ? ` ${scope}` : ""}
@@ -93965,6 +94107,17 @@ function readNumberOption(parsed, name2) {
   }
   return value;
 }
+function readExpireTime(parsed) {
+  const raw = parsed.options.get("expire-time") ?? parsed.options.get("expireTime");
+  if (!raw) {
+    return null;
+  }
+  const value = Number(raw);
+  if (!Number.isSafeInteger(value) || value < 0) {
+    throw new Error("--expire-time must be a non-negative integer Unix timestamp in seconds");
+  }
+  return value;
+}
 var init_user_attention_cli = __esm({
   "src/user-attention-cli.ts"() {
     "use strict";
@@ -93987,12 +94140,12 @@ __export(session_cli_exports, {
 });
 async function handleSessionCommand(args) {
   const subcommand = args[0];
-  if (!subcommand || args.every(isHelpArg)) {
+  if (!subcommand || args.every(isHelpArg2)) {
     printSessionUsage();
     return;
   }
   if (subcommand === "help") {
-    const helpTarget = args.slice(1).find((arg) => !isHelpArg(arg));
+    const helpTarget = args.slice(1).find((arg) => !isHelpArg2(arg));
     if (!helpTarget) {
       printSessionUsage();
       return;
@@ -94174,9 +94327,9 @@ async function handleSessionCommand(args) {
   }
 }
 function hasHelpFlag3(args) {
-  return args.some(isHelpArg);
+  return args.some(isHelpArg2);
 }
-function isHelpArg(arg) {
+function isHelpArg2(arg) {
   return arg === "-h" || arg === "--help" || arg === "help";
 }
 function printSessionUsage() {
@@ -95202,7 +95355,7 @@ function buildProviderMismatchWarning(target, provider) {
   ].join("\n");
 }
 async function handleUpdateCommand(args) {
-  if (args.some(isHelpArg2)) {
+  if (args.some(isHelpArg3)) {
     printUpdateUsage();
     return;
   }
@@ -95245,7 +95398,7 @@ function resolveUpdateTarget(target) {
   return detectGatewayInvocation() ?? "node";
 }
 async function handleSetupCommand(args) {
-  if (args.some(isHelpArg2)) {
+  if (args.some(isHelpArg3)) {
     printSetupUsage();
     return;
   }
@@ -95482,7 +95635,7 @@ async function getCurrentNodeCliVersion() {
   return await getGlobalNpmPackageVersion(UPDATE_PACKAGES.node) ?? getBundledNodeCliVersion();
 }
 function getBundledNodeCliVersion() {
-  return true ? "0.0.17" : null;
+  return true ? "0.0.18-beta-8614cb2a91-260625165344" : null;
 }
 function readConfiguredAiProvider() {
   const explicit = process.env.OKX_AGENT_TASK_AI_CLI ?? process.env.OKX_A2A_AI_PROVIDER;
@@ -96102,7 +96255,7 @@ function readOption2(args, name2) {
 function hasFlag(args, name2) {
   return args.includes(name2);
 }
-function isHelpArg2(value) {
+function isHelpArg3(value) {
   return value === "-h" || value === "--help" || value === "help";
 }
 function isSupportedRelease(value) {
@@ -96242,7 +96395,7 @@ init_sentry_logger();
 init_sentry_config();
 var CURRENT_GATEWAY_SESSION_KEYS_ENV2 = "OKX_A2A_CURRENT_GATEWAY_SESSION_KEYS";
 function printUsage2() {
-  console.log(`okx-a2a ${"0.0.17"}
+  console.log(`okx-a2a ${"0.0.18-beta-8614cb2a91-260625165344"}
 
 Usage:
   okx-a2a <command> [options]
@@ -96279,7 +96432,7 @@ Run \`okx-a2a <command> -h\` for command-specific help.
 `);
 }
 function printVersion() {
-  console.log("0.0.17");
+  console.log("0.0.18-beta-8614cb2a91-260625165344");
 }
 function printDaemonUsage() {
   console.log(`Usage: okx-a2a daemon <start|restart|stop|status|autostart> [options]
@@ -96406,8 +96559,8 @@ function printUserUsageProxy() {
   console.log(`Usage: okx-a2a user <notify|decision-request|list|outdated-list|consume|check|watch>
 
 Commands:
-  notify --content <text> [--job-id <id>] [--idempotency-key <key>] [--json]
-  decision-request --user-content <text> --llm-content <text> [--job-id <id>] [--idempotency-key <key>] [--json]
+  notify --content <text> [--job-id <id>] [--idempotency-key <key>] [--expire-time <unixSeconds>] [--json]
+  decision-request --user-content <text> --llm-content <text> [--job-id <id>] [--idempotency-key <key>] [--expire-time <unixSeconds>] [--json]
   list [--include-handled] [--provider <provider>|--all-providers] [--job-id <id>] [--limit <n>] [--json]
   outdated-list [--provider <provider>|--all-providers]
   consume [--provider <provider>|--all-providers] [--job-id <id>] [--json]
@@ -96488,11 +96641,11 @@ Commands:
           Print setup status JSON to stdout. Installer logs are written to stderr.
 `);
 }
-function isHelpArg3(value) {
+function isHelpArg4(value) {
   return value === "-h" || value === "--help" || value === "help";
 }
 function hasHelpFlag5(args) {
-  return args.some(isHelpArg3);
+  return args.some(isHelpArg4);
 }
 function isVersionArg(value) {
   return value === "-v" || value === "--version" || value === "version";
@@ -97358,7 +97511,7 @@ async function main() {
   assertSupportedNodeVersion();
   const command = process.argv[2] ?? "status";
   const args = process.argv.slice(3);
-  if (isHelpArg3(command)) {
+  if (isHelpArg4(command)) {
     printUsage2();
     return;
   }
@@ -97504,10 +97657,10 @@ async function main() {
   process.exitCode = 1;
 }
 function shouldDeferHelpToNestedHandler(command, args) {
-  if (command !== "session") {
+  if (command !== "session" && command !== "user") {
     return false;
   }
-  return args.some((arg) => !isHelpArg3(arg));
+  return args.some((arg) => !isHelpArg4(arg));
 }
 main().then(() => {
   if (cliSentryFlushTimedOut) {