@okxweb3/a2a-node 0.2.4-beta-e7a52faf6f-260812154627 → 0.2.5

package/dist/cli.js

@@ -26604,7 +26604,7 @@ function buildConnectParams(config, instanceId, protocolVersion) {
     client: {
       id: "gateway-client",
       displayName: "okx-a2a-node",
-      version: "0.2.4-beta-e7a52faf6f-260812154627",
+      version: "0.2.5",
       platform: "node",
       mode: "backend",
       instanceId
@@ -26615,7 +26615,7 @@ function buildConnectParams(config, instanceId, protocolVersion) {
     commands: [],
     permissions: {},
     locale: Intl.DateTimeFormat().resolvedOptions().locale || "en-US",
-    userAgent: `okx-a2a-node/${"0.2.4-beta-e7a52faf6f-260812154627"}`,
+    userAgent: `okx-a2a-node/${"0.2.5"}`,
     auth: {
       ...config.token ? { token: config.token } : {},
       ...config.password ? { password: config.password } : {}
@@ -28181,6 +28181,31 @@ var init_runtime_switch = __esm({
   }
 });
 
+// src/job-provider.ts
+function setJobProvider(options) {
+  return options.store.setJobProviderBinding({
+    jobId: options.jobId,
+    provider: normalizeAiProvider(options.provider)
+  });
+}
+function setJobProviderToCurrentPlatform(options) {
+  const provider = detectCurrentAiProvider(options.env ?? process.env);
+  if (!provider) {
+    return null;
+  }
+  return setJobProvider({
+    store: options.store,
+    jobId: options.jobId,
+    provider
+  });
+}
+var init_job_provider = __esm({
+  "src/job-provider.ts"() {
+    "use strict";
+    init_ai_provider();
+  }
+});
+
 // src/task-config.ts
 function resolveAiPermissionPreset(options = {}) {
   const env = options.env ?? process.env;
@@ -28499,7 +28524,7 @@ var init_sentry_config = __esm({
     environment = process.env.SENTRY_ENV === "dev" ? "dev" : "prod";
     SENTRY_CONFIG = {
       projectName: "okx/openclaw-okx-a2a-extension",
-      release: "0.2.4-beta-e7a52faf6f-260812154627",
+      release: "0.2.5",
       environment,
       runtimeContainer: normalizeRuntimeContainer(process.env.OKX_A2A_RUNTIME_CONTAINER)
     };
@@ -39669,7 +39694,7 @@ async function exportDiagnosticLogs(options) {
     node: process.version,
     platform: process.platform,
     arch: process.arch,
-    packageVersion: true ? "0.2.4-beta-e7a52faf6f-260812154627" : "unknown",
+    packageVersion: true ? "0.2.5" : "unknown",
     sensitiveContentIncluded: options.includeSensitiveContent,
     listenerAndLlmContentIncluded: true,
     credentialsAlwaysRedacted: true,
@@ -55597,14 +55622,24 @@ function extractStreamErrorTelemetry(error) {
   }
   return telemetry;
 }
-function createKeyedFlight(discriminator, operation) {
+function replayFlightDiscriminator(clientGeneration, isOfflineReplay) {
+  return isOfflineReplay ? `startup_offline:${clientGeneration}` : `online_repair:${clientGeneration}`;
+}
+function createKeyedFlight(discriminator, operation, shouldRunAfterActive) {
   let resolve14;
   let reject;
   const promise = new Promise((resolvePromise, rejectPromise) => {
     resolve14 = resolvePromise;
     reject = rejectPromise;
   });
-  return { discriminator, operation, promise, resolve: resolve14, reject };
+  return {
+    discriminator,
+    operation,
+    promise,
+    resolve: resolve14,
+    reject,
+    shouldRunAfterActive
+  };
 }
 var TRANSPORT_FAILURE_PATTERNS, KNOWN_CAUSE_CODES, KNOWN_CAUSE_KINDS, KNOWN_GRPC_METHODS, StreamRecoveryTelemetry, KeyedSingleFlight;
 var init_stream_recovery_telemetry = __esm({
@@ -55632,6 +55667,7 @@ var init_stream_recovery_telemetry = __esm({
       }
       markError(nowMs = Date.now()) {
         if (this.activeRecovery) {
+          this.activeRecovery.candidateStartedAtMs = void 0;
           return {
             recoverySequence: this.activeRecovery.sequence,
             alreadyRecovering: true
@@ -55645,9 +55681,26 @@ var init_stream_recovery_telemetry = __esm({
         if (!this.activeRecovery) {
           return void 0;
         }
+        this.activeRecovery.candidateStartedAtMs = nowMs;
+        return {
+          recoverySequence: this.activeRecovery.sequence,
+          candidateStartedAtMs: nowMs
+        };
+      }
+      markStable(nowMs = Date.now()) {
+        if (this.activeRecovery?.candidateStartedAtMs === void 0) {
+          return void 0;
+        }
         const completed = {
           recoverySequence: this.activeRecovery.sequence,
-          recoveryDurationMs: Math.max(0, nowMs - this.activeRecovery.startedAtMs)
+          recoveryDurationMs: Math.max(
+            0,
+            this.activeRecovery.candidateStartedAtMs - this.activeRecovery.startedAtMs
+          ),
+          recoveryConfirmationDurationMs: Math.max(
+            0,
+            nowMs - this.activeRecovery.startedAtMs
+          )
         };
         this.activeRecovery = void 0;
         return completed;
@@ -55658,7 +55711,7 @@ var init_stream_recovery_telemetry = __esm({
     };
     KeyedSingleFlight = class {
       inFlight = /* @__PURE__ */ new Map();
-      run(key, discriminator, operation) {
+      run(key, discriminator, operation, options = {}) {
         const normalizedKey = key.toLowerCase();
         const state = this.inFlight.get(normalizedKey);
         if (!state) {
@@ -55668,7 +55721,22 @@ var init_stream_recovery_telemetry = __esm({
           return active.promise;
         }
         if (state.active.discriminator === discriminator) {
-          return state.active.promise;
+          if (!options.queueBehindActive) {
+            return state.active.promise;
+          }
+          const queued2 = state.queued.find(
+            (flight3) => flight3.discriminator === discriminator
+          );
+          if (queued2) {
+            return queued2.promise;
+          }
+          const flight2 = createKeyedFlight(
+            discriminator,
+            operation,
+            options.shouldRunAfterActive
+          );
+          state.queued.push(flight2);
+          return flight2.promise;
         }
         const queued = state.queued.find(
           (flight2) => flight2.discriminator === discriminator
@@ -55684,15 +55752,15 @@ var init_stream_recovery_telemetry = __esm({
         void Promise.resolve().then(flight.operation).then(
           (value) => {
             flight.resolve(value);
-            this.advance(key, flight);
+            this.advanceAfterSuccess(key, flight, value);
           },
           (error) => {
             flight.reject(error);
-            this.advance(key, flight);
+            this.advanceAfterFailure(key, flight, error);
           }
         );
       }
-      advance(key, completed) {
+      advanceAfterSuccess(key, completed, value) {
         const state = this.inFlight.get(key);
         if (state?.active !== completed) {
           return;
@@ -55702,6 +55770,29 @@ var init_stream_recovery_telemetry = __esm({
           this.inFlight.delete(key);
           return;
         }
+        if (next.shouldRunAfterActive && !next.shouldRunAfterActive(value)) {
+          next.resolve(value);
+          this.advanceAfterSuccess(key, completed, value);
+          return;
+        }
+        state.active = next;
+        this.execute(key, next);
+      }
+      advanceAfterFailure(key, completed, error) {
+        const state = this.inFlight.get(key);
+        if (state?.active !== completed) {
+          return;
+        }
+        const next = state.queued.shift();
+        if (!next) {
+          this.inFlight.delete(key);
+          return;
+        }
+        if (next.shouldRunAfterActive) {
+          next.reject(error);
+          this.advanceAfterFailure(key, completed, error);
+          return;
+        }
         state.active = next;
         this.execute(key, next);
       }
@@ -56567,11 +56658,11 @@ function replayScanBackoffMs(consecutiveFailures) {
 function isOfflineReplayForTrigger(trigger) {
   return trigger === "startup";
 }
-function replaySingleFlightDiscriminator(trigger, clientGeneration, recoveryIdentity) {
-  if (trigger === "stream_recovery") {
-    return `stream_recovery:${clientGeneration}:${recoveryIdentity ?? "unknown"}`;
-  }
-  return isOfflineReplayForTrigger(trigger) ? `startup_offline:${clientGeneration}` : `online_repair:${clientGeneration}`;
+function replaySingleFlightDiscriminator(trigger, clientGeneration) {
+  return replayFlightDiscriminator(
+    clientGeneration,
+    isOfflineReplayForTrigger(trigger)
+  );
 }
 function createOfflineReplayAddressSummary(address) {
   return {
@@ -56591,7 +56682,7 @@ function createOfflineReplayAddressSummary(address) {
     durationMs: 0
   };
 }
-var import_node_fs22, import_node_path26, DEFAULT_DATA_DIR, XMTP_INSTALLATION_WARNING_THRESHOLD, XMTP_INSTALLATION_NEAR_LIMIT_THRESHOLD, REPLAY_SCAN_INITIAL_BACKOFF_MS, REPLAY_SCAN_MAX_BACKOFF_MS, SENSITIVE_WORDS_LAZY_RETRY_COOLDOWN_MS, InboundReplayGate, SYSTEM_CONFIG_DEFAULTS, STREAM_RECOVERY_ALERT_THRESHOLD_MS, REPLAY_GATE_DRAIN_MAX_ATTEMPTS, REPLAY_GATE_DRAIN_RETRY_DELAY_MS, SEMVER_RE, isRecord5, isPositiveNumber, SYSTEM_CONFIG_VALIDATORS, XmtpService;
+var import_node_fs22, import_node_path26, DEFAULT_DATA_DIR, XMTP_INSTALLATION_WARNING_THRESHOLD, XMTP_INSTALLATION_NEAR_LIMIT_THRESHOLD, REPLAY_SCAN_INITIAL_BACKOFF_MS, REPLAY_SCAN_MAX_BACKOFF_MS, SENSITIVE_WORDS_LAZY_RETRY_COOLDOWN_MS, InboundReplayGate, SYSTEM_CONFIG_DEFAULTS, STREAM_RECOVERY_ALERT_THRESHOLD_MS, STREAM_RECOVERY_STABILITY_WINDOW_MS, REPLAY_GATE_DRAIN_MAX_ATTEMPTS, REPLAY_GATE_DRAIN_RETRY_DELAY_MS, SEMVER_RE, isRecord5, isPositiveNumber, SYSTEM_CONFIG_VALIDATORS, XmtpService;
 var init_xmtp_sdk = __esm({
   "../core/src/xmtp-sdk/index.ts"() {
     "use strict";
@@ -56699,6 +56790,7 @@ var init_xmtp_sdk = __esm({
       }
     };
     STREAM_RECOVERY_ALERT_THRESHOLD_MS = 3e4;
+    STREAM_RECOVERY_STABILITY_WINDOW_MS = 1e4;
     REPLAY_GATE_DRAIN_MAX_ATTEMPTS = 3;
     REPLAY_GATE_DRAIN_RETRY_DELAY_MS = 100;
     SEMVER_RE = /^(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-]+)*)?$/;
@@ -56753,6 +56845,9 @@ var init_xmtp_sdk = __esm({
       replayScanClearTimeout = (timer) => clearTimeout(timer);
       inboundReplayGates = /* @__PURE__ */ new Map();
       streamRecoveryCleanupByAddress = /* @__PURE__ */ new Map();
+      streamRecoverySetTimeout = (callback, delayMs) => setTimeout(callback, delayMs);
+      streamRecoveryClearTimeout = (timer) => clearTimeout(timer);
+      streamStartSetTimeout = (callback, delayMs) => setTimeout(callback, delayMs);
       nextClientGeneration = 1;
       clientGenerationByClient = /* @__PURE__ */ new WeakMap();
       resolveStartupReplayCompletion;
@@ -58205,10 +58300,14 @@ var init_xmtp_sdk = __esm({
             }
             const delay = BASE_DELAY_MS * 2 ** attempt;
             logWithTimestamp(`${tag} reconnecting in ${delay}ms (attempt=${attempt + 1})`);
-            setTimeout(() => void startWithRetry(attempt + 1), delay);
+            this.streamStartSetTimeout(
+              () => void startWithRetry(attempt + 1),
+              delay
+            );
           };
           const streamRecovery = new StreamRecoveryTelemetry();
           let recoveryTimeout;
+          let recoveryStabilityTimeout;
           let pendingRecoveryGate;
           let recoveryDisposed = false;
           this.cancelStreamRecoveryForAddress(address);
@@ -58216,9 +58315,13 @@ var init_xmtp_sdk = __esm({
             recoveryDisposed = true;
             streamRecovery.cancel();
             if (recoveryTimeout) {
-              clearTimeout(recoveryTimeout);
+              this.streamRecoveryClearTimeout(recoveryTimeout);
               recoveryTimeout = void 0;
             }
+            if (recoveryStabilityTimeout) {
+              this.streamRecoveryClearTimeout(recoveryStabilityTimeout);
+              recoveryStabilityTimeout = void 0;
+            }
           };
           this.streamRecoveryCleanupByAddress.set(
             addressKey,
@@ -58233,6 +58336,10 @@ var init_xmtp_sdk = __esm({
               logger.error(LogEvent.AGENT_UNHANDLED_ERROR, err2, agentExtras(identity));
               return;
             }
+            if (recoveryStabilityTimeout) {
+              this.streamRecoveryClearTimeout(recoveryStabilityTimeout);
+              recoveryStabilityTimeout = void 0;
+            }
             const recovery = streamRecovery.markError();
             const errorTelemetry = extractStreamErrorTelemetry(err2);
             if (!recovery.alreadyRecovering) {
@@ -58247,10 +58354,11 @@ var init_xmtp_sdk = __esm({
               recoveryAlreadyActive: String(recovery.alreadyRecovering)
             });
             if (!recovery.alreadyRecovering) {
-              recoveryTimeout = setTimeout(() => {
+              recoveryTimeout = this.streamRecoverySetTimeout(() => {
                 if (recoveryDisposed || this.clients.get(address) !== agent || this.stoppedAddresses.has(addressKey) || streamRecovery.activeSequence !== recovery.recoverySequence) {
                   return;
                 }
+                recoveryTimeout = void 0;
                 logger.error(LogEvent.AGENT_STREAM_RECOVERY_TIMEOUT, void 0, {
                   ...agentExtras(identity),
                   ...errorTelemetry,
@@ -58259,6 +58367,22 @@ var init_xmtp_sdk = __esm({
                   recoveryDurationMs: String(STREAM_RECOVERY_ALERT_THRESHOLD_MS),
                   thresholdMs: String(STREAM_RECOVERY_ALERT_THRESHOLD_MS)
                 });
+                const timedOutGate = pendingRecoveryGate;
+                pendingRecoveryGate = void 0;
+                void this.drainInboundReplayGate(address, timedOutGate).catch(
+                  (drainError) => {
+                    logger.error(
+                      LogEvent.OFFLINE_REPLAY_FAILED,
+                      drainError instanceof Error ? drainError : new Error(String(drainError)),
+                      {
+                        ...agentExtras(identity),
+                        clientGeneration: String(clientGeneration),
+                        recoverySequence: String(recovery.recoverySequence),
+                        stage: "streamRecovery/timeout-drain-gate"
+                      }
+                    );
+                  }
+                );
               }, STREAM_RECOVERY_ALERT_THRESHOLD_MS);
             }
           });
@@ -58266,60 +58390,61 @@ var init_xmtp_sdk = __esm({
             if (recoveryDisposed || this.clients.get(address) !== agent || this.stoppedAddresses.has(addressKey)) {
               return;
             }
-            const recovery = streamRecovery.markStarted();
-            if (recoveryTimeout) {
-              clearTimeout(recoveryTimeout);
-              recoveryTimeout = void 0;
-            }
+            const candidate = streamRecovery.markStarted();
             logWithTimestamp(
               `${tag} agent stream started agentId=${identity.onchainosAgentId ?? "(unknown)"} inboxId=${identity.inboxId ?? "(unknown)"} role=${identity.role ?? "(unknown)"} consentStates=Allowed,Unknown lastSync=${formatLogTimestamp2(this.syncByAddress.get(address))}`
             );
-            if (recovery) {
-              const recoveryGate = pendingRecoveryGate;
-              pendingRecoveryGate = void 0;
-              logger.info(LogEvent.AGENT_STREAM_RECOVERED, {
-                ...agentExtras(identity),
-                clientGeneration: String(clientGeneration),
-                recoverySequence: String(recovery.recoverySequence),
-                recoveryDurationMs: String(recovery.recoveryDurationMs)
-              });
-              void (async () => {
-                try {
-                  const summary = await this.replayOfflineMessagesForStreamRecovery(
-                    address,
-                    String(recovery.recoverySequence),
-                    agent
-                  );
-                  if (summary.outcome === "completed" && !recoveryDisposed && this.clients.get(address) === agent) {
-                    logger.info(LogEvent.AGENT_STREAM_RECOVERY_REPLAY_COMPLETED, {
-                      ...agentExtras(identity),
-                      clientGeneration: String(clientGeneration),
-                      recoverySequence: String(recovery.recoverySequence),
-                      replayed: String(summary.replayed),
-                      skipped: String(summary.skipped),
-                      conversationCount: String(summary.conversations),
-                      replayDurationMs: String(summary.durationMs),
-                      outcome: "success",
-                      replayOutcome: summary.outcome
-                    });
-                  }
-                } catch (err2) {
-                  logWithTimestamp(`${tag} recovery offline replay failed:`, err2);
-                  logger.error(
-                    LogEvent.OFFLINE_REPLAY_FAILED,
-                    err2 instanceof Error ? err2 : new Error(String(err2)),
-                    {
-                      ...agentExtras(identity),
-                      clientGeneration: String(clientGeneration),
-                      recoverySequence: String(recovery.recoverySequence),
-                      stage: "streamRecovery/replay"
-                    }
-                  );
-                } finally {
+            if (candidate) {
+              if (recoveryStabilityTimeout) {
+                this.streamRecoveryClearTimeout(recoveryStabilityTimeout);
+              }
+              recoveryStabilityTimeout = this.streamRecoverySetTimeout(() => {
+                recoveryStabilityTimeout = void 0;
+                if (recoveryDisposed || this.clients.get(address) !== agent || this.stoppedAddresses.has(addressKey) || streamRecovery.activeSequence !== candidate.recoverySequence) {
+                  return;
+                }
+                const recovery = streamRecovery.markStable();
+                if (!recovery) {
+                  return;
+                }
+                if (recoveryTimeout) {
+                  this.streamRecoveryClearTimeout(recoveryTimeout);
+                  recoveryTimeout = void 0;
+                }
+                const recoveryGate = pendingRecoveryGate;
+                pendingRecoveryGate = void 0;
+                logger.info(LogEvent.AGENT_STREAM_RECOVERED, {
+                  ...agentExtras(identity),
+                  clientGeneration: String(clientGeneration),
+                  recoverySequence: String(recovery.recoverySequence),
+                  recoveryDurationMs: String(recovery.recoveryDurationMs),
+                  recoveryConfirmationDurationMs: String(
+                    recovery.recoveryConfirmationDurationMs
+                  ),
+                  stabilityWindowMs: String(STREAM_RECOVERY_STABILITY_WINDOW_MS)
+                });
+                void (async () => {
                   try {
-                    await this.drainInboundReplayGate(address, recoveryGate);
+                    const summary = await this.replayOfflineMessagesForStreamRecovery(
+                      address,
+                      String(recovery.recoverySequence),
+                      agent
+                    );
+                    if (summary.outcome === "completed" && !recoveryDisposed && this.clients.get(address) === agent) {
+                      logger.info(LogEvent.AGENT_STREAM_RECOVERY_REPLAY_COMPLETED, {
+                        ...agentExtras(identity),
+                        clientGeneration: String(clientGeneration),
+                        recoverySequence: String(recovery.recoverySequence),
+                        replayed: String(summary.replayed),
+                        skipped: String(summary.skipped),
+                        conversationCount: String(summary.conversations),
+                        replayDurationMs: String(summary.durationMs),
+                        outcome: "success",
+                        replayOutcome: summary.outcome
+                      });
+                    }
                   } catch (err2) {
-                    logWithTimestamp(`${tag} recovery replay gate drain failed:`, err2);
+                    logWithTimestamp(`${tag} recovery offline replay failed:`, err2);
                     logger.error(
                       LogEvent.OFFLINE_REPLAY_FAILED,
                       err2 instanceof Error ? err2 : new Error(String(err2)),
@@ -58327,12 +58452,28 @@ var init_xmtp_sdk = __esm({
                         ...agentExtras(identity),
                         clientGeneration: String(clientGeneration),
                         recoverySequence: String(recovery.recoverySequence),
-                        stage: "streamRecovery/drain-gate"
+                        stage: "streamRecovery/replay"
                       }
                     );
+                  } finally {
+                    try {
+                      await this.drainInboundReplayGate(address, recoveryGate);
+                    } catch (err2) {
+                      logWithTimestamp(`${tag} recovery replay gate drain failed:`, err2);
+                      logger.error(
+                        LogEvent.OFFLINE_REPLAY_FAILED,
+                        err2 instanceof Error ? err2 : new Error(String(err2)),
+                        {
+                          ...agentExtras(identity),
+                          clientGeneration: String(clientGeneration),
+                          recoverySequence: String(recovery.recoverySequence),
+                          stage: "streamRecovery/drain-gate"
+                        }
+                      );
+                    }
                   }
-                }
-              })();
+                })();
+              }, STREAM_RECOVERY_STABILITY_WINDOW_MS);
             }
             if (process.env.XMTP_FORCE_DEBUG === "true") {
               void logDetails(agent).catch((err2) => {
@@ -58351,7 +58492,7 @@ var init_xmtp_sdk = __esm({
           logWithTimestamp(`${tag} message listener started`);
         });
       }
-      async replayOfflineMessagesForAddress(address, expectedClient, trigger = "periodic_repair") {
+      async replayOfflineMessagesForAddress(address, expectedClient, trigger = "periodic_repair", recoveryIdentity) {
         const addressReplayStartedAt = Date.now();
         const summary = createOfflineReplayAddressSummary(address);
         const isOfflineReplay = isOfflineReplayForTrigger(trigger);
@@ -58451,6 +58592,8 @@ var init_xmtp_sdk = __esm({
               walletAddress: address,
               stage: `offlineReplay/${stage}`,
               trigger,
+              clientGeneration: String(clientGeneration),
+              ...recoveryIdentity ? { recoverySequence: recoveryIdentity } : {},
               outcome: "failed",
               replayOutcome: summary.outcome,
               consecutiveFailures: String(consecutiveFailures),
@@ -58645,8 +58788,7 @@ var init_xmtp_sdk = __esm({
         const clientGeneration = expectedClient ? this.getClientGeneration(expectedClient) : "missing";
         const eligibilityClass = replaySingleFlightDiscriminator(
           trigger,
-          clientGeneration,
-          recoveryIdentity
+          clientGeneration
         );
         return this.offlineReplaySingleFlight.run(
           address,
@@ -58656,9 +58798,14 @@ var init_xmtp_sdk = __esm({
             return this.replayOfflineMessagesForAddress(
               address,
               expectedClient,
-              trigger
+              trigger,
+              recoveryIdentity
             );
-          }
+          },
+          trigger === "stream_recovery" ? {
+            queueBehindActive: true,
+            shouldRunAfterActive: (summary) => summary.outcome === "completed"
+          } : void 0
         );
       }
       async replayOfflineMessagesForStreamRecovery(address, recoveryIdentity, expectedClient) {
@@ -59609,14 +59756,9 @@ var init_signer = __esm({
 });
 
 // ../core/src/a2a/pending-conversation.ts
-function buildPendingConversationBackupNotice(jobId) {
-  return PENDING_CONVERSATION_BACKUP_NOTICE_TEMPLATE.replace("${jobId}", jobId);
-}
-var PENDING_CONVERSATION_BACKUP_NOTICE_TEMPLATE;
 var init_pending_conversation = __esm({
   "../core/src/a2a/pending-conversation.ts"() {
     "use strict";
-    PENDING_CONVERSATION_BACKUP_NOTICE_TEMPLATE = "[event:provider_conversation][jobId:${jobId}] There are new conversation requests pending.";
   }
 });
 
@@ -65718,17 +65860,22 @@ async function maybeAllowProviderGroup(deps, chatType, conversationId) {
     );
   }
 }
-function shouldKeepInboundGroupPendingForBuyer(input) {
-  return input.consentState === import_node_bindings2.ConsentState.Unknown && !input.hasExistingSession && (input.localAgentRole === 1 /* CLIENT */ || input.localAgentRole == null);
-}
-function buildPendingConversationBackupDispatch(input) {
-  return {
-    sessionKey: buildBackupJobSessionKey(input.jobId),
-    content: buildPendingConversationBackupNotice(input.jobId),
-    messageId: `pending-conversation:${input.messageId}`,
+function ensureInboundGroupSession(deps, input) {
+  const sessionKey = buildSessionKey({
     jobId: input.jobId,
-    agentId: null
-  };
+    myAgentId: input.myAgentId,
+    toAgentId: input.toAgentId
+  });
+  deps.sessionStore?.upsertSession({
+    sessionKey,
+    jobId: input.jobId,
+    myAgentId: input.myAgentId,
+    toAgentId: input.toAgentId,
+    groupId: input.groupId,
+    myAgentXmtpAddress: deps.myXmtpAddress,
+    toAgentXmtpAddress: input.toAgentXmtpAddress
+  });
+  return sessionKey;
 }
 function inboundStageExtras(stage, outcome) {
   return {
@@ -65785,30 +65932,6 @@ function buildInboundTerminalExtras(input) {
     })
   };
 }
-function notifyPendingConversationToBackup(params) {
-  const event = buildPendingConversationBackupDispatch({
-    jobId: params.jobId,
-    messageId: params.messageId
-  });
-  void Promise.resolve(params.deps.onSessionMessage?.(event)).catch((err2) => {
-    logWithTimestamp(`[okx-agent-task:${params.deps.myXmtpAddress}] pending conversation backup dispatch failed:`, err2);
-    logger.error(LogEvent.INBOUND_DISPATCH_FAILED, toLoggableError(err2), {
-      ...buildInboundTerminalExtras({
-        terminalState: "dispatch_failed",
-        myXmtpAddress: params.deps.myXmtpAddress,
-        messageId: event.messageId,
-        jobId: params.jobId,
-        sessionKey: event.sessionKey,
-        route: "backup",
-        reason: "pending_backup_dispatch_failed"
-      }),
-      // Each fire-and-forget dispatch overrides the generic checkpoint with the
-      // `_failed` twin of its own success checkpoint, so the four paths stay
-      // distinguishable in the funnel.
-      checkpoint: "inbound/pending_backup_dispatch_failed"
-    });
-  });
-}
 function maybeNotifyInboundAgentMessage(params) {
   if (params.chatType === "dm") {
     return;
@@ -66164,67 +66287,50 @@ async function verifyInboundA2AGroupMessage(params) {
   const sender = isPlainObject3(payload.sender) ? payload.sender : null;
   const senderAgentId = readString5(sender?.agentId);
   const senderRole = readNumber(sender?.role);
-  if (myAgent?.agentId && senderAgentId && (senderRole === 1 /* CLIENT */ || senderRole === 2 /* PROVIDER */)) {
-    const isSenderClient = senderRole === 1 /* CLIENT */;
-    const providerSecurityRate = (isSenderClient ? myAgent.securityRate : XmtpService.getInstance().getAgentByAgentId(senderAgentId)?.securityRate) ?? 0;
-    try {
-      const eligibilityStartedAt = Date.now();
-      const result = await checkMessageEligible({
-        agentId: myAgent.agentId,
-        clientAgentId: isSenderClient ? senderAgentId : myAgent.agentId,
-        providerAgentId: isSenderClient ? myAgent.agentId : senderAgentId,
-        clientCommunicationAddress: isSenderClient ? senderAddress : myXmtpAddress,
-        providerCommunicationAddress: isSenderClient ? myXmtpAddress : senderAddress,
-        jobId,
-        groupId,
-        direction: isSenderClient ? "client_to_provider" : "provider_to_client",
-        providerSecurityRate,
-        isOfflineReplay
-      });
-      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) {
-        logWithTimestamp(
-          `[okx-agent-task:${myXmtpAddress}] message-eligible check failed, dropping: sender=${senderAddress} job=${jobId} reason=${result.reason ?? ""}`
-        );
-        logger.info(LogEvent.INBOUND_BLOCKED_INELIGIBLE, {
-          ...agentExtras({ walletAddress: myXmtpAddress, onchainosAgentId: myAgent.agentId }),
-          peerWalletAddress: senderAddress,
-          peerInboxId: senderInboxId,
-          peerAgentId: senderAgentId,
-          taskId: jobId,
-          conversationId: groupId,
-          messageId,
-          direction: isSenderClient ? "client_to_provider" : "provider_to_client",
-          providerSecurityRate: String(providerSecurityRate),
-          ...inboundStageExtras("inbound/eligibility_check", "blocked"),
-          reason: result.reason ?? "",
-          ...timing?.extras()
-        });
-        recordInvalidXmtpMessageBestEffort({
-          messageId,
-          groupId,
-          jobId,
-          agentId: senderAgentId,
-          localAgentId: myAgent.agentId,
-          senderAddress,
-          senderInboxId,
-          reason: result.reason ?? "message_ineligible",
-          stage: "inbound/eligibility_check",
-          logTag: `[okx-agent-task:${myXmtpAddress}]`
-        });
-        return false;
-      }
-    } catch (err2) {
-      const failureMessage = err2 instanceof Error ? err2.message : String(err2);
+  if (!senderAgentId || !myAgent) {
+    const reason = !senderAgentId ? "missing_sender_agent_id" : "local_agent_not_found";
+    logWithTimestamp(
+      `[okx-agent-task:${myXmtpAddress}] inbound agent identity missing, dropping: sender=${senderAddress} job=${jobId} group=${groupId} reason=${reason}`
+    );
+    recordInvalidXmtpMessageBestEffort({
+      messageId,
+      groupId,
+      jobId,
+      agentId: senderAgentId,
+      localAgentId: myAgent?.agentId ?? null,
+      senderAddress,
+      senderInboxId,
+      reason,
+      stage: "inbound/identity_check",
+      logTag: `[okx-agent-task:${myXmtpAddress}]`
+    });
+    return false;
+  }
+  const isSenderClient = senderRole === 1 /* CLIENT */;
+  const providerSecurityRate = (isSenderClient ? myAgent.securityRate : XmtpService.getInstance().getAgentByAgentId(senderAgentId)?.securityRate) ?? 0;
+  try {
+    const eligibilityStartedAt = Date.now();
+    const result = await checkMessageEligible({
+      agentId: myAgent.agentId,
+      clientAgentId: isSenderClient ? senderAgentId : myAgent.agentId,
+      providerAgentId: isSenderClient ? myAgent.agentId : senderAgentId,
+      clientCommunicationAddress: isSenderClient ? senderAddress : myXmtpAddress,
+      providerCommunicationAddress: isSenderClient ? myXmtpAddress : senderAddress,
+      jobId,
+      groupId,
+      direction: isSenderClient ? "client_to_provider" : "provider_to_client",
+      providerSecurityRate,
+      isOfflineReplay
+    });
+    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) {
       logWithTimestamp(
-        `[okx-agent-task:${myXmtpAddress}] message-eligible call failed, dropping message:
-${failureMessage}`,
-        err2
+        `[okx-agent-task:${myXmtpAddress}] message-eligible check failed, dropping: sender=${senderAddress} job=${jobId} reason=${result.reason ?? ""}`
       );
-      logger.error(LogEvent.INBOUND_BLOCKED_INELIGIBLE, err2 instanceof Error ? err2 : new Error(String(err2)), {
+      logger.info(LogEvent.INBOUND_BLOCKED_INELIGIBLE, {
         ...agentExtras({ walletAddress: myXmtpAddress, onchainosAgentId: myAgent.agentId }),
         peerWalletAddress: senderAddress,
         peerInboxId: senderInboxId,
@@ -66235,7 +66341,7 @@ ${failureMessage}`,
         direction: isSenderClient ? "client_to_provider" : "provider_to_client",
         providerSecurityRate: String(providerSecurityRate),
         ...inboundStageExtras("inbound/eligibility_check", "blocked"),
-        reason: "eligibility_service_error",
+        reason: result.reason ?? "",
         ...timing?.extras()
       });
       recordInvalidXmtpMessageBestEffort({
@@ -66246,12 +66352,46 @@ ${failureMessage}`,
         localAgentId: myAgent.agentId,
         senderAddress,
         senderInboxId,
-        reason: failureMessage,
+        reason: result.reason ?? "message_ineligible",
         stage: "inbound/eligibility_check",
         logTag: `[okx-agent-task:${myXmtpAddress}]`
       });
       return false;
     }
+  } catch (err2) {
+    const failureMessage = err2 instanceof Error ? err2.message : String(err2);
+    logWithTimestamp(
+      `[okx-agent-task:${myXmtpAddress}] message-eligible call failed, dropping message:
+${failureMessage}`,
+      err2
+    );
+    logger.error(LogEvent.INBOUND_BLOCKED_INELIGIBLE, err2 instanceof Error ? err2 : new Error(String(err2)), {
+      ...agentExtras({ walletAddress: myXmtpAddress, onchainosAgentId: myAgent.agentId }),
+      peerWalletAddress: senderAddress,
+      peerInboxId: senderInboxId,
+      peerAgentId: senderAgentId,
+      taskId: jobId,
+      conversationId: groupId,
+      messageId,
+      direction: isSenderClient ? "client_to_provider" : "provider_to_client",
+      providerSecurityRate: String(providerSecurityRate),
+      ...inboundStageExtras("inbound/eligibility_check", "blocked"),
+      reason: "eligibility_service_error",
+      ...timing?.extras()
+    });
+    recordInvalidXmtpMessageBestEffort({
+      messageId,
+      groupId,
+      jobId,
+      agentId: senderAgentId,
+      localAgentId: myAgent.agentId,
+      senderAddress,
+      senderInboxId,
+      reason: failureMessage,
+      stage: "inbound/eligibility_check",
+      logTag: `[okx-agent-task:${myXmtpAddress}]`
+    });
+    return false;
   }
   const content2 = readString5(payload.content);
   if (!content2) {
@@ -66616,7 +66756,7 @@ async function processFileMessage(ctx, deps, options = {}) {
     }
     const sender = isPlainObject3(payloadObject?.sender) ? payloadObject.sender : null;
     const localAgent = service.getAgentByAddress(deps.myXmtpAddress);
-    const myAgentId = localAgent?.agentId ?? sessionAgentId ?? null;
+    const myAgentId = localAgent?.agentId ?? readString5(payloadObject?.receiverAgentId) ?? sessionAgentId ?? null;
     const toAgentId = readString5(sender?.agentId);
     const accepted = await verifyInboundA2AGroupMessage({
       payload: parsed.parsed ? parsed.payload : null,
@@ -66634,50 +66774,13 @@ async function processFileMessage(ctx, deps, options = {}) {
     if (!accepted) {
       return true;
     }
-    const sessionKey = buildSessionKey({
-      jobId: route.jobId,
-      myAgentId,
-      toAgentId
-    });
-    const existingSession = deps.sessionStore?.getSession(sessionKey) ?? null;
     const routedMessageId = messageId || `group-${(0, import_node_crypto14.randomUUID)()}`;
-    const consentState = ctx.conversation instanceof Group ? ctx.conversation.consentState() : void 0;
-    if (shouldKeepInboundGroupPendingForBuyer({
-      consentState,
-      localAgentRole: localAgent?.role ?? null,
-      hasExistingSession: !!existingSession
-    })) {
-      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, {
-        ...agentExtras({ walletAddress: deps.myXmtpAddress, onchainosAgentId: localAgent?.agentId }),
-        peerWalletAddress: senderAddress,
-        peerInboxId: ctx.message.senderInboxId ?? "",
-        peerAgentId: toAgentId ?? "",
-        taskId: route.jobId,
-        conversationId,
-        messageId: routedMessageId,
-        consentState: String(consentState),
-        ...inboundStageExtras("inbound/buyer_pending", "pending"),
-        reason: "unknown_group_without_session",
-        ...timing.extras()
-      });
-      notifyPendingConversationToBackup({
-        deps,
-        jobId: route.jobId,
-        messageId: routedMessageId
-      });
-      return true;
-    }
-    deps.sessionStore?.upsertSession({
-      sessionKey,
+    const sessionKey = ensureInboundGroupSession(deps, {
       jobId: route.jobId,
       myAgentId,
       toAgentId,
-      groupId: conversationId || null,
-      myAgentXmtpAddress: deps.myXmtpAddress,
-      toAgentXmtpAddress: senderAddress || null
+      groupId: conversationId,
+      toAgentXmtpAddress: senderAddress || readString5(payloadObject?.fromXmtpAddress)
     });
     const dispatchStartedAt = Date.now();
     void Promise.resolve(deps.onSessionMessage?.({
@@ -67397,12 +67500,12 @@ async function runListenerWithLock(options, paths) {
       });
     }
   });
-  service.setPluginVersion("0.2.4-beta-e7a52faf6f-260812154627");
+  service.setPluginVersion("0.2.5");
   await service.init();
   const pluginVersionStatus = service.pluginVersionStatus;
   if (pluginVersionStatus.unavailable) {
     throw new Error(
-      `@okxweb3/a2a-node v${"0.2.4-beta-e7a52faf6f-260812154627"} is below the required minimum v${pluginVersionStatus.minVersion}`
+      `@okxweb3/a2a-node v${"0.2.5"} is below the required minimum v${pluginVersionStatus.minVersion}`
     );
   }
   const systemConfig = service.getSystemConfig();
@@ -67420,7 +67523,7 @@ async function runListenerWithLock(options, paths) {
       onchainosAgentId: "*",
       reason: "system-config missing sentryDsn",
       pluginId: "@okxweb3/a2a-node",
-      pluginVersion: "0.2.4-beta-e7a52faf6f-260812154627"
+      pluginVersion: "0.2.5"
     });
   }
   logWithTimestamp(
@@ -112604,6 +112707,13 @@ async function watchUserAttention(store, parsed, json) {
     throw new Error("--from-now has been removed; user watch always returns existing pending items first");
   }
   const jobId = normalizeWatchJobId(parsed.options.get("job-id"));
+  if (jobId) {
+    setJobProviderToCurrentPlatform({
+      store,
+      jobId,
+      env: process.env
+    });
+  }
   const provider = readProviderFilter(store, parsed, jobId);
   const preparation = await prepareRuntimeSelectionForWatchedJob(store, jobId, json);
   assertWatchedJobPrepared(jobId, preparation, json);
@@ -113451,6 +113561,7 @@ var init_user_attention_cli = __esm({
     init_session_store();
     init_user_attention_ipc();
     init_ai_provider();
+    init_job_provider();
     init_outbound_behavior();
     init_openclaw_gateway();
     init_openclaw_gateway_config();
@@ -115814,7 +115925,7 @@ async function getCurrentNodeCliVersion() {
   return await getGlobalNpmPackageVersion(UPDATE_PACKAGES.node) ?? getBundledNodeCliVersion();
 }
 function getBundledNodeCliVersion() {
-  return true ? "0.2.4-beta-e7a52faf6f-260812154627" : null;
+  return true ? "0.2.5" : null;
 }
 function readConfiguredAiProvider() {
   const explicit = process.env.OKX_A2A_AI_PROVIDER || process.env.OKX_AGENT_TASK_AI_CLI;
@@ -116024,7 +116135,7 @@ async function updateHermes(release, options) {
   }
 }
 async function installGatewayPluginForDoctor(target) {
-  const release = isPrereleaseVersion("0.2.4-beta-e7a52faf6f-260812154627") ? "beta" : "latest";
+  const release = isPrereleaseVersion("0.2.5") ? "beta" : "latest";
   const insideTargetGateway = detectGatewayInvocation() === target;
   const options = {
     restart: !insideTargetGateway,
@@ -117067,7 +117178,7 @@ async function runDoctor(options = {}) {
     platform: options.platform ?? process.platform,
     env: options.env ?? process.env,
     target: options.target ?? resolveDoctorTarget(options.env ?? process.env),
-    cliVersion: options.cliVersion ?? (true ? "0.2.4-beta-e7a52faf6f-260812154627" : "0.0.0"),
+    cliVersion: options.cliVersion ?? (true ? "0.2.5" : "0.0.0"),
     fixMode: options.fix === true,
     nonInteractive: options.nonInteractive === true,
     packageChanged: false,
@@ -118055,6 +118166,7 @@ init_command_store();
 init_file_store();
 init_ai_provider();
 init_runtime_switch();
+init_job_provider();
 init_session_store();
 init_paths();
 init_task_config();
@@ -118064,7 +118176,7 @@ init_sentry_logger();
 init_sentry_config();
 var CURRENT_GATEWAY_SESSION_KEYS_ENV4 = "OKX_A2A_CURRENT_GATEWAY_SESSION_KEYS";
 function printUsage3() {
-  console.log(`okx-a2a ${"0.2.4-beta-e7a52faf6f-260812154627"}
+  console.log(`okx-a2a ${"0.2.5"}
 
 Usage:
   okx-a2a <command> [options]
@@ -118104,7 +118216,7 @@ Run \`okx-a2a <command> -h\` for command-specific help.
 `);
 }
 function printVersion() {
-  console.log("0.2.4-beta-e7a52faf6f-260812154627");
+  console.log("0.2.5");
 }
 function printDaemonUsage() {
   console.log(`Usage: okx-a2a daemon <start|restart|stop|status|autostart> [options]
@@ -119243,8 +119355,11 @@ async function handleJobProvider(args) {
     }
     if (subcommand === "set") {
       const jobId = readRequiredOption4(rest, "--job-id");
-      const provider = normalizeAiProvider(readRequiredOption4(rest, "--provider"));
-      const binding = store.setJobProviderBinding({ jobId, provider });
+      const binding = setJobProvider({
+        store,
+        jobId,
+        provider: readRequiredOption4(rest, "--provider")
+      });
       if (json) {
         console.log(JSON.stringify({ ok: true, binding }));
       } else {
@@ -119540,7 +119655,7 @@ async function main() {
   if (command === "xmtp-test") {
     const { handleXmtpTestCommand: handleXmtpTestCommand2 } = await Promise.resolve().then(() => (init_xmtp_test_cli(), xmtp_test_cli_exports));
     await handleXmtpTestCommand2(process.argv.slice(3), {
-      packageVersion: "0.2.4-beta-e7a52faf6f-260812154627",
+      packageVersion: "0.2.5",
       agentSdkVersion: "2.3.0",
       nodeSdkVersion: "6.1.0",
       nodeBindingsVersion: "1.11.0"