@okxweb3/a2a-node 0.2.8 → 0.2.9-beta-cb068eb2d0-260824220115

package/dist/cli.js

@@ -19931,6 +19931,7 @@ var init_events = __esm({
       AGENT_CLIENT_REMOVED: "Agent client removed",
       AGENT_STREAM_RECOVERED: "Agent stream recovered",
       AGENT_STREAM_RECOVERY_REPLAY_COMPLETED: "Agent stream recovery replay completed",
+      AGENT_STREAM_RECOVERY_REPLAY_TERMINATED: "Agent stream recovery replay terminated",
       ADDRESS_SYNC_COMPLETED: "Address sync completed",
       AGENT_REFRESH_SESSION_EXPIRED: "Agent refresh aborted: onchainos session expired, local clients taken offline",
       OFFLINE_REPLAY_MESSAGE_REPLAYED: "Offline replay message replayed",
@@ -20846,6 +20847,7 @@ var init_sentry_logger = __esm({
       LogEvent.AGENT_STREAM_ERROR,
       LogEvent.AGENT_STREAM_RECOVERED,
       LogEvent.AGENT_STREAM_RECOVERY_REPLAY_COMPLETED,
+      LogEvent.AGENT_STREAM_RECOVERY_REPLAY_TERMINATED,
       LogEvent.ADDRESS_SYNC_COMPLETED,
       LogEvent.AGENTS_REFRESHED,
       LogEvent.AGENTS_WAKEUP_NOTIFIED,
@@ -26932,7 +26934,7 @@ function buildConnectParams(config, instanceId, protocolVersion) {
     client: {
       id: "gateway-client",
       displayName: "okx-a2a-node",
-      version: "0.2.8",
+      version: "0.2.9-beta-cb068eb2d0-260824220115",
       platform: "node",
       mode: "backend",
       instanceId
@@ -26943,7 +26945,7 @@ function buildConnectParams(config, instanceId, protocolVersion) {
     commands: [],
     permissions: {},
     locale: Intl.DateTimeFormat().resolvedOptions().locale || "en-US",
-    userAgent: `okx-a2a-node/${"0.2.8"}`,
+    userAgent: `okx-a2a-node/${"0.2.9-beta-cb068eb2d0-260824220115"}`,
     auth: {
       ...config.token ? { token: config.token } : {},
       ...config.password ? { password: config.password } : {}
@@ -28910,7 +28912,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.8",
+      release: "0.2.9-beta-cb068eb2d0-260824220115",
       environment,
       runtimeContainer: normalizeRuntimeContainer(process.env.OKX_A2A_RUNTIME_CONTAINER)
     };
@@ -40080,7 +40082,7 @@ async function exportDiagnosticLogs(options) {
     node: process.version,
     platform: process.platform,
     arch: process.arch,
-    packageVersion: true ? "0.2.8" : "unknown",
+    packageVersion: true ? "0.2.9-beta-cb068eb2d0-260824220115" : "unknown",
     sensitiveContentIncluded: options.includeSensitiveContent,
     listenerAndLlmContentIncluded: true,
     credentialsAlwaysRedacted: true,
@@ -57126,6 +57128,12 @@ function replayScanBackoffMs(consecutiveFailures) {
     REPLAY_SCAN_MAX_BACKOFF_MS
   );
 }
+function replayScanBackoffWithJitterMs(consecutiveFailures, randomValue = Math.random()) {
+  const baseMs = replayScanBackoffMs(consecutiveFailures);
+  const boundedRandom = Math.min(1, Math.max(0, randomValue));
+  const jitteredMs = Math.round(baseMs * (0.9 + boundedRandom * 0.2));
+  return Math.min(REPLAY_SCAN_MAX_BACKOFF_MS, jitteredMs);
+}
 function isOfflineReplayForTrigger(trigger) {
   return trigger === "startup";
 }
@@ -57312,6 +57320,7 @@ var init_xmtp_sdk = __esm({
       replayScanFailuresByAddress = /* @__PURE__ */ new Map();
       replayScanRetryByAddress = /* @__PURE__ */ new Map();
       replayScanNowMs = () => Date.now();
+      replayScanRandom = () => Math.random();
       replayScanSetTimeout = (callback, delayMs) => setTimeout(callback, delayMs);
       replayScanClearTimeout = (timer) => clearTimeout(timer);
       inboundReplayGates = /* @__PURE__ */ new Map();
@@ -57798,7 +57807,7 @@ var init_xmtp_sdk = __esm({
             this.clients.delete(address);
             this.inboundReplayGates.delete(address.toLowerCase());
             this.replayScanFailuresByAddress.delete(address.toLowerCase());
-            this.clearReplayScanRetry(address);
+            this.clearReplayScanRetry(address, "client_removed");
             logger.info(LogEvent.AGENT_CLIENT_REMOVED, {
               ...agentExtras({
                 walletAddress: address,
@@ -58014,7 +58023,7 @@ var init_xmtp_sdk = __esm({
             this.clients.delete(address);
             this.inboundReplayGates.delete(addressKey);
             this.replayScanFailuresByAddress.delete(addressKey);
-            this.clearReplayScanRetry(address);
+            this.clearReplayScanRetry(address, "client_recycled");
             logWithTimestamp(
               `[xmtp-sdk] recycle: stopped client: ${address} (agentId=${agentInfo.agentId})`
             );
@@ -58564,7 +58573,23 @@ var init_xmtp_sdk = __esm({
         this.clientGenerationByClient.set(client, generation);
         return generation;
       }
-      clearReplayScanRetry(address) {
+      logStreamRecoveryReplayTerminal(address, clientGeneration, recoveryIdentities, terminalReason) {
+        for (const recoverySequence of recoveryIdentities) {
+          logger.info(LogEvent.AGENT_STREAM_RECOVERY_REPLAY_TERMINATED, {
+            ...agentExtras({
+              walletAddress: address,
+              onchainosAgentId: this.getAgentByAddress(address)?.agentId,
+              role: this.getAgentByAddress(address)?.role
+            }),
+            clientGeneration: String(clientGeneration),
+            recoverySequence,
+            outcome: "terminal",
+            replayOutcome: "terminated",
+            terminalReason
+          });
+        }
+      }
+      clearReplayScanRetry(address, terminalReason) {
         const addressKey = address.toLowerCase();
         const scheduled = this.replayScanRetryByAddress.get(addressKey);
         if (!scheduled) {
@@ -58572,15 +58597,31 @@ var init_xmtp_sdk = __esm({
         }
         this.replayScanRetryByAddress.delete(addressKey);
         this.replayScanClearTimeout(scheduled.timer);
+        if (terminalReason) {
+          this.logStreamRecoveryReplayTerminal(
+            address,
+            scheduled.clientGeneration,
+            scheduled.recoveryIdentities,
+            terminalReason
+          );
+        }
       }
-      scheduleReplayScanRetry(address, expectedClient, clientGeneration, retryTrigger, delayMs) {
+      scheduleReplayScanRetry(address, expectedClient, clientGeneration, retryTrigger, delayMs, recoveryIdentities = []) {
         const addressKey = address.toLowerCase();
         const scheduled = this.replayScanRetryByAddress.get(addressKey);
         if (scheduled?.clientGeneration === clientGeneration) {
+          if (retryTrigger === "stream_recovery") {
+            scheduled.retryTrigger = retryTrigger;
+            for (const recoveryIdentity of recoveryIdentities) {
+              if (!scheduled.recoveryIdentities.includes(recoveryIdentity)) {
+                scheduled.recoveryIdentities.push(recoveryIdentity);
+              }
+            }
+          }
           return;
         }
         if (scheduled) {
-          this.clearReplayScanRetry(address);
+          this.clearReplayScanRetry(address, "client_replaced");
         }
         const timer = this.replayScanSetTimeout(() => {
           const current = this.replayScanRetryByAddress.get(addressKey);
@@ -58589,12 +58630,18 @@ var init_xmtp_sdk = __esm({
           }
           this.replayScanRetryByAddress.delete(addressKey);
           if (this.clients.get(address) !== expectedClient || this.stoppedAddresses.has(addressKey)) {
+            this.logStreamRecoveryReplayTerminal(
+              address,
+              current.clientGeneration,
+              current.recoveryIdentities,
+              this.stoppedAddresses.has(addressKey) ? "client_stopped" : "client_replaced"
+            );
             return;
           }
           void this.replayOfflineMessagesForAddressSingleFlight(
             address,
-            retryTrigger,
-            void 0,
+            current.retryTrigger,
+            current.recoveryIdentities.at(-1),
             expectedClient
           ).catch((err2) => {
             logWithTimestamp(
@@ -58615,6 +58662,8 @@ var init_xmtp_sdk = __esm({
         timer.unref?.();
         this.replayScanRetryByAddress.set(addressKey, {
           clientGeneration,
+          retryTrigger,
+          recoveryIdentities: retryTrigger === "stream_recovery" ? [...new Set(recoveryIdentities)] : [],
           timer
         });
       }
@@ -58901,7 +58950,7 @@ var init_xmtp_sdk = __esm({
                       String(recovery.recoverySequence),
                       agent
                     );
-                    if (summary.outcome === "completed" && !recoveryDisposed && this.clients.get(address) === agent) {
+                    if (summary.outcome === "completed" && summary.consecutiveFailures === void 0 && !recoveryDisposed && this.clients.get(address) === agent) {
                       logger.info(LogEvent.AGENT_STREAM_RECOVERY_REPLAY_COMPLETED, {
                         ...agentExtras(identity),
                         clientGeneration: String(clientGeneration),
@@ -58998,10 +59047,16 @@ var init_xmtp_sdk = __esm({
         let priorFailure = this.replayScanFailuresByAddress.get(addressKey);
         if (priorFailure && priorFailure.clientGeneration !== clientGeneration) {
           this.replayScanFailuresByAddress.delete(addressKey);
-          this.clearReplayScanRetry(address);
+          this.clearReplayScanRetry(address, "client_replaced");
           priorFailure = void 0;
         }
         if (priorFailure && attemptNowMs < priorFailure.nextAttemptAtMs) {
+          if (trigger === "stream_recovery") {
+            priorFailure.retryTrigger = trigger;
+            if (recoveryIdentity && !priorFailure.recoveryIdentities.includes(recoveryIdentity)) {
+              priorFailure.recoveryIdentities.push(recoveryIdentity);
+            }
+          }
           priorFailure.suppressedAttempts++;
           summary.outcome = "suppressed_backoff";
           summary.failureStage = priorFailure.lastFailureStage;
@@ -59018,7 +59073,8 @@ var init_xmtp_sdk = __esm({
             agent,
             clientGeneration,
             priorFailure.retryTrigger,
-            summary.backoffMs
+            summary.backoffMs,
+            priorFailure.recoveryIdentities
           );
           summary.durationMs = Date.now() - addressReplayStartedAt;
           return summary;
@@ -59031,15 +59087,23 @@ var init_xmtp_sdk = __esm({
         const recordScanFailure = (stage, err2) => {
           const previous = this.replayScanFailuresByAddress.get(addressKey);
           const consecutiveFailures = (previous?.consecutiveFailures ?? 0) + 1;
-          const backoffMs = replayScanBackoffMs(consecutiveFailures);
+          const backoffMs = replayScanBackoffWithJitterMs(
+            consecutiveFailures,
+            this.replayScanRandom()
+          );
           const suppressedAttempts = previous?.suppressedAttempts ?? 0;
           const failureNowMs = this.replayScanNowMs();
-          const retryTrigger = isOfflineReplayForTrigger(trigger) ? "startup" : "periodic_repair";
+          const recoveryIdentities = [...previous?.recoveryIdentities ?? []];
+          if (trigger === "stream_recovery" && recoveryIdentity && !recoveryIdentities.includes(recoveryIdentity)) {
+            recoveryIdentities.push(recoveryIdentity);
+          }
+          const retryTrigger = trigger === "stream_recovery" ? trigger : previous?.retryTrigger ?? trigger;
           this.replayScanFailuresByAddress.set(addressKey, {
             clientGeneration,
             consecutiveFailures,
             nextAttemptAtMs: failureNowMs + backoffMs,
             retryTrigger,
+            recoveryIdentities,
             suppressedAttempts: 0,
             lastFailureStage: stage
           });
@@ -59048,7 +59112,8 @@ var init_xmtp_sdk = __esm({
             agent,
             clientGeneration,
             retryTrigger,
-            backoffMs
+            backoffMs,
+            recoveryIdentities
           );
           summary.outcome = stage === "syncAll" ? "sync_failed" : "list_failed";
           summary.failureStage = stage;
@@ -59245,6 +59310,30 @@ var init_xmtp_sdk = __esm({
           recoveredAfterFailures: String(recoveredFailure?.consecutiveFailures ?? 0),
           suppressedAttempts: String(recoveredFailure?.suppressedAttempts ?? 0)
         });
+        if (recoveredFailure) {
+          for (const recoverySequence of recoveredFailure.recoveryIdentities) {
+            logger.info(LogEvent.AGENT_STREAM_RECOVERY_REPLAY_COMPLETED, {
+              ...agentExtras({
+                walletAddress: address,
+                inboxId: agent.client?.inboxId,
+                onchainosAgentId: this.getAgentByAddress(address)?.agentId,
+                role: this.getAgentByAddress(address)?.role
+              }),
+              clientGeneration: String(clientGeneration),
+              recoverySequence,
+              replayed: String(summary.replayed),
+              skipped: String(summary.skipped),
+              conversationCount: String(summary.conversations),
+              replayDurationMs: String(Date.now() - addressReplayStartedAt),
+              outcome: "success",
+              replayOutcome: "completed",
+              recoveredAfterFailures: String(
+                recoveredFailure.consecutiveFailures
+              ),
+              suppressedAttempts: String(recoveredFailure.suppressedAttempts)
+            });
+          }
+        }
         summary.outcome = "completed";
         summary.consecutiveFailures = recoveredFailure?.consecutiveFailures;
         summary.suppressedAttempts = recoveredFailure?.suppressedAttempts;
@@ -68079,12 +68168,12 @@ async function runListenerWithLock(options, paths) {
       });
     }
   });
-  service.setPluginVersion("0.2.8");
+  service.setPluginVersion("0.2.9-beta-cb068eb2d0-260824220115");
   await service.init();
   const pluginVersionStatus = service.pluginVersionStatus;
   if (pluginVersionStatus.unavailable) {
     throw new Error(
-      `@okxweb3/a2a-node v${"0.2.8"} is below the required minimum v${pluginVersionStatus.minVersion}`
+      `@okxweb3/a2a-node v${"0.2.9-beta-cb068eb2d0-260824220115"} is below the required minimum v${pluginVersionStatus.minVersion}`
     );
   }
   const systemConfig = service.getSystemConfig();
@@ -68112,7 +68201,7 @@ async function runListenerWithLock(options, paths) {
       onchainosAgentId: "*",
       reason: "system-config missing sentryDsn",
       pluginId: "@okxweb3/a2a-node",
-      pluginVersion: "0.2.8"
+      pluginVersion: "0.2.9-beta-cb068eb2d0-260824220115"
     });
   }
   logWithTimestamp(
@@ -116519,7 +116608,7 @@ async function getCurrentNodeCliVersion() {
   return await getGlobalNpmPackageVersion(UPDATE_PACKAGES.node) ?? getBundledNodeCliVersion();
 }
 function getBundledNodeCliVersion() {
-  return true ? "0.2.8" : null;
+  return true ? "0.2.9-beta-cb068eb2d0-260824220115" : null;
 }
 function readConfiguredAiProvider() {
   const explicit = process.env.OKX_A2A_AI_PROVIDER || process.env.OKX_AGENT_TASK_AI_CLI;
@@ -116729,7 +116818,7 @@ async function updateHermes(release, options) {
   }
 }
 async function installGatewayPluginForDoctor(target) {
-  const release = isPrereleaseVersion("0.2.8") ? "beta" : "latest";
+  const release = isPrereleaseVersion("0.2.9-beta-cb068eb2d0-260824220115") ? "beta" : "latest";
   const insideTargetGateway = detectGatewayInvocation() === target;
   const options = {
     restart: !insideTargetGateway,
@@ -117782,7 +117871,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.8" : "0.0.0"),
+    cliVersion: options.cliVersion ?? (true ? "0.2.9-beta-cb068eb2d0-260824220115" : "0.0.0"),
     fixMode: options.fix === true,
     nonInteractive: options.nonInteractive === true,
     packageChanged: false,
@@ -118810,7 +118899,7 @@ init_sentry_config();
 init_runtime_metadata();
 var CURRENT_GATEWAY_SESSION_KEYS_ENV4 = "OKX_A2A_CURRENT_GATEWAY_SESSION_KEYS";
 function printUsage3() {
-  console.log(`okx-a2a ${"0.2.8"}
+  console.log(`okx-a2a ${"0.2.9-beta-cb068eb2d0-260824220115"}
 
 Usage:
   okx-a2a <command> [options]
@@ -118850,7 +118939,7 @@ Run \`okx-a2a <command> -h\` for command-specific help.
 `);
 }
 function printVersion() {
-  console.log("0.2.8");
+  console.log("0.2.9-beta-cb068eb2d0-260824220115");
 }
 function printDaemonUsage() {
   console.log(`Usage: okx-a2a daemon <start|restart|stop|status|autostart> [options]
@@ -120331,7 +120420,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.8",
+      packageVersion: "0.2.9-beta-cb068eb2d0-260824220115",
       agentSdkVersion: "2.3.0",
       nodeSdkVersion: "6.1.0",
       nodeBindingsVersion: "1.11.0"

package/dist/index.js

@@ -19246,6 +19246,7 @@ var init_events = __esm({
       AGENT_CLIENT_REMOVED: "Agent client removed",
       AGENT_STREAM_RECOVERED: "Agent stream recovered",
       AGENT_STREAM_RECOVERY_REPLAY_COMPLETED: "Agent stream recovery replay completed",
+      AGENT_STREAM_RECOVERY_REPLAY_TERMINATED: "Agent stream recovery replay terminated",
       ADDRESS_SYNC_COMPLETED: "Address sync completed",
       AGENT_REFRESH_SESSION_EXPIRED: "Agent refresh aborted: onchainos session expired, local clients taken offline",
       OFFLINE_REPLAY_MESSAGE_REPLAYED: "Offline replay message replayed",
@@ -20167,6 +20168,7 @@ var init_sentry_logger = __esm({
       LogEvent.AGENT_STREAM_ERROR,
       LogEvent.AGENT_STREAM_RECOVERED,
       LogEvent.AGENT_STREAM_RECOVERY_REPLAY_COMPLETED,
+      LogEvent.AGENT_STREAM_RECOVERY_REPLAY_TERMINATED,
       LogEvent.ADDRESS_SYNC_COMPLETED,
       LogEvent.AGENTS_REFRESHED,
       LogEvent.AGENTS_WAKEUP_NOTIFIED,
@@ -32435,7 +32437,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.8",
+      release: "0.2.9-beta-cb068eb2d0-260824220115",
       environment,
       runtimeContainer: normalizeRuntimeContainer(process.env.OKX_A2A_RUNTIME_CONTAINER)
     };
@@ -33376,7 +33378,7 @@ async function getCurrentNodeCliVersion() {
   return await getGlobalNpmPackageVersion(UPDATE_PACKAGES.node) ?? getBundledNodeCliVersion();
 }
 function getBundledNodeCliVersion() {
-  return true ? "0.2.8" : null;
+  return true ? "0.2.9-beta-cb068eb2d0-260824220115" : null;
 }
 function readConfiguredAiProvider() {
   const explicit = process.env.OKX_A2A_AI_PROVIDER || process.env.OKX_AGENT_TASK_AI_CLI;
@@ -33586,7 +33588,7 @@ async function updateHermes(release, options) {
   }
 }
 async function installGatewayPluginForDoctor(target) {
-  const release = isPrereleaseVersion("0.2.8") ? "beta" : "latest";
+  const release = isPrereleaseVersion("0.2.9-beta-cb068eb2d0-260824220115") ? "beta" : "latest";
   const insideTargetGateway = detectGatewayInvocation() === target;
   const options = {
     restart: !insideTargetGateway,
@@ -44489,6 +44491,7 @@ __export(index_exports, {
   releaseActiveDaemon: () => releaseActiveDaemon,
   removeUserAttentionWatcher: () => removeUserAttentionWatcher,
   replayScanBackoffMs: () => replayScanBackoffMs,
+  replayScanBackoffWithJitterMs: () => replayScanBackoffWithJitterMs,
   reportDoctorRunToSentry: () => reportDoctorRunToSentry,
   reportUserNotificationFailure: () => reportUserNotificationFailure,
   resetMessageEligibleOfflineReplayCapabilityForTests: () => resetMessageEligibleOfflineReplayCapabilityForTests,
@@ -56907,6 +56910,12 @@ function replayScanBackoffMs(consecutiveFailures) {
     REPLAY_SCAN_MAX_BACKOFF_MS
   );
 }
+function replayScanBackoffWithJitterMs(consecutiveFailures, randomValue = Math.random()) {
+  const baseMs = replayScanBackoffMs(consecutiveFailures);
+  const boundedRandom = Math.min(1, Math.max(0, randomValue));
+  const jitteredMs = Math.round(baseMs * (0.9 + boundedRandom * 0.2));
+  return Math.min(REPLAY_SCAN_MAX_BACKOFF_MS, jitteredMs);
+}
 function isOfflineReplayForTrigger(trigger) {
   return trigger === "startup";
 }
@@ -56945,6 +56954,7 @@ var XmtpService = class _XmtpService {
   replayScanFailuresByAddress = /* @__PURE__ */ new Map();
   replayScanRetryByAddress = /* @__PURE__ */ new Map();
   replayScanNowMs = () => Date.now();
+  replayScanRandom = () => Math.random();
   replayScanSetTimeout = (callback, delayMs) => setTimeout(callback, delayMs);
   replayScanClearTimeout = (timer) => clearTimeout(timer);
   inboundReplayGates = /* @__PURE__ */ new Map();
@@ -57431,7 +57441,7 @@ var XmtpService = class _XmtpService {
         this.clients.delete(address);
         this.inboundReplayGates.delete(address.toLowerCase());
         this.replayScanFailuresByAddress.delete(address.toLowerCase());
-        this.clearReplayScanRetry(address);
+        this.clearReplayScanRetry(address, "client_removed");
         logger.info(LogEvent.AGENT_CLIENT_REMOVED, {
           ...agentExtras({
             walletAddress: address,
@@ -57647,7 +57657,7 @@ var XmtpService = class _XmtpService {
         this.clients.delete(address);
         this.inboundReplayGates.delete(addressKey);
         this.replayScanFailuresByAddress.delete(addressKey);
-        this.clearReplayScanRetry(address);
+        this.clearReplayScanRetry(address, "client_recycled");
         logWithTimestamp(
           `[xmtp-sdk] recycle: stopped client: ${address} (agentId=${agentInfo.agentId})`
         );
@@ -58197,7 +58207,23 @@ var XmtpService = class _XmtpService {
     this.clientGenerationByClient.set(client, generation);
     return generation;
   }
-  clearReplayScanRetry(address) {
+  logStreamRecoveryReplayTerminal(address, clientGeneration, recoveryIdentities, terminalReason) {
+    for (const recoverySequence of recoveryIdentities) {
+      logger.info(LogEvent.AGENT_STREAM_RECOVERY_REPLAY_TERMINATED, {
+        ...agentExtras({
+          walletAddress: address,
+          onchainosAgentId: this.getAgentByAddress(address)?.agentId,
+          role: this.getAgentByAddress(address)?.role
+        }),
+        clientGeneration: String(clientGeneration),
+        recoverySequence,
+        outcome: "terminal",
+        replayOutcome: "terminated",
+        terminalReason
+      });
+    }
+  }
+  clearReplayScanRetry(address, terminalReason) {
     const addressKey = address.toLowerCase();
     const scheduled = this.replayScanRetryByAddress.get(addressKey);
     if (!scheduled) {
@@ -58205,15 +58231,31 @@ var XmtpService = class _XmtpService {
     }
     this.replayScanRetryByAddress.delete(addressKey);
     this.replayScanClearTimeout(scheduled.timer);
+    if (terminalReason) {
+      this.logStreamRecoveryReplayTerminal(
+        address,
+        scheduled.clientGeneration,
+        scheduled.recoveryIdentities,
+        terminalReason
+      );
+    }
   }
-  scheduleReplayScanRetry(address, expectedClient, clientGeneration, retryTrigger, delayMs) {
+  scheduleReplayScanRetry(address, expectedClient, clientGeneration, retryTrigger, delayMs, recoveryIdentities = []) {
     const addressKey = address.toLowerCase();
     const scheduled = this.replayScanRetryByAddress.get(addressKey);
     if (scheduled?.clientGeneration === clientGeneration) {
+      if (retryTrigger === "stream_recovery") {
+        scheduled.retryTrigger = retryTrigger;
+        for (const recoveryIdentity of recoveryIdentities) {
+          if (!scheduled.recoveryIdentities.includes(recoveryIdentity)) {
+            scheduled.recoveryIdentities.push(recoveryIdentity);
+          }
+        }
+      }
       return;
     }
     if (scheduled) {
-      this.clearReplayScanRetry(address);
+      this.clearReplayScanRetry(address, "client_replaced");
     }
     const timer = this.replayScanSetTimeout(() => {
       const current = this.replayScanRetryByAddress.get(addressKey);
@@ -58222,12 +58264,18 @@ var XmtpService = class _XmtpService {
       }
       this.replayScanRetryByAddress.delete(addressKey);
       if (this.clients.get(address) !== expectedClient || this.stoppedAddresses.has(addressKey)) {
+        this.logStreamRecoveryReplayTerminal(
+          address,
+          current.clientGeneration,
+          current.recoveryIdentities,
+          this.stoppedAddresses.has(addressKey) ? "client_stopped" : "client_replaced"
+        );
         return;
       }
       void this.replayOfflineMessagesForAddressSingleFlight(
         address,
-        retryTrigger,
-        void 0,
+        current.retryTrigger,
+        current.recoveryIdentities.at(-1),
         expectedClient
       ).catch((err) => {
         logWithTimestamp(
@@ -58248,6 +58296,8 @@ var XmtpService = class _XmtpService {
     timer.unref?.();
     this.replayScanRetryByAddress.set(addressKey, {
       clientGeneration,
+      retryTrigger,
+      recoveryIdentities: retryTrigger === "stream_recovery" ? [...new Set(recoveryIdentities)] : [],
       timer
     });
   }
@@ -58534,7 +58584,7 @@ var XmtpService = class _XmtpService {
                   String(recovery.recoverySequence),
                   agent
                 );
-                if (summary.outcome === "completed" && !recoveryDisposed && this.clients.get(address) === agent) {
+                if (summary.outcome === "completed" && summary.consecutiveFailures === void 0 && !recoveryDisposed && this.clients.get(address) === agent) {
                   logger.info(LogEvent.AGENT_STREAM_RECOVERY_REPLAY_COMPLETED, {
                     ...agentExtras(identity),
                     clientGeneration: String(clientGeneration),
@@ -58631,10 +58681,16 @@ var XmtpService = class _XmtpService {
     let priorFailure = this.replayScanFailuresByAddress.get(addressKey);
     if (priorFailure && priorFailure.clientGeneration !== clientGeneration) {
       this.replayScanFailuresByAddress.delete(addressKey);
-      this.clearReplayScanRetry(address);
+      this.clearReplayScanRetry(address, "client_replaced");
       priorFailure = void 0;
     }
     if (priorFailure && attemptNowMs < priorFailure.nextAttemptAtMs) {
+      if (trigger === "stream_recovery") {
+        priorFailure.retryTrigger = trigger;
+        if (recoveryIdentity && !priorFailure.recoveryIdentities.includes(recoveryIdentity)) {
+          priorFailure.recoveryIdentities.push(recoveryIdentity);
+        }
+      }
       priorFailure.suppressedAttempts++;
       summary.outcome = "suppressed_backoff";
       summary.failureStage = priorFailure.lastFailureStage;
@@ -58651,7 +58707,8 @@ var XmtpService = class _XmtpService {
         agent,
         clientGeneration,
         priorFailure.retryTrigger,
-        summary.backoffMs
+        summary.backoffMs,
+        priorFailure.recoveryIdentities
       );
       summary.durationMs = Date.now() - addressReplayStartedAt;
       return summary;
@@ -58664,15 +58721,23 @@ var XmtpService = class _XmtpService {
     const recordScanFailure = (stage, err) => {
       const previous = this.replayScanFailuresByAddress.get(addressKey);
       const consecutiveFailures = (previous?.consecutiveFailures ?? 0) + 1;
-      const backoffMs = replayScanBackoffMs(consecutiveFailures);
+      const backoffMs = replayScanBackoffWithJitterMs(
+        consecutiveFailures,
+        this.replayScanRandom()
+      );
       const suppressedAttempts = previous?.suppressedAttempts ?? 0;
       const failureNowMs = this.replayScanNowMs();
-      const retryTrigger = isOfflineReplayForTrigger(trigger) ? "startup" : "periodic_repair";
+      const recoveryIdentities = [...previous?.recoveryIdentities ?? []];
+      if (trigger === "stream_recovery" && recoveryIdentity && !recoveryIdentities.includes(recoveryIdentity)) {
+        recoveryIdentities.push(recoveryIdentity);
+      }
+      const retryTrigger = trigger === "stream_recovery" ? trigger : previous?.retryTrigger ?? trigger;
       this.replayScanFailuresByAddress.set(addressKey, {
         clientGeneration,
         consecutiveFailures,
         nextAttemptAtMs: failureNowMs + backoffMs,
         retryTrigger,
+        recoveryIdentities,
         suppressedAttempts: 0,
         lastFailureStage: stage
       });
@@ -58681,7 +58746,8 @@ var XmtpService = class _XmtpService {
         agent,
         clientGeneration,
         retryTrigger,
-        backoffMs
+        backoffMs,
+        recoveryIdentities
       );
       summary.outcome = stage === "syncAll" ? "sync_failed" : "list_failed";
       summary.failureStage = stage;
@@ -58878,6 +58944,30 @@ var XmtpService = class _XmtpService {
       recoveredAfterFailures: String(recoveredFailure?.consecutiveFailures ?? 0),
       suppressedAttempts: String(recoveredFailure?.suppressedAttempts ?? 0)
     });
+    if (recoveredFailure) {
+      for (const recoverySequence of recoveredFailure.recoveryIdentities) {
+        logger.info(LogEvent.AGENT_STREAM_RECOVERY_REPLAY_COMPLETED, {
+          ...agentExtras({
+            walletAddress: address,
+            inboxId: agent.client?.inboxId,
+            onchainosAgentId: this.getAgentByAddress(address)?.agentId,
+            role: this.getAgentByAddress(address)?.role
+          }),
+          clientGeneration: String(clientGeneration),
+          recoverySequence,
+          replayed: String(summary.replayed),
+          skipped: String(summary.skipped),
+          conversationCount: String(summary.conversations),
+          replayDurationMs: String(Date.now() - addressReplayStartedAt),
+          outcome: "success",
+          replayOutcome: "completed",
+          recoveredAfterFailures: String(
+            recoveredFailure.consecutiveFailures
+          ),
+          suppressedAttempts: String(recoveredFailure.suppressedAttempts)
+        });
+      }
+    }
     summary.outcome = "completed";
     summary.consecutiveFailures = recoveredFailure?.consecutiveFailures;
     summary.suppressedAttempts = recoveredFailure?.suppressedAttempts;
@@ -60933,7 +61023,7 @@ function buildConnectParams(config, instanceId, protocolVersion) {
     client: {
       id: "gateway-client",
       displayName: "okx-a2a-node",
-      version: "0.2.8",
+      version: "0.2.9-beta-cb068eb2d0-260824220115",
       platform: "node",
       mode: "backend",
       instanceId
@@ -60944,7 +61034,7 @@ function buildConnectParams(config, instanceId, protocolVersion) {
     commands: [],
     permissions: {},
     locale: Intl.DateTimeFormat().resolvedOptions().locale || "en-US",
-    userAgent: `okx-a2a-node/${"0.2.8"}`,
+    userAgent: `okx-a2a-node/${"0.2.9-beta-cb068eb2d0-260824220115"}`,
     auth: {
       ...config.token ? { token: config.token } : {},
       ...config.password ? { password: config.password } : {}
@@ -67172,12 +67262,12 @@ async function runListenerWithLock(options, paths) {
       });
     }
   });
-  service.setPluginVersion("0.2.8");
+  service.setPluginVersion("0.2.9-beta-cb068eb2d0-260824220115");
   await service.init();
   const pluginVersionStatus = service.pluginVersionStatus;
   if (pluginVersionStatus.unavailable) {
     throw new Error(
-      `@okxweb3/a2a-node v${"0.2.8"} is below the required minimum v${pluginVersionStatus.minVersion}`
+      `@okxweb3/a2a-node v${"0.2.9-beta-cb068eb2d0-260824220115"} is below the required minimum v${pluginVersionStatus.minVersion}`
     );
   }
   const systemConfig = service.getSystemConfig();
@@ -67205,7 +67295,7 @@ async function runListenerWithLock(options, paths) {
       onchainosAgentId: "*",
       reason: "system-config missing sentryDsn",
       pluginId: "@okxweb3/a2a-node",
-      pluginVersion: "0.2.8"
+      pluginVersion: "0.2.9-beta-cb068eb2d0-260824220115"
     });
   }
   logWithTimestamp(
@@ -69906,7 +69996,7 @@ async function exportDiagnosticLogs(options) {
     node: process.version,
     platform: process.platform,
     arch: process.arch,
-    packageVersion: true ? "0.2.8" : "unknown",
+    packageVersion: true ? "0.2.9-beta-cb068eb2d0-260824220115" : "unknown",
     sensitiveContentIncluded: options.includeSensitiveContent,
     listenerAndLlmContentIncluded: true,
     credentialsAlwaysRedacted: true,
@@ -71788,7 +71878,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.8" : "0.0.0"),
+    cliVersion: options.cliVersion ?? (true ? "0.2.9-beta-cb068eb2d0-260824220115" : "0.0.0"),
     fixMode: options.fix === true,
     nonInteractive: options.nonInteractive === true,
     packageChanged: false,
@@ -72216,6 +72306,7 @@ init_autostart_windows();
   releaseActiveDaemon,
   removeUserAttentionWatcher,
   replayScanBackoffMs,
+  replayScanBackoffWithJitterMs,
   reportDoctorRunToSentry,
   reportUserNotificationFailure,
   resetMessageEligibleOfflineReplayCapabilityForTests,

package/package.json

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