@okxweb3/a2a-node 0.2.18-beta-4dd056b897-261015113839 → 0.2.18

package/dist/index.js

@@ -4008,7 +4008,7 @@ var require_is = __commonJS({
     function isPrimitive(wat) {
       return wat === null || typeof wat !== "object" && typeof wat !== "function";
     }
-    function isPlainObject6(wat) {
+    function isPlainObject4(wat) {
       return isBuiltin(wat, "Object");
     }
     function isEvent(wat) {
@@ -4024,7 +4024,7 @@ var require_is = __commonJS({
       return Boolean(wat && wat.then && typeof wat.then === "function");
     }
     function isSyntheticEvent(wat) {
-      return isPlainObject6(wat) && "nativeEvent" in wat && "preventDefault" in wat && "stopPropagation" in wat;
+      return isPlainObject4(wat) && "nativeEvent" in wat && "preventDefault" in wat && "stopPropagation" in wat;
     }
     function isNaN2(wat) {
       return typeof wat === "number" && wat !== wat;
@@ -4047,7 +4047,7 @@ var require_is = __commonJS({
     exports2.isEvent = isEvent;
     exports2.isInstanceOf = isInstanceOf;
     exports2.isNaN = isNaN2;
-    exports2.isPlainObject = isPlainObject6;
+    exports2.isPlainObject = isPlainObject4;
     exports2.isPrimitive = isPrimitive;
     exports2.isRegExp = isRegExp;
     exports2.isString = isString;
@@ -19310,23 +19310,6 @@ var init_events = __esm({
       XMTP_RATE_LIMIT_CREATE_SUPPRESSED: "XMTP rate limit create suppressed",
       XMTP_RATE_LIMIT_PROBE: "XMTP rate limit probe",
       XMTP_RATE_LIMIT_RECOVERED: "XMTP rate limit recovered",
-      // ── subscription observability info (DEXMARKET-9096) ───────────
-      // All of the following logger.info checkpoints MUST also be listed in
-      // SENTRY_INFO_ALLOWLIST (index.ts): info() returns early for an unlisted
-      // event, which ships a checkpoint that looks implemented but emits nothing.
-      SUBSCRIPTION_PUSH_STARTED: "Subscription push started",
-      SUBSCRIPTION_PUSH_TARGETS_RESOLVED: "Subscription push targets resolved",
-      SUBSCRIPTION_PUSH_EMPTY_TARGETS: "Subscription push empty targets",
-      SUBSCRIPTION_PUSH_SUMMARY: "Subscription push summary",
-      SUBSCRIPTION_INBOUND_RECEIVED: "Subscription inbound received",
-      SUBSCRIPTION_INBOUND_GATE_DROPPED: "Subscription inbound gate dropped",
-      SUBSCRIPTION_JOBS_QUERY_STARTED: "Subscription jobs query started",
-      SUBSCRIPTION_JOBS_QUERY_SUCCEEDED: "Subscription jobs query succeeded",
-      SUBSCRIPTION_JOBS_EMPTY: "Subscription jobs empty",
-      SUBSCRIPTION_INBOUND_OWNERSHIP_ROUTED: "Subscription inbound ownership routed",
-      SUBSCRIPTION_JOB_DISPATCHED: "Subscription job dispatched",
-      SUBSCRIPTION_JOB_DUPLICATE_IGNORED: "Subscription job duplicate ignored",
-      SUBSCRIPTION_FANOUT_SUMMARY: "Subscription fan-out summary",
       // ── error ─────────────────────────────────────────────────────
       XMTP_CONNECTION_FAILED: "XMTP connection failed",
       CONVERSATIONS_STREAM_FAILED: "conversations.stream failed",
@@ -19393,13 +19376,6 @@ var init_events = __esm({
       AGENT_INSTALLATION_LIMIT_NEAR: "Agent installation limit near",
       XMTP_HISTORY_SYNC_REQUEST_FAILED: "XMTP history sync request failed",
       XMTP_DEBUG_SYNC_FAILED: "XMTP debug sync failed",
-      // ── subscription observability error (DEXMARKET-9096) ──────────
-      // error-level: always emitted (no allowlist gate). Error objects are
-      // classified by buildErrorDiagnostics — never attach raw Error.message.
-      SUBSCRIPTION_PUSH_TARGET_FAILED: "Subscription push target failed",
-      SUBSCRIPTION_INBOUND_AGENTIC_ID_MISSING: "Subscription inbound agenticId missing",
-      SUBSCRIPTION_JOBS_FAIL_CLOSED: "Subscription jobs fail closed",
-      SUBSCRIPTION_JOB_FAILED: "Subscription job failed",
       // Underlying XMTP SDK client close failed during recycle/removal/shutdown
       // (DEXMARKET-9116). Error-level → NOT added to SENTRY_INFO_ALLOWLIST.
       XMTP_CLIENT_CLOSE_FAILED: "XMTP client close failed"
@@ -19463,7 +19439,7 @@ function resolveDeliveryId(input) {
   if (slots.every((slot) => slot === "")) {
     return UNKNOWN_LOG_FIELD;
   }
-  const digest = (0, import_node_crypto3.createHash)("sha256").update(slots.join("|")).digest("hex");
+  const digest = (0, import_node_crypto2.createHash)("sha256").update(slots.join("|")).digest("hex");
   return `${DERIVED_DELIVERY_ID_PREFIX}${digest.slice(0, DERIVED_DELIVERY_ID_LENGTH)}`;
 }
 function releaseFields(release) {
@@ -19581,11 +19557,11 @@ function enrichCorrelationFields(extra) {
   }
   return enriched;
 }
-var import_node_crypto3, PROBE_NAME_PATTERN, PROBE_JOB_ID_PATTERN, XMTP_MESSAGE_ID_PATTERN, DERIVED_DELIVERY_ID_PREFIX, DERIVED_DELIVERY_ID_LENGTH, RELEASE_CODE_MAJOR_WEIGHT, RELEASE_CODE_MINOR_WEIGHT, UNKNOWN_LOG_FIELD, UNPARSABLE_RELEASE;
+var import_node_crypto2, PROBE_NAME_PATTERN, PROBE_JOB_ID_PATTERN, XMTP_MESSAGE_ID_PATTERN, DERIVED_DELIVERY_ID_PREFIX, DERIVED_DELIVERY_ID_LENGTH, RELEASE_CODE_MAJOR_WEIGHT, RELEASE_CODE_MINOR_WEIGHT, UNKNOWN_LOG_FIELD, UNPARSABLE_RELEASE;
 var init_log_fields = __esm({
   "../core/src/sentry-logger/log-fields.ts"() {
     "use strict";
-    import_node_crypto3 = require("node:crypto");
+    import_node_crypto2 = require("node:crypto");
     PROBE_NAME_PATTERN = /probe/i;
     PROBE_JOB_ID_PATTERN = /^probe[-_]/i;
     XMTP_MESSAGE_ID_PATTERN = /^[0-9a-f]{16,}$/i;
@@ -19973,9 +19949,6 @@ function applyFatalEventDefaults(event) {
 function isInfoEventAllowlisted(name) {
   return SENTRY_INFO_ALLOWLIST.has(name);
 }
-function isFingerprintKey(key) {
-  return SENTRY_FINGERPRINT_KEYS.includes(key);
-}
 function isTagKey(key) {
   return SENTRY_TAG_KEYS.has(key);
 }
@@ -19987,13 +19960,13 @@ function agentExtras(identity) {
     role: identity.role != null && identity.role !== "" ? String(identity.role) : UNKNOWN_FIELD
   };
 }
-var Sentry, import_node_crypto4, FLOW_ID, SENTRY_EXTRA_BLOCKLIST, SENTRY_EXTRA_BLOCKED_KEY_PARTS, SENTRY_FULL_STRING_EXTRA_KEYS, SENTRY_TAG_KEYS, SENTRY_FINGERPRINT_KEYS, SENTRY_INFO_ALLOWLIST, MAX_EXTRA_STRING_LENGTH, MAX_TAG_VALUE_LENGTH, RELEASE_FIELDS, RUNTIME_FIELDS, SentryLogger, logger, initLogger, shutdown, UNKNOWN_FIELD;
+var Sentry, import_node_crypto3, FLOW_ID, SENTRY_EXTRA_BLOCKLIST, SENTRY_EXTRA_BLOCKED_KEY_PARTS, SENTRY_FULL_STRING_EXTRA_KEYS, SENTRY_TAG_KEYS, SENTRY_FINGERPRINT_KEYS, SENTRY_INFO_ALLOWLIST, MAX_EXTRA_STRING_LENGTH, MAX_TAG_VALUE_LENGTH, RELEASE_FIELDS, RUNTIME_FIELDS, SentryLogger, logger, initLogger, shutdown, UNKNOWN_FIELD;
 var init_sentry_logger = __esm({
   "../core/src/sentry-logger/index.ts"() {
     "use strict";
     init_log();
     Sentry = __toESM(require_cjs4());
-    import_node_crypto4 = require("node:crypto");
+    import_node_crypto3 = require("node:crypto");
     init_events();
     init_log_fields();
     init_xmtp_test_metrics();
@@ -20001,7 +19974,7 @@ var init_sentry_logger = __esm({
     init_runtime_metadata();
     init_events();
     init_log_fields();
-    FLOW_ID = (0, import_node_crypto4.randomUUID)();
+    FLOW_ID = (0, import_node_crypto3.randomUUID)();
     SENTRY_EXTRA_BLOCKLIST = /* @__PURE__ */ new Set([
       "args",
       "apikey",
@@ -20084,13 +20057,6 @@ var init_sentry_logger = __esm({
     ]);
     SENTRY_TAG_KEYS = /* @__PURE__ */ new Set([
       "agentId",
-      // Subscription correlation agent ids (DEXMARKET-9096). Bounded-cardinality,
-      // same class as agentId/senderAgentId/onchainosAgentId — promoted to indexed
-      // tags for Sentry filtering. NOT added to SENTRY_FINGERPRINT_KEYS, so the
-      // global issue fingerprint is unchanged. High-cardinality ids
-      // (conversationId/messageId/deliveryId) are deliberately NOT here.
-      "aspAgentId",
-      "userAgentId",
       "agentPlatform",
       "aiProvider",
       "cacheName",
@@ -20258,22 +20224,6 @@ var init_sentry_logger = __esm({
       LogEvent.SESSION_KEY_DERIVED,
       LogEvent.SESSIONS_QUERIED,
       LogEvent.SYNC_TICK_COMPLETED,
-      // Subscription observability info checkpoints (DEXMARKET-9096). Each is a
-      // logger.info event; omitting any makes info() drop it silently so the whole
-      // subscription trace would look implemented and emit nothing in production.
-      LogEvent.SUBSCRIPTION_PUSH_STARTED,
-      LogEvent.SUBSCRIPTION_PUSH_TARGETS_RESOLVED,
-      LogEvent.SUBSCRIPTION_PUSH_EMPTY_TARGETS,
-      LogEvent.SUBSCRIPTION_PUSH_SUMMARY,
-      LogEvent.SUBSCRIPTION_INBOUND_RECEIVED,
-      LogEvent.SUBSCRIPTION_INBOUND_GATE_DROPPED,
-      LogEvent.SUBSCRIPTION_JOBS_QUERY_STARTED,
-      LogEvent.SUBSCRIPTION_JOBS_QUERY_SUCCEEDED,
-      LogEvent.SUBSCRIPTION_JOBS_EMPTY,
-      LogEvent.SUBSCRIPTION_INBOUND_OWNERSHIP_ROUTED,
-      LogEvent.SUBSCRIPTION_JOB_DISPATCHED,
-      LogEvent.SUBSCRIPTION_JOB_DUPLICATE_IGNORED,
-      LogEvent.SUBSCRIPTION_FANOUT_SUMMARY,
       // XMTP creation rate-limit cooldown checkpoints (DEXMARKET-9116). info() drops
       // any event not listed here, so these must stay registered.
       LogEvent.XMTP_RATE_LIMIT_COOLDOWN_STARTED,
@@ -22229,7 +22179,7 @@ var require_retry_promise = __commonJS({
         return true;
       }
     };
-    function wait3(ms) {
+    function wait2(ms) {
       return __awaiter(this, void 0, void 0, function() {
         return __generator(this, function(_a) {
           return [2, new Promise(function(resolve11) {
@@ -22238,7 +22188,7 @@ var require_retry_promise = __commonJS({
         });
       });
     }
-    exports2.wait = wait3;
+    exports2.wait = wait2;
     function retry2(f, config) {
       return __awaiter(this, void 0, void 0, function() {
         var effectiveConfig;
@@ -22328,7 +22278,7 @@ var require_retry_promise = __commonJS({
               return [3, 5];
             case 5:
               millisToWait = delay(i + 1, config.delay);
-              return [4, wait3(millisToWait > config.maxBackOff ? config.maxBackOff : millisToWait)];
+              return [4, wait2(millisToWait > config.maxBackOff ? config.maxBackOff : millisToWait)];
             case 6:
               _a.sent();
               if (done()) {
@@ -28811,7 +28761,7 @@ var init_withResolvers = __esm({
 });
 
 // ../../node_modules/viem/_esm/utils/promise/createBatchScheduler.js
-function createBatchScheduler({ fn, id, shouldSplitBatch, wait: wait3 = 0, sort }) {
+function createBatchScheduler({ fn, id, shouldSplitBatch, wait: wait2 = 0, sort }) {
   const exec2 = async () => {
     const scheduler = getScheduler();
     flush2();
@@ -28849,7 +28799,7 @@ function createBatchScheduler({ fn, id, shouldSplitBatch, wait: wait3 = 0, sort
         return promise;
       }
       setScheduler({ args, resolve: resolve11, reject });
-      setTimeout(exec2, wait3);
+      setTimeout(exec2, wait2);
       return promise;
     }
   };
@@ -31065,7 +31015,7 @@ var require_websocket2 = __commonJS({
     var http2 = require("http");
     var net = require("net");
     var tls = require("tls");
-    var { randomBytes: randomBytes3, createHash: createHash7 } = require("crypto");
+    var { randomBytes: randomBytes3, createHash: createHash6 } = require("crypto");
     var { Duplex, Readable } = require("stream");
     var { URL: URL2 } = require("url");
     var PerMessageDeflate = require_permessage_deflate();
@@ -31725,7 +31675,7 @@ var require_websocket2 = __commonJS({
           abortHandshake(websocket, socket, "Invalid Upgrade header");
           return;
         }
-        const digest = createHash7("sha1").update(key + GUID).digest("base64");
+        const digest = createHash6("sha1").update(key + GUID).digest("base64");
         if (res.headers["sec-websocket-accept"] !== digest) {
           abortHandshake(websocket, socket, "Invalid Sec-WebSocket-Accept header");
           return;
@@ -32092,7 +32042,7 @@ var require_websocket_server = __commonJS({
     var EventEmitter2 = require("events");
     var http2 = require("http");
     var { Duplex } = require("stream");
-    var { createHash: createHash7 } = require("crypto");
+    var { createHash: createHash6 } = require("crypto");
     var extension = require_extension();
     var PerMessageDeflate = require_permessage_deflate();
     var subprotocol = require_subprotocol();
@@ -32393,7 +32343,7 @@ var require_websocket_server = __commonJS({
           );
         }
         if (this._state > RUNNING) return abortHandshake(socket, 503);
-        const digest = createHash7("sha1").update(key + GUID).digest("base64");
+        const digest = createHash6("sha1").update(key + GUID).digest("base64");
         const headers = [
           "HTTP/1.1 101 Switching Protocols",
           "Upgrade: websocket",
@@ -32515,7 +32465,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.18-beta-4dd056b897-261015113839",
+      release: "0.2.18",
       environment,
       runtimeContainer: normalizeRuntimeContainer(process.env.OKX_A2A_RUNTIME_CONTAINER)
     };
@@ -33471,7 +33421,7 @@ async function getCurrentNodeCliVersion() {
   return await getGlobalNpmPackageVersion(UPDATE_PACKAGES.node) ?? getBundledNodeCliVersion();
 }
 function getBundledNodeCliVersion() {
-  return true ? "0.2.18-beta-4dd056b897-261015113839" : null;
+  return true ? "0.2.18" : null;
 }
 function readConfiguredAiProvider() {
   const explicit = process.env.OKX_A2A_AI_PROVIDER || process.env.OKX_AGENT_TASK_AI_CLI;
@@ -33681,7 +33631,7 @@ async function updateHermes(release, options) {
   }
 }
 async function installGatewayPluginForDoctor(target) {
-  const release = isPrereleaseVersion("0.2.18-beta-4dd056b897-261015113839") ? "beta" : "latest";
+  const release = isPrereleaseVersion("0.2.18") ? "beta" : "latest";
   const insideTargetGateway = detectGatewayInvocation() === target;
   const options = {
     restart: !insideTargetGateway,
@@ -44403,7 +44353,6 @@ __export(index_exports, {
   InboundReplayGate: () => InboundReplayGate,
   InvalidXmtpMessageStore: () => InvalidXmtpMessageStore,
   JOB_PROVIDER_BINDING_SOURCES: () => JOB_PROVIDER_BINDING_SOURCES,
-  LIST_JOBS_BY_VERIFIED_SENDER_HELP_TOKEN: () => LIST_JOBS_BY_VERIFIED_SENDER_HELP_TOKEN,
   ListenerDeferredTaskScheduler: () => ListenerDeferredTaskScheduler,
   ListenerMaintenanceGate: () => ListenerMaintenanceGate,
   LogEvent: () => LogEvent,
@@ -44413,9 +44362,6 @@ __export(index_exports, {
   NATIVE_LAUNCHER_EXE_NAME: () => NATIVE_LAUNCHER_EXE_NAME,
   OPENCLAW_GATEWAY_ROUTE_GROUP_ID: () => OPENCLAW_GATEWAY_ROUTE_GROUP_ID,
   ProviderNotReadyError: () => ProviderNotReadyError,
-  RUN_LOG_FILENAME_MAX_BYTES: () => RUN_LOG_FILENAME_MAX_BYTES,
-  SUBSCRIPTION_FANOUT_MAX: () => SUBSCRIPTION_FANOUT_MAX,
-  SUBSCRIPTION_MESSAGE_TYPE: () => SUBSCRIPTION_MESSAGE_TYPE,
   SYSTEM_NOTIFICATION_SESSION_KEY: () => SYSTEM_NOTIFICATION_SESSION_KEY,
   SessionBusyTracker: () => SessionBusyTracker,
   SessionStore: () => SessionStore,
@@ -44461,9 +44407,7 @@ __export(index_exports, {
   buildInboundTerminalExtras: () => buildInboundTerminalExtras,
   buildLaunchdPlist: () => buildLaunchdPlist,
   buildLauncherEntryJs: () => buildLauncherEntryJs,
-  buildListJobsByVerifiedSenderArgs: () => buildListJobsByVerifiedSenderArgs,
   buildMessageEligibleArgs: () => buildMessageEligibleArgs,
-  buildRunLogFileName: () => buildRunLogFileName,
   buildSchtasksCreateArgs: () => buildSchtasksCreateArgs,
   buildSchtasksDeleteArgs: () => buildSchtasksDeleteArgs,
   buildSchtasksEndArgs: () => buildSchtasksEndArgs,
@@ -44472,14 +44416,9 @@ __export(index_exports, {
   buildSeaConfig: () => buildSeaConfig,
   buildServicePath: () => buildServicePath,
   buildSessionKey: () => buildSessionKey,
-  buildSubscriptionEnvelope: () => buildSubscriptionEnvelope,
-  buildSubscriptionInboundExtras: () => buildSubscriptionInboundExtras,
-  buildSubscriptionJobExtras: () => buildSubscriptionJobExtras,
-  buildSubscriptionSendExtras: () => buildSubscriptionSendExtras,
   buildSystemMessageNotice: () => buildSystemMessageNotice,
   buildSystemStoredMessage: () => buildSystemStoredMessage,
   buildSystemdUserService: () => buildSystemdUserService,
-  buildUpgradeRecommendationNotice: () => buildUpgradeRecommendationNotice,
   buildWin32OnchainosCandidates: () => buildWin32OnchainosCandidates,
   buildWindowsParentProcessProbe: () => buildWindowsParentProcessProbe,
   buildXmtpMessageSentExtra: () => buildXmtpMessageSentExtra,
@@ -44494,7 +44433,6 @@ __export(index_exports, {
   checkCodexReadiness: () => checkCodexReadiness,
   claimActiveDaemon: () => claimActiveDaemon,
   classifyJobBindingSource: () => classifyJobBindingSource,
-  classifyListJobsError: () => classifyListJobsError,
   clearCodexReadinessCache: () => clearCodexReadinessCache,
   codexCommandResolvesWithoutOverride: () => codexCommandResolvesWithoutOverride,
   codexReadinessCacheKey: () => codexReadinessCacheKey,
@@ -44506,12 +44444,10 @@ __export(index_exports, {
   createOutboundBehavior: () => createOutboundBehavior,
   createUserAttentionWatchParentMonitor: () => createUserAttentionWatchParentMonitor,
   currentOpenClawGatewaySessionKey: () => currentOpenClawGatewaySessionKey,
-  decideSubscriptionGate: () => decideSubscriptionGate,
   detectAiProviders: () => detectAiProviders,
   detectAiRuntimeSurface: () => detectAiRuntimeSurface,
   detectCurrentAiProvider: () => detectCurrentAiProvider,
   detectGatewayInvocation: () => detectGatewayInvocation,
-  detectListJobsByVerifiedSenderSupport: () => detectListJobsByVerifiedSenderSupport,
   detectMessageEligibleOfflineReplaySupport: () => detectMessageEligibleOfflineReplaySupport,
   detectRuntime: () => detectRuntime,
   ensureDaemonReady: () => ensureDaemonReady,
@@ -44525,7 +44461,6 @@ __export(index_exports, {
   extractDirectToUserNotification: () => extractDirectToUserNotification,
   extractRateLimitEndpoint: () => extractRateLimitEndpoint,
   extractXmtpSentAtMs: () => extractXmtpSentAtMs2,
-  fanOutSubscriptionJobs: () => fanOutSubscriptionJobs,
   findWindowsNativeOkxA2aExe: () => findWindowsNativeOkxA2aExe,
   followFile: () => followFile,
   formatDoctorReportForHumans: () => formatDoctorReportForHumans,
@@ -44538,7 +44473,6 @@ __export(index_exports, {
   getXmtpCreationCooldown: () => getXmtpCreationCooldown,
   handleCapabilitiesCommand: () => handleCapabilitiesCommand,
   handleDoctorCommand: () => handleDoctorCommand,
-  handleSubscriptionPushCommand: () => handleSubscriptionPushCommand,
   handleXmtpDebugCommand: () => handleXmtpDebugCommand,
   handleXmtpSendCommand: () => handleXmtpSendCommand,
   handleXmtpTestCommand: () => handleXmtpTestCommand,
@@ -44553,7 +44487,6 @@ __export(index_exports, {
   invalidateResolvedOnchainosBinForTests: () => invalidateResolvedOnchainosBinForTests,
   isAutostartManagerUnavailableError: () => isAutostartManagerUnavailableError,
   isDefaultTaskHome: () => isDefaultTaskHome,
-  isFingerprintKey: () => isFingerprintKey,
   isGatewayAvailableForHeartbeat: () => isGatewayAvailableForHeartbeat,
   isHermesGatewayPluginEnabled: () => isHermesGatewayPluginEnabled,
   isInfoEventAllowlisted: () => isInfoEventAllowlisted,
@@ -44564,7 +44497,6 @@ __export(index_exports, {
   isPrereleaseVersion: () => isPrereleaseVersion,
   isRetryableOpenClawGatewayError: () => isRetryableOpenClawGatewayError,
   isSqliteBusyError: () => isSqliteBusyError,
-  isSubscriptionEnvelope: () => isSubscriptionEnvelope,
   isSystemdManagerUnavailableMessage: () => isSystemdManagerUnavailableMessage,
   isTagKey: () => isTagKey,
   isValidExternalJobId: () => isValidExternalJobId,
@@ -44573,12 +44505,8 @@ __export(index_exports, {
   killProcessTree: () => killProcessTree,
   launchdPlistHasCurrentRestartPolicy: () => launchdPlistHasCurrentRestartPolicy,
   listAllAgentsWithMetadata: () => listAllAgentsWithMetadata,
-  listJobsByVerifiedSender: () => listJobsByVerifiedSender,
-  listJobsByVerifiedSenderHelpAdvertisesCommand: () => listJobsByVerifiedSenderHelpAdvertisesCommand,
-  listJobsByVerifiedSenderWithCapability: () => listJobsByVerifiedSenderWithCapability,
   logWinCompat: () => logWinCompat,
   logXmtpMessageSent: () => logXmtpMessageSent,
-  logger: () => logger,
   maybeRecommendOnchainosUpgrade: () => maybeRecommendOnchainosUpgrade,
   mergeA2AEnvelopeTips: () => mergeA2AEnvelopeTips,
   messageEligibleHelpAdvertisesOfflineReplay: () => messageEligibleHelpAdvertisesOfflineReplay,
@@ -44586,8 +44514,6 @@ __export(index_exports, {
   normalizeAiProvider: () => normalizeAiProvider,
   normalizeAiRuntimeProvider: () => normalizeAiRuntimeProvider,
   normalizeHermesOkxA2aPluginConfig: () => normalizeHermesOkxA2aPluginConfig,
-  normalizeListJobsResponse: () => normalizeListJobsResponse,
-  normalizeSubscriptionJobs: () => normalizeSubscriptionJobs,
   notifyAgentMessageToUserAttention: () => notifyAgentMessageToUserAttention,
   notifyDirectToUserAttention: () => notifyDirectToUserAttention,
   notifySystemMessageToUser: () => notifySystemMessageToUser,
@@ -44598,7 +44524,6 @@ __export(index_exports, {
   parsePluginYamlVersion: () => parsePluginYamlVersion,
   parseWalletLoginStatus: () => parseWalletLoginStatus,
   parseWindowsParentProcessJson: () => parseWindowsParentProcessJson,
-  partitionSubscriptionJobsByOwner: () => partitionSubscriptionJobsByOwner,
   performRuntimeSwitch: () => performRuntimeSwitch,
   persistAiRuntimeSurfaceBestEffort: () => persistAiRuntimeSurfaceBestEffort,
   persistCurrentRuntimeSelectionForNewJob: () => persistCurrentRuntimeSelectionForNewJob,
@@ -44608,14 +44533,12 @@ __export(index_exports, {
   printXmtpTestUsage: () => printXmtpTestUsage,
   probeCodexAuthStatus: () => probeCodexAuthStatus,
   processFileMessage: () => processFileMessage,
-  processSubscriptionInbound: () => processSubscriptionInbound,
   queryWalletLoginStatus: () => queryWalletLoginStatus,
   readAiProviderTimeoutMs: () => readAiProviderTimeoutMs,
   readAiRuntimeSurfaceBestEffort: () => readAiRuntimeSurfaceBestEffort,
   readCachedCodexReadiness: () => readCachedCodexReadiness,
   readLastLines: () => readLastLines,
   readParentProcessCommandForPlatform: () => readParentProcessCommandForPlatform,
-  readSubscriptionEnvelope: () => readSubscriptionEnvelope,
   readUserAttentionWatcherEvent: () => readUserAttentionWatcherEvent,
   refreshAgentsAndWait: () => refreshAgentsAndWait,
   refreshOnchainosVersionMetadata: () => refreshOnchainosVersionMetadata,
@@ -44626,10 +44549,8 @@ __export(index_exports, {
   replayScanBackoffWithJitterMs: () => replayScanBackoffWithJitterMs,
   reportDoctorRunToSentry: () => reportDoctorRunToSentry,
   reportUserNotificationFailure: () => reportUserNotificationFailure,
-  resetListJobsByVerifiedSenderCapabilityForTests: () => resetListJobsByVerifiedSenderCapabilityForTests,
   resetMessageEligibleOfflineReplayCapabilityForTests: () => resetMessageEligibleOfflineReplayCapabilityForTests,
   resetResolvedOnchainosBinForTests: () => resetResolvedOnchainosBinForTests,
-  resetSubscriptionTargetsForTests: () => resetSubscriptionTargetsForTests,
   resetXmtpCreationCooldownForTests: () => resetXmtpCreationCooldownForTests,
   resolveAiPermissionPreset: () => resolveAiPermissionPreset,
   resolveAiProviderCommand: () => resolveAiProviderCommand,
@@ -44683,8 +44604,6 @@ __export(index_exports, {
   stopOpenClawGateway: () => stopOpenClawGateway,
   stopSystemdAutostart: () => stopSystemdAutostart,
   subscribeUserAttentionEvents: () => subscribeUserAttentionEvents,
-  subscriptionIdempotencyKey: () => subscriptionIdempotencyKey,
-  summarizeSubscriptionPush: () => summarizeSubscriptionPush,
   summarizeXmtpTestEvents: () => summarizeXmtpTestEvents,
   switchProvider: () => switchProvider,
   switchProviderWithReadinessGate: () => switchProviderWithReadinessGate,
@@ -44693,7 +44612,6 @@ __export(index_exports, {
   tailFile: () => tailFile,
   toOpenClawGatewaySessionKey: () => toOpenClawGatewaySessionKey,
   toWindowsInvocation: () => toWindowsInvocation,
-  tryMarkSubscriptionTarget: () => tryMarkSubscriptionTarget,
   writeAiPermissionPresetToConfig: () => writeAiPermissionPresetToConfig
 });
 module.exports = __toCommonJS(index_exports);
@@ -44703,62 +44621,12 @@ init_autostart();
 
 // src/ai-runner.ts
 init_log();
-var import_node_crypto5 = require("node:crypto");
+var import_node_crypto4 = require("node:crypto");
 var import_node_fs11 = require("node:fs");
 var import_promises7 = require("node:fs/promises");
 var import_node_os6 = require("node:os");
 var import_node_path16 = require("node:path");
 init_ai_command();
-
-// src/ai-run-log-path.ts
-var import_node_crypto2 = require("node:crypto");
-var RUN_LOG_FILENAME_MAX_BYTES = 240;
-function buildRunLogFileName(request) {
-  const source = request.source;
-  const sessionKey = request.sessionKey;
-  const messageId = request.messageId;
-  const jobId = request.jobId;
-  const safeMessageId = encodeURIComponent(messageId);
-  const prefix = source === "job-dispatch" ? "ai-" : "ai-session-";
-  const encodedContext = source === "job-dispatch" ? encodeURIComponent(jobId ?? "unknown") : encodeURIComponent(sessionKey);
-  const readable = `${prefix}${encodedContext}-${safeMessageId}.log`;
-  if (Buffer.byteLength(readable, "utf8") <= RUN_LOG_FILENAME_MAX_BYTES) {
-    return readable;
-  }
-  const readableWithoutExt = readable.slice(0, -".log".length);
-  const digest = (0, import_node_crypto2.createHash)("sha256").update(readableWithoutExt).digest("hex").slice(0, 24);
-  const suffix = `-${digest}.log`;
-  const budgetForContext = RUN_LOG_FILENAME_MAX_BYTES - Buffer.byteLength(prefix, "utf8") - Buffer.byteLength(suffix, "utf8");
-  const contextHead = truncateToUtf8ByteBudgetSafe(encodedContext, Math.max(budgetForContext, 0));
-  return `${prefix}${contextHead}${suffix}`;
-}
-function truncateToUtf8ByteBudgetSafe(encoded, maxBytes) {
-  if (maxBytes <= 0) {
-    return "";
-  }
-  if (Buffer.byteLength(encoded, "utf8") <= maxBytes) {
-    return encoded;
-  }
-  let candidateLength = Math.min(maxBytes, encoded.length);
-  while (candidateLength > 0) {
-    const candidate = encoded.slice(0, candidateLength);
-    if (!endsWithSplitEscape(candidate)) {
-      return candidate;
-    }
-    candidateLength -= 1;
-  }
-  return "";
-}
-function endsWithSplitEscape(value) {
-  const percentIndex = value.lastIndexOf("%");
-  if (percentIndex === -1) {
-    return false;
-  }
-  const tail = value.length - percentIndex - 1;
-  return tail < 2;
-}
-
-// src/ai-runner.ts
 init_paths();
 
 // src/file-store.ts
@@ -46439,15 +46307,13 @@ var AiRunner = class {
     );
   }
   buildRunLogPath(request) {
-    return (0, import_node_path16.join)(
-      this.logsDir,
-      buildRunLogFileName({
-        source: request.source,
-        sessionKey: request.sessionKey,
-        messageId: request.messageId,
-        jobId: request.jobId
-      })
-    );
+    const safeMessageId = encodeURIComponent(request.messageId);
+    if (request.source === "job-dispatch") {
+      const safeJobId = encodeURIComponent(request.jobId ?? "unknown");
+      return (0, import_node_path16.join)(this.logsDir, `ai-${safeJobId}-${safeMessageId}.log`);
+    }
+    const safeSessionKey = encodeURIComponent(request.sessionKey);
+    return (0, import_node_path16.join)(this.logsDir, `ai-session-${safeSessionKey}-${safeMessageId}.log`);
   }
   readRunAiSessionId(provider, request, file, sessionMeta) {
     if (request.source === "job-dispatch" && request.jobId) {
@@ -48169,7 +48035,7 @@ function normalizeAttentionProvider(provider) {
   return provider === "unknown" ? null : provider;
 }
 function stableHash(value) {
-  return (0, import_node_crypto5.createHash)("sha256").update(value).digest("hex").slice(0, 24);
+  return (0, import_node_crypto4.createHash)("sha256").update(value).digest("hex").slice(0, 24);
 }
 function formatCommand(args) {
   return args.map(shellQuote).join(" ");
@@ -48196,11 +48062,10 @@ function shortenJobId(jobId) {
 
 // src/command-store.ts
 init_log();
-var import_node_crypto6 = require("node:crypto");
+var import_node_crypto5 = require("node:crypto");
 var import_node_fs12 = require("node:fs");
 var import_node_path17 = require("node:path");
 init_paths();
-init_session_store();
 var { DatabaseSync: DatabaseSync2 } = loadSqlite2();
 var XMTP_DEBUG_RESULT_TTL_MS = 5 * 6e4;
 function stringifyForStorage(value) {
@@ -48222,7 +48087,7 @@ var CommandStore = class {
   }
   createXmtpSendCommand(params) {
     return {
-      id: (0, import_node_crypto6.randomUUID)(),
+      id: (0, import_node_crypto5.randomUUID)(),
       type: "xmtp-send",
       jobId: params.jobId,
       message: params.message,
@@ -48236,27 +48101,16 @@ var CommandStore = class {
       createdAt: Date.now()
     };
   }
-  createXmtpSubscriptionPushCommand(params) {
-    return {
-      id: (0, import_node_crypto6.randomUUID)(),
-      type: "xmtp-subscription-push",
-      myAgentId: params.myAgentId,
-      content: params.content,
-      conversationIds: params.conversationIds,
-      deliveryId: params.deliveryId,
-      createdAt: Date.now()
-    };
-  }
   createXmtpGetPendingListCommand() {
     return {
-      id: (0, import_node_crypto6.randomUUID)(),
+      id: (0, import_node_crypto5.randomUUID)(),
       type: "xmtp-get-pending-list",
       createdAt: Date.now()
     };
   }
   createXmtpDenyPendingConversationCommand(params) {
     return {
-      id: (0, import_node_crypto6.randomUUID)(),
+      id: (0, import_node_crypto5.randomUUID)(),
       type: "xmtp-deny-pending-conversation",
       groupId: params.groupId,
       jobId: params.jobId,
@@ -48267,14 +48121,14 @@ var CommandStore = class {
   }
   createXmtpRefreshAgentsCommand() {
     return {
-      id: (0, import_node_crypto6.randomUUID)(),
+      id: (0, import_node_crypto5.randomUUID)(),
       type: "xmtp-refresh-agents",
       createdAt: Date.now()
     };
   }
   createXmtpGetConversationHistoryCommand(params) {
     return {
-      id: (0, import_node_crypto6.randomUUID)(),
+      id: (0, import_node_crypto5.randomUUID)(),
       type: "xmtp-get-conversation-history",
       jobId: params.jobId,
       toAgentId: params.toAgentId,
@@ -48286,7 +48140,7 @@ var CommandStore = class {
   }
   createXmtpDebugCommand(params) {
     return {
-      id: (0, import_node_crypto6.randomUUID)(),
+      id: (0, import_node_crypto5.randomUUID)(),
       type: "xmtp-debug",
       action: params.action,
       groupId: params.groupId,
@@ -48301,7 +48155,7 @@ var CommandStore = class {
   }
   createAiJobMessageDispatchCommand(params) {
     return {
-      id: (0, import_node_crypto6.randomUUID)(),
+      id: (0, import_node_crypto5.randomUUID)(),
       type: "ai-dispatch",
       kind: "job-message",
       jobId: params.jobId,
@@ -48312,7 +48166,7 @@ var CommandStore = class {
   }
   createAiSessionMessageDispatchCommand(params) {
     return {
-      id: (0, import_node_crypto6.randomUUID)(),
+      id: (0, import_node_crypto5.randomUUID)(),
       type: "ai-dispatch",
       kind: "session-message",
       sessionKey: params.sessionKey,
@@ -48340,65 +48194,6 @@ var CommandStore = class {
     );
     return this.commandPath(command.id);
   }
-  /**
-   * Atomic idempotent submit keyed on a business `idempotencyKey` (DEXMARKET-9035,
-   * M2). The FIRST caller for a given key inserts its command and gets
-   * `created: true`; every later caller with the SAME key — including after a
-   * daemon / CommandStore rebuild — gets the ALREADY-persisted command back with
-   * `created: false` and NO new row. Concurrency-safe: correctness rests on the
-   * partial UNIQUE index on `idempotency_key`, not a check-then-insert (which
-   * races), so a `INSERT ... ON CONFLICT DO NOTHING` collapses concurrent
-   * duplicates to exactly one row. Recoverable SQLITE_BUSY/LOCKED errors reuse
-   * the repo's bounded exponential backoff. This never changes the plain
-   * `submit` path used by `xmtp-send` and every other daemon command.
-   */
-  async submitIdempotent(command, idempotencyKey) {
-    if (!idempotencyKey) {
-      throw new Error("submitIdempotent requires a non-empty idempotencyKey");
-    }
-    return this.withBusyRetry(
-      () => this.transaction(() => {
-        const now = Date.now();
-        const insert = this.db.prepare(`
-          INSERT INTO command_queue (
-            id, type, status, command_json, result_json,
-            created_at_ms, updated_at_ms, processing_started_at_ms, completed_at_ms,
-            idempotency_key
-          )
-          VALUES (?, ?, 'pending', ?, NULL, ?, ?, NULL, NULL, ?)
-          ON CONFLICT(idempotency_key) WHERE idempotency_key IS NOT NULL DO NOTHING
-        `).run(
-          command.id,
-          command.type,
-          stringifyForStorage(command),
-          normalizeCreatedAt(command.createdAt, now),
-          now,
-          idempotencyKey
-        );
-        if (Number(insert.changes ?? 0) > 0) {
-          return { path: this.commandPath(command.id), commandId: command.id, created: true };
-        }
-        const existing = this.db.prepare(`
-          SELECT id FROM command_queue WHERE idempotency_key = ?
-        `).get(idempotencyKey);
-        const existingId = existing?.id ?? command.id;
-        return { path: this.commandPath(existingId), commandId: existingId, created: false };
-      })
-    );
-  }
-  async withBusyRetry(operation) {
-    const attempts = 6;
-    for (let attempt = 1; ; attempt += 1) {
-      try {
-        return operation();
-      } catch (err) {
-        if (!isSqliteBusyError(err) || attempt >= attempts) {
-          throw err;
-        }
-        await new Promise((resolve11) => setTimeout(resolve11, Math.min(50 * 2 ** (attempt - 1), 1e3)));
-      }
-    }
-  }
   async listPending() {
     return (await this.listPendingEntries()).map((entry) => entry.command);
   }
@@ -48465,24 +48260,9 @@ var CommandStore = class {
       CREATE INDEX IF NOT EXISTS idx_command_queue_status_created
       ON command_queue(status, created_at_ms, id)
     `);
-    this.ensureColumn("command_queue", "idempotency_key", "TEXT");
-    this.db.exec(`
-      CREATE UNIQUE INDEX IF NOT EXISTS idx_command_queue_idempotency_key
-      ON command_queue(idempotency_key)
-      WHERE idempotency_key IS NOT NULL
-    `);
     this.purgeExpiredXmtpDebugResults();
     this.importLegacyFileCommands();
   }
-  ensureColumn(table, column, definition) {
-    this.transaction(() => {
-      const rows = this.db.prepare(`PRAGMA table_info(${table})`).all();
-      if (rows.some((row) => row.name === column)) {
-        return;
-      }
-      this.db.exec(`ALTER TABLE ${table} ADD COLUMN ${column} ${definition}`);
-    });
-  }
   purgeExpiredXmtpDebugResults() {
     this.db.prepare(`
       DELETE FROM command_queue
@@ -48654,10 +48434,6 @@ function isDaemonCommand(value) {
   if (parsed.type === "xmtp-send") {
     return typeof parsed.jobId === "string" && typeof parsed.message === "string";
   }
-  if (parsed.type === "xmtp-subscription-push") {
-    const command = parsed;
-    return typeof command.myAgentId === "string" && typeof command.content === "string" && Array.isArray(command.conversationIds) && command.conversationIds.every((item) => typeof item === "string");
-  }
   if (parsed.type === "xmtp-get-pending-list") {
     return true;
   }
@@ -48824,7 +48600,7 @@ var import_node_path21 = require("node:path");
 // ../../node_modules/@xmtp/node-sdk/dist/index.js
 var import_node_bindings = require("@xmtp/node-bindings");
 var import_node_bindings2 = require("@xmtp/node-bindings");
-var import_node_crypto7 = require("node:crypto");
+var import_node_crypto6 = require("node:crypto");
 
 // ../../node_modules/@xmtp/node-sdk/node_modules/@xmtp/content-type-primitives/dist/index.js
 var contentTypeToString = (contentType) => `${contentType.authorityId}/${contentType.typeId}:${contentType.versionMajor}.${contentType.versionMinor}`;
@@ -49267,7 +49043,6 @@ function createAsyncStreamProxy(stream) {
     }
   });
 }
-var wait = (ms) => new Promise((resolve11) => setTimeout(resolve11, ms));
 var DEFAULT_RETRY_DELAY = 6e4;
 var DEFAULT_RETRY_ATTEMPTS = 10;
 var createStream = async (streamFunction, streamValueMutator, options) => {
@@ -49276,82 +49051,161 @@ var createStream = async (streamFunction, streamValueMutator, options) => {
     throw new StreamInvalidRetryAttemptsError();
   }
   const asyncStream = new AsyncStream();
+  let stopped = false;
+  let current;
+  let recovering = false;
+  let cancelDelay;
+  const isStopped = () => stopped;
+  const isCurrent = (native) => !stopped && current === native;
+  asyncStream.onDone = () => {
+    if (stopped) {
+      return;
+    }
+    stopped = true;
+    cancelDelay?.();
+    const native = current;
+    current = void 0;
+    native?.closer?.end();
+  };
+  const delay = (ms) => new Promise((resolve11) => {
+    const timer = setTimeout(() => {
+      cancelDelay = void 0;
+      resolve11();
+    }, ms);
+    cancelDelay = () => {
+      clearTimeout(timer);
+      cancelDelay = void 0;
+      resolve11();
+    };
+  });
+  const reportError = (error) => {
+    if (!stopped) {
+      onError?.(error);
+    }
+  };
+  const deliver = (value) => {
+    if (stopped || value === void 0) {
+      return;
+    }
+    asyncStream.push(value);
+    onValue?.(value);
+  };
   const streamCallback = (error, value) => {
+    if (stopped) {
+      return;
+    }
     if (error) {
       onError?.(error);
       return;
     }
-    if (value !== void 0) {
-      try {
-        if (streamValueMutator) {
-          const mutatedValue = streamValueMutator(value);
-          if ((0, import_types.isPromise)(mutatedValue)) {
-            void mutatedValue.then((mutatedValue2) => {
-              if (mutatedValue2 !== void 0) {
-                asyncStream.push(mutatedValue2);
-                onValue?.(mutatedValue2);
-              }
-            }).catch((error2) => {
-              onError?.(error2);
-            });
-          } else {
-            if (mutatedValue !== void 0) {
-              asyncStream.push(mutatedValue);
-              onValue?.(mutatedValue);
-            }
-          }
+    if (value === void 0) {
+      return;
+    }
+    try {
+      if (streamValueMutator) {
+        const mutatedValue = streamValueMutator(value);
+        if ((0, import_types.isPromise)(mutatedValue)) {
+          void mutatedValue.then(deliver).catch(reportError);
         } else {
-          asyncStream.push(value);
-          onValue?.(value);
+          deliver(mutatedValue);
         }
-      } catch (error2) {
-        onError?.(error2);
+      } else {
+        deliver(value);
       }
+    } catch (error2) {
+      reportError(error2);
     }
   };
-  const retry2 = async (retries = retryAttempts) => {
-    if (retries === 0) {
-      void asyncStream.end();
-      onError?.(new StreamFailedError(retryAttempts));
-      return;
+  const fail = (error) => {
+    void asyncStream.end();
+    onError?.(error);
+  };
+  const open2 = async () => {
+    if (stopped) {
+      return false;
+    }
+    const native = { ready: false, closed: false };
+    current = native;
+    const closer = await streamFunction(streamCallback, () => {
+      onNativeClose(native);
+    });
+    native.closer = closer;
+    if (!isCurrent(native)) {
+      closer.end();
+      return false;
+    }
+    await closer.waitForReady();
+    if (!isCurrent(native)) {
+      closer.end();
+      return false;
+    }
+    if (native.closed || closer.isClosed()) {
+      closer.end();
+      return false;
     }
-    await wait(retryDelay);
-    onRetry?.(retryAttempts - retries + 1, retryAttempts);
+    native.ready = true;
+    return true;
+  };
+  const restart = async () => {
     try {
-      const streamCloser = await streamFunction(streamCallback, () => {
-        onFail?.();
-        void retry2();
-      });
-      await streamCloser.waitForReady();
-      asyncStream.onDone = () => {
-        streamCloser.end();
-      };
-      onRestart?.();
-    } catch (error) {
-      onError?.(error);
-      void retry2(retries - 1);
+      for (let attempt = 1; attempt <= retryAttempts; attempt++) {
+        await delay(retryDelay);
+        if (isStopped()) {
+          return;
+        }
+        onRetry?.(attempt, retryAttempts);
+        let restarted = false;
+        try {
+          restarted = await open2();
+        } catch (error) {
+          reportError(error);
+        }
+        if (isStopped()) {
+          return;
+        }
+        if (restarted) {
+          try {
+            onRestart?.();
+          } catch (error) {
+            reportError(error);
+          }
+          return;
+        }
+      }
+      fail(new StreamFailedError(retryAttempts));
+    } finally {
+      recovering = false;
     }
   };
-  const startRetry = () => {
-    if (retryOnFail) {
-      void retry2();
-    } else {
-      void asyncStream.end();
-      onError?.(new StreamFailedError(0));
+  const recover = () => {
+    if (stopped || recovering) {
+      return;
+    }
+    if (!retryOnFail) {
+      fail(new StreamFailedError(0));
+      return;
     }
+    recovering = true;
+    void restart();
   };
+  function onNativeClose(native) {
+    if (!isCurrent(native) || native.closed) {
+      return;
+    }
+    native.closed = true;
+    onFail?.();
+    if (native.ready) {
+      recover();
+    }
+  }
+  let started = false;
   try {
-    const streamCloser = await streamFunction(streamCallback, () => {
-      onFail?.();
-      startRetry();
-    });
-    await streamCloser.waitForReady();
-    asyncStream.onDone = () => {
-      streamCloser.end();
-    };
+    started = await open2();
   } catch (error) {
-    onError?.(error);
-    startRetry();
+    reportError(error);
+  }
+  if (!started) {
+    recover();
   }
   return createAsyncStreamProxy(asyncStream);
 };
@@ -50546,7 +50400,7 @@ var resolveBackend = async (envOrBackend, gatewayHost) => {
   return createBackend({ env: envOrBackend, gatewayHost });
 };
 var createEphemeralIdentifier = () => ({
-  identifier: `0x${(0, import_node_crypto7.randomBytes)(20).toString("hex")}`,
+  identifier: `0x${(0, import_node_crypto6.randomBytes)(20).toString("hex")}`,
   identifierKind: 0
 });
 var toInboxUpdatesCountMap = (value) => {
@@ -52595,7 +52449,7 @@ function observe(observerId, callbacks, fn) {
 }
 
 // ../../node_modules/viem/_esm/utils/wait.js
-async function wait2(time) {
+async function wait(time) {
   return new Promise((res) => setTimeout(res, time));
 }
 
@@ -52608,12 +52462,12 @@ function poll(fn, { emitOnBegin, initialWaitTime, interval }) {
     if (emitOnBegin)
       data = await fn({ unpoll: unwatch });
     const initialWait = await initialWaitTime?.(data) ?? interval;
-    await wait2(initialWait);
+    await wait(initialWait);
     const poll2 = async () => {
       if (!active)
         return;
       await fn({ unpoll: unwatch });
-      await wait2(interval);
+      await wait(interval);
       poll2();
     };
     poll2();
@@ -52936,7 +52790,7 @@ function withRetry(fn, { delay: delay_ = 100, retryCount = 2, shouldRetry: shoul
       const retry2 = async ({ error }) => {
         const delay = typeof delay_ === "function" ? delay_({ count, error }) : delay_;
         if (delay)
-          await wait2(delay);
+          await wait(delay);
         attemptRetry({ count: count + 1 });
       };
       try {
@@ -55099,7 +54953,7 @@ init_createBatchScheduler();
 function http(url, config = {}) {
   const { batch, fetchFn, fetchOptions, key = "http", methods, name = "HTTP JSON-RPC", onFetchRequest, onFetchResponse, retryDelay, raw } = config;
   return ({ chain, retryCount: retryCount_, timeout: timeout_ }) => {
-    const { batchSize = 1e3, wait: wait3 = 0 } = typeof batch === "object" ? batch : {};
+    const { batchSize = 1e3, wait: wait2 = 0 } = typeof batch === "object" ? batch : {};
     const retryCount = config.retryCount ?? retryCount_;
     const timeout = timeout_ ?? config.timeout ?? 1e4;
     const url_ = url || chain?.rpcUrls.default.http[0];
@@ -55120,7 +54974,7 @@ function http(url, config = {}) {
         const body = { method, params };
         const { schedule } = createBatchScheduler({
           id: url_,
-          wait: wait3,
+          wait: wait2,
           shouldSplitBatch(requests) {
             return requests.length > batchSize;
           },
@@ -55336,8 +55190,8 @@ var sepolia = /* @__PURE__ */ defineChain({
 });
 
 // ../../node_modules/@xmtp/agent-sdk/dist/index.js
-var import_node_crypto8 = require("node:crypto");
-var version2 = "2.3.0";
+var import_node_crypto7 = require("node:crypto");
+var version2 = "2.3.1";
 var fromSelf = (message, client) => {
   return message.senderInboxId === client.inboxId;
 };
@@ -56031,7 +55885,7 @@ var Agent = class _Agent extends import_node_events.default {
     return this.#client.accountIdentifier?.identifier;
   }
 };
-var CANCEL_ACTION_ID = (0, import_node_crypto8.randomUUID)();
+var CANCEL_ACTION_ID = (0, import_node_crypto7.randomUUID)();
 var LimitedMap = class {
   #map = /* @__PURE__ */ new Map();
   #limit;
@@ -57386,6 +57240,9 @@ function replayScanBackoffWithJitterMs(consecutiveFailures, randomValue = Math.r
   const jitteredMs = Math.round(baseMs * (0.9 + boundedRandom * 0.2));
   return Math.min(REPLAY_SCAN_MAX_BACKOFF_MS, jitteredMs);
 }
+function isListenHealthy(outcome) {
+  return outcome === "started" || outcome === "retrying";
+}
 function isOfflineReplayForTrigger(trigger) {
   return trigger === "startup";
 }
@@ -57395,6 +57252,18 @@ function replaySingleFlightDiscriminator(trigger, clientGeneration) {
     isOfflineReplayForTrigger(trigger)
   );
 }
+var XmtpClientCreateBlockedError = class extends Error {
+  reason;
+  address;
+  agentId;
+  constructor(reason, address, agentId) {
+    super(`xmtp client create blocked (${reason})`);
+    this.name = "XmtpClientCreateBlockedError";
+    this.reason = reason;
+    this.address = address;
+    this.agentId = agentId;
+  }
+};
 var XmtpService = class _XmtpService {
   static instance = null;
   env = process.env.XMTP_ENV ?? "production";
@@ -57432,6 +57301,25 @@ var XmtpService = class _XmtpService {
   streamRecoverySetTimeout = (callback, delayMs) => setTimeout(callback, delayMs);
   streamRecoveryClearTimeout = (timer) => clearTimeout(timer);
   streamStartSetTimeout = (callback, delayMs) => setTimeout(callback, delayMs);
+  xmtpAgentFactory = createAgentWithInstallationPrune;
+  // Old clients whose close() was not confirmed. Keyed by lower-cased address.
+  // The reference is kept only for controlled cleanup; it is never served.
+  pendingReleaseByAddress = /* @__PURE__ */ new Map();
+  // Addresses whose pending release was confirmed late (after the caller gave
+  // up waiting) and still need a replacement client on the next recycle.
+  releaseConfirmedNeedsCreate = /* @__PURE__ */ new Set();
+  // Lower-cased addresses owned by a create. The slot is held from before the
+  // SDK factory runs until the new client is registered in `clients` (or the
+  // create failed), so no flow can observe "no lock and no client".
+  clientCreateInFlight = /* @__PURE__ */ new Set();
+  // Clients whose close() was confirmed; a repeated release is a no-op.
+  releasedClients = /* @__PURE__ */ new WeakSet();
+  // One listener setup per client, shared by concurrent init/refresh callers.
+  listenTaskByClient = /* @__PURE__ */ new WeakMap();
+  inboundReplayGateOwners = /* @__PURE__ */ new WeakMap();
+  releaseWaitTimeoutMs = 3e4;
+  releaseWaitSetTimeout = (callback, delayMs) => setTimeout(callback, delayMs);
+  releaseWaitClearTimeout = (timer) => clearTimeout(timer);
   nextClientGeneration = 1;
   clientGenerationByClient = /* @__PURE__ */ new WeakMap();
   resolveStartupReplayCompletion;
@@ -57580,6 +57468,56 @@ var XmtpService = class _XmtpService {
     return { ok: remaining.length === 0, failures: remaining };
   }
   async createClientForAgent(agentInfo, options = {}) {
+    const address = agentInfo.communicationAddress;
+    const addressKey = address.toLowerCase();
+    let blockedReason;
+    if (this.pendingReleaseByAddress.has(addressKey)) {
+      blockedReason = "release_pending";
+    } else if (this.clientCreateInFlight.has(addressKey)) {
+      blockedReason = "create_in_flight";
+    } else if (this.getClientByAddress(address)) {
+      blockedReason = "client_active";
+    }
+    if (blockedReason) {
+      throw new XmtpClientCreateBlockedError(
+        blockedReason,
+        address,
+        agentInfo.agentId
+      );
+    }
+    this.clientCreateInFlight.add(addressKey);
+    try {
+      const created = await this.createClientForAgentGuarded(agentInfo, options);
+      await this.registerCreatedClient(created, options.logPrefix ?? "[xmtp-sdk]");
+      return created;
+    } finally {
+      this.clientCreateInFlight.delete(addressKey);
+    }
+  }
+  // Ownership hand-off, still inside the create slot: the new client becomes
+  // visible in `clients` before the slot is released. Never overwrites an
+  // existing registration; a conflicting new object is released, not dropped.
+  async registerCreatedClient(created, phase) {
+    const { address, agent, agentInfo } = created;
+    const addressKey = address.toLowerCase();
+    const existing = this.getClientByAddress(address);
+    if (existing && existing !== agent || this.pendingReleaseByAddress.has(addressKey)) {
+      const reason = existing ? "client_active" : "release_pending";
+      logWithTimestamp(
+        `[xmtp-sdk] create registration conflict (${reason}): ${address} (agentId=${agentInfo.agentId}), releasing the new client`
+      );
+      await this.releaseClient(
+        address,
+        agent,
+        agentInfo.agentId,
+        `${phase}/register-conflict`
+      );
+      throw new XmtpClientCreateBlockedError(reason, address, agentInfo.agentId);
+    }
+    this.stoppedAddresses.delete(addressKey);
+    this.clients.set(address, agent);
+  }
+  async createClientForAgentGuarded(agentInfo, options = {}) {
     const address = agentInfo.communicationAddress;
     const phase = options.logPrefix ?? "[xmtp-sdk]";
     const cooldown = getXmtpCreationCooldown();
@@ -57608,7 +57546,7 @@ var XmtpService = class _XmtpService {
     try {
       const signer = this.tools.createSigner(agentInfo);
       const dbPath = (inboxId2) => `${this.dataDir}/${inboxId2}-${this.env}.db3`;
-      const agent = await createAgentWithInstallationPrune(signer, {
+      const agent = await this.xmtpAgentFactory(signer, {
         dbPath,
         env: this.env
       }, {
@@ -57617,6 +57555,7 @@ var XmtpService = class _XmtpService {
         logPrefix: options.logPrefix
       });
       cooldown.recordCreateSuccess(decision);
+      this.releaseConfirmedNeedsCreate.delete(address.toLowerCase());
       if (decision.mode === "probe") {
         logger.info(LogEvent.XMTP_RATE_LIMIT_RECOVERED, {
           onchainosAgentId: agentInfo.agentId,
@@ -57654,6 +57593,128 @@ var XmtpService = class _XmtpService {
       throw err;
     }
   }
+  logReleaseNotConfirmed(address, agentId, phase, reason, err) {
+    logger.error(
+      LogEvent.XMTP_CLIENT_CLOSE_FAILED,
+      err instanceof Error ? err : new Error(`xmtp client close not confirmed (${reason})`),
+      { walletAddress: address, onchainosAgentId: agentId, phase, reason }
+    );
+  }
+  // Single release entry (recycle / refresh remove / failed replacement).
+  // Confirmation is ONLY a successful client.close(); a timeout, a missing
+  // close() or a close failure keeps the old reference in
+  // pendingReleaseByAddress and blocks new creates for that address.
+  async releaseClient(address, client, agentId, phase) {
+    const key = address.toLowerCase();
+    if (this.releasedClients.has(client)) {
+      this.unpublishClient(address, client, phase);
+      return true;
+    }
+    const existing = this.pendingReleaseByAddress.get(key);
+    if (existing?.inFlight) {
+      this.unpublishClient(address, client, phase);
+      return false;
+    }
+    const entry = existing ?? { client, agentId, phase };
+    entry.client = client;
+    entry.agentId = agentId;
+    entry.phase = phase;
+    this.pendingReleaseByAddress.set(key, entry);
+    this.unpublishClient(address, client, phase);
+    let timedOut = false;
+    const task = stopAndCloseXmtpClient(client, {
+      address,
+      agentId,
+      phase,
+      onCloseError: (err) => this.logReleaseNotConfirmed(address, agentId, phase, "close_threw", err)
+    }).then((result) => {
+      if (!result.stopped) {
+        logWithTimestamp(
+          `[xmtp-sdk] release: stop failed but close proceeded: ${address} (agentId=${agentId}) phase=${phase}`
+        );
+      }
+      entry.inFlight = void 0;
+      if (result.closed) {
+        this.releasedClients.add(client);
+      }
+      if (result.closed && this.pendingReleaseByAddress.get(key) === entry) {
+        this.pendingReleaseByAddress.delete(key);
+        if (timedOut) {
+          this.releaseConfirmedNeedsCreate.add(key);
+        }
+      }
+      return result;
+    });
+    entry.inFlight = task.then((result) => result.closed);
+    const timeoutHandle = {};
+    const timeoutPromise = new Promise((resolve11) => {
+      timeoutHandle.timer = this.releaseWaitSetTimeout(
+        () => resolve11(null),
+        this.releaseWaitTimeoutMs
+      );
+    });
+    const outcome = await Promise.race([task, timeoutPromise]);
+    if (timeoutHandle.timer !== void 0) {
+      this.releaseWaitClearTimeout(timeoutHandle.timer);
+    }
+    if (outcome === null) {
+      timedOut = true;
+      this.logReleaseNotConfirmed(address, agentId, phase, "close_timeout");
+      return false;
+    }
+    if (outcome.closed) {
+      if (this.pendingReleaseByAddress.get(key) === entry) {
+        this.pendingReleaseByAddress.delete(key);
+      }
+      return true;
+    }
+    if (!outcome.closeFailed) {
+      this.logReleaseNotConfirmed(address, agentId, phase, "close_unavailable");
+    }
+    return false;
+  }
+  // Stops serving `client` to new operations. Every removal is identity
+  // checked, so a late caller can never remove a newer instance (or its replay
+  // gate / recovery / retry state) registered for the same address.
+  unpublishClient(address, client, phase) {
+    const key = address.toLowerCase();
+    let removed = false;
+    for (const [registeredAddress, registered] of this.clients) {
+      if (registered === client && registeredAddress.toLowerCase() === key) {
+        this.clients.delete(registeredAddress);
+        removed = true;
+      }
+    }
+    const gate = this.inboundReplayGates.get(key);
+    if (gate) {
+      const owner = this.inboundReplayGateOwners.get(gate);
+      if (owner === client || owner === void 0 && removed) {
+        this.inboundReplayGates.delete(key);
+      }
+    }
+    this.cancelStreamRecoveryForAddress(address, client);
+    if (removed) {
+      this.replayScanFailuresByAddress.delete(key);
+      this.clearReplayScanRetry(
+        address,
+        phase.startsWith("recycle") ? "client_recycled" : "client_removed"
+      );
+    }
+    if (!this.getClientByAddress(address)) {
+      this.stoppedAddresses.add(key);
+    }
+  }
+  async settlePendingRelease(address) {
+    const entry = this.pendingReleaseByAddress.get(address.toLowerCase());
+    if (!entry) {
+      return true;
+    }
+    if (entry.inFlight) {
+      return false;
+    }
+    const retryPhase = entry.phase.endsWith("/retry") ? entry.phase : `${entry.phase}/retry`;
+    return this.releaseClient(address, entry.client, entry.agentId, retryPhase);
+  }
   async recordInstallationHealth(params) {
     const { address, agent, agentInfo, phase, attempt } = params;
     try {
@@ -57774,8 +57835,6 @@ var XmtpService = class _XmtpService {
       const r = results[i];
       if (r.status === "fulfilled") {
         const { address, agent, agentInfo } = r.value;
-        this.stoppedAddresses.delete(address.toLowerCase());
-        this.clients.set(address, agent);
         logWithTimestamp(
           `[xmtp-sdk] identity initialized: ${address} (agentId=${agentInfo.agentId})`
         );
@@ -57801,6 +57860,10 @@ var XmtpService = class _XmtpService {
           phase: "init",
           attempt: "1"
         });
+      } else if (r.reason instanceof XmtpClientCreateBlockedError) {
+        logWithTimestamp(
+          `[xmtp-sdk] identity init: create blocked (${r.reason.reason}): ${agents[i].communicationAddress} (agentId=${agents[i].agentId})`
+        );
       } else {
         failedAgents.push(agents[i]);
         if (r.reason instanceof XmtpCreationCooldownSkipError) {
@@ -57837,8 +57900,6 @@ var XmtpService = class _XmtpService {
         const r = retryResults[i];
         if (r.status === "fulfilled") {
           const { address, agent, agentInfo } = r.value;
-          this.stoppedAddresses.delete(address.toLowerCase());
-          this.clients.set(address, agent);
           logWithTimestamp(
             `[xmtp-sdk] retry succeeded: ${address} (agentId=${agentInfo.agentId})`
           );
@@ -57864,6 +57925,11 @@ var XmtpService = class _XmtpService {
             phase: "init",
             attempt: "2"
           });
+        } else if (r.reason instanceof XmtpClientCreateBlockedError) {
+          const info = failedAgents[i];
+          logWithTimestamp(
+            `[xmtp-sdk] retry create blocked (${r.reason.reason}): ${info.communicationAddress} (agentId=${info.agentId})`
+          );
         } else if (r.reason instanceof XmtpCreationCooldownSkipError) {
           const info = failedAgents[i];
           logWithTimestamp(
@@ -57946,36 +58012,38 @@ var XmtpService = class _XmtpService {
         throw err;
       }
     }
+    for (const pendingKey of [...this.pendingReleaseByAddress.keys()]) {
+      const settled = await this.settlePendingRelease(pendingKey);
+      logWithTimestamp(
+        `[xmtp-sdk] refresh: pending release ${pendingKey} ${settled ? "confirmed" : "still pending"}`
+      );
+    }
     const oldAddresses = new Set(
-      this.allAgents.map((a) => a.communicationAddress)
+      this.allAgents.map((a) => a.communicationAddress.toLowerCase())
+    );
+    const newAddresses = new Set(
+      newAgents.map((a) => a.communicationAddress.toLowerCase())
     );
-    const newAddresses = new Set(newAgents.map((a) => a.communicationAddress));
     const added = newAgents.filter(
-      (a) => !oldAddresses.has(a.communicationAddress) || !this.clients.has(a.communicationAddress)
+      (a) => !oldAddresses.has(a.communicationAddress.toLowerCase()) || !this.getClientByAddress(a.communicationAddress)
     );
     const removed = this.allAgents.filter(
-      (a) => !newAddresses.has(a.communicationAddress)
+      (a) => !newAddresses.has(a.communicationAddress.toLowerCase())
     );
     this.allAgents = newAgents;
     for (const agentInfo of removed) {
       const address = agentInfo.communicationAddress;
-      const client = this.clients.get(address);
+      const client = this.getClientByAddress(address);
       if (client) {
         try {
-          this.cancelStreamRecoveryForAddress(address);
-          this.stoppedAddresses.add(address.toLowerCase());
-          await stopAndCloseXmtpClient(client, {
+          const released = await this.releaseClient(
             address,
-            agentId: agentInfo.agentId,
-            phase: "refresh/remove",
-            onCloseError: (err) => logger.error(
-              LogEvent.XMTP_CLIENT_CLOSE_FAILED,
-              err instanceof Error ? err : new Error(String(err)),
-              { walletAddress: address, onchainosAgentId: agentInfo.agentId, phase: "refresh/remove" }
-            )
-          });
+            client,
+            agentInfo.agentId,
+            "refresh/remove"
+          );
           logWithTimestamp(
-            `[xmtp-sdk] refresh: stopped client: ${address} (agentId=${agentInfo.agentId})`
+            `[xmtp-sdk] refresh: stopped client: ${address} (agentId=${agentInfo.agentId}) released=${released}`
           );
         } catch (err) {
           logWithTimestamp(`[xmtp-sdk] refresh: failed to stop client: ${address}`, err);
@@ -57985,10 +58053,6 @@ var XmtpService = class _XmtpService {
             phase: "stop-client"
           });
         }
-        this.clients.delete(address);
-        this.inboundReplayGates.delete(address.toLowerCase());
-        this.replayScanFailuresByAddress.delete(address.toLowerCase());
-        this.clearReplayScanRetry(address, "client_removed");
         logger.info(LogEvent.AGENT_CLIENT_REMOVED, {
           ...agentExtras({
             walletAddress: address,
@@ -58030,8 +58094,6 @@ var XmtpService = class _XmtpService {
         const r = addResults[i];
         if (r.status === "fulfilled") {
           const { address, agentInfo } = r.value;
-          this.stoppedAddresses.delete(address.toLowerCase());
-          this.clients.set(address, r.value.agent);
           logWithTimestamp(
             `[xmtp-sdk] refresh: identity initialized: ${address} (agentId=${agentInfo.agentId})`
           );
@@ -58058,6 +58120,10 @@ var XmtpService = class _XmtpService {
             phase: "refresh",
             attempt: "1"
           });
+        } else if (r.reason instanceof XmtpClientCreateBlockedError) {
+          logWithTimestamp(
+            `[xmtp-sdk] refresh: create blocked (${r.reason.reason}): ${added[i].communicationAddress} (agentId=${added[i].agentId})`
+          );
         } else {
           failedAgents.push(added[i]);
           if (r.reason instanceof XmtpCreationCooldownSkipError) {
@@ -58097,8 +58163,6 @@ var XmtpService = class _XmtpService {
           const r = retryResults[i];
           if (r.status === "fulfilled") {
             const { address, agentInfo } = r.value;
-            this.stoppedAddresses.delete(address.toLowerCase());
-            this.clients.set(address, r.value.agent);
             logWithTimestamp(
               `[xmtp-sdk] refresh: retry succeeded: ${address} (agentId=${agentInfo.agentId})`
             );
@@ -58125,6 +58189,11 @@ var XmtpService = class _XmtpService {
               phase: "refresh",
               attempt: "2"
             });
+          } else if (r.reason instanceof XmtpClientCreateBlockedError) {
+            const info = failedAgents[i];
+            logWithTimestamp(
+              `[xmtp-sdk] refresh: retry create blocked (${r.reason.reason}): ${info.communicationAddress} (agentId=${info.agentId})`
+            );
           } else if (r.reason instanceof XmtpCreationCooldownSkipError) {
             const info = failedAgents[i];
             logWithTimestamp(
@@ -58150,7 +58219,8 @@ var XmtpService = class _XmtpService {
         }
       }
       await this.startListeningForAddresses(
-        added.map((a) => a.communicationAddress)
+        added.map((a) => a.communicationAddress),
+        "refresh/listen-failed"
       );
       for (const agentInfo of added) {
         const address = agentInfo.communicationAddress;
@@ -58215,30 +58285,42 @@ var XmtpService = class _XmtpService {
     }
     for (const agentInfo of this.allAgents) {
       const address = agentInfo.communicationAddress;
-      const oldClient = this.clients.get(address);
-      if (!oldClient) {
+      const addressKey = address.toLowerCase();
+      const oldClient = this.getClientByAddress(address);
+      const hasPendingRelease = this.pendingReleaseByAddress.has(addressKey) || this.releaseConfirmedNeedsCreate.has(addressKey);
+      if (!oldClient && !hasPendingRelease) {
         continue;
       }
-      const addressKey = address.toLowerCase();
-      try {
-        this.cancelStreamRecoveryForAddress(address);
-        this.stoppedAddresses.add(addressKey);
-        await stopAndCloseXmtpClient(oldClient, {
-          address,
-          agentId: agentInfo.agentId,
-          phase: "recycle",
-          onCloseError: (err) => logger.error(
-            LogEvent.XMTP_CLIENT_CLOSE_FAILED,
-            err instanceof Error ? err : new Error(String(err)),
-            { walletAddress: address, onchainosAgentId: agentInfo.agentId, phase: "recycle" }
-          )
-        });
-        this.clients.delete(address);
-        this.inboundReplayGates.delete(addressKey);
-        this.replayScanFailuresByAddress.delete(addressKey);
-        this.clearReplayScanRetry(address, "client_recycled");
+      if (!oldClient) {
+        let settled = false;
+        try {
+          settled = await this.settlePendingRelease(address);
+        } catch (err) {
+          logWithTimestamp(`[xmtp-sdk] recycle: pending release retry failed: ${address}`, err);
+        }
+        if (!settled) {
+          failed++;
+          continue;
+        }
+      } else {
+        let released = false;
+        try {
+          released = await this.releaseClient(
+            address,
+            oldClient,
+            agentInfo.agentId,
+            "recycle"
+          );
+        } catch (err) {
+          logWithTimestamp(`[xmtp-sdk] recycle: failed to stop client: ${address}`, err);
+          logger.error(LogEvent.AGENT_REFRESH_FAILED, err instanceof Error ? err : new Error(String(err)), {
+            walletAddress: address,
+            onchainosAgentId: agentInfo.agentId,
+            phase: "recycle/stop-client"
+          });
+        }
         logWithTimestamp(
-          `[xmtp-sdk] recycle: stopped client: ${address} (agentId=${agentInfo.agentId})`
+          `[xmtp-sdk] recycle: stopped client: ${address} (agentId=${agentInfo.agentId}) released=${released}`
         );
         logger.info(LogEvent.AGENT_CLIENT_REMOVED, {
           ...agentExtras({
@@ -58248,23 +58330,18 @@ var XmtpService = class _XmtpService {
           }),
           phase: "recycle"
         });
-      } catch (err) {
-        failed++;
-        this.stoppedAddresses.delete(addressKey);
-        logWithTimestamp(`[xmtp-sdk] recycle: failed to stop client: ${address}`, err);
-        logger.error(LogEvent.AGENT_REFRESH_FAILED, err instanceof Error ? err : new Error(String(err)), {
-          walletAddress: address,
-          onchainosAgentId: agentInfo.agentId,
-          phase: "recycle/stop-client"
-        });
-        continue;
+        if (!released) {
+          failed++;
+          continue;
+        }
       }
+      let newAgent;
+      let newAgentReleased = false;
       try {
         const { agent } = await this.createClientForAgent(agentInfo, {
           logPrefix: "[xmtp-sdk:recycle]"
         });
-        this.stoppedAddresses.delete(addressKey);
-        this.clients.set(address, agent);
+        newAgent = agent;
         logWithTimestamp(
           `[xmtp-sdk] recycle: identity initialized: ${address} (agentId=${agentInfo.agentId})`
         );
@@ -58288,7 +58365,13 @@ var XmtpService = class _XmtpService {
           agentInfo,
           phase: "recycle"
         });
-        await this.startListeningForAddresses([address]);
+        const listen = (await this.startListeningForAddresses([address], "recycle/listen-failed")).get(address);
+        if (listen?.client !== agent || !isListenHealthy(listen.outcome)) {
+          newAgentReleased = listen?.client === agent && listen.outcome === "failed";
+          throw new Error(
+            `xmtp listener not started (${listen?.client === agent ? listen.outcome : "client_replaced"})`
+          );
+        }
         const replayGate = this.inboundReplayGates.get(addressKey);
         let replaySummary;
         try {
@@ -58307,8 +58390,21 @@ var XmtpService = class _XmtpService {
         recycled++;
       } catch (err) {
         failed++;
-        this.cancelStreamRecoveryForAddress(address);
-        this.clients.delete(address);
+        if (newAgent && !newAgentReleased) {
+          try {
+            await this.releaseClient(
+              address,
+              newAgent,
+              agentInfo.agentId,
+              "recycle/create-failed"
+            );
+          } catch (releaseErr) {
+            logWithTimestamp(
+              `[xmtp-sdk] recycle: failed to release new client: ${address}`,
+              releaseErr
+            );
+          }
+        }
         logWithTimestamp(`[xmtp-sdk] recycle: failed to recreate client: ${address}`, err);
         logger.error(
           LogEvent.XMTP_CONNECTION_FAILED,
@@ -58712,7 +58808,7 @@ var XmtpService = class _XmtpService {
     }
   }
   async startListening() {
-    await this.startListeningForAddresses([...this.clients.keys()]);
+    await this.startListeningForAddresses([...this.clients.keys()], "listen-failed");
   }
   async drainInboundReplayGate(address, expectedGate) {
     if (!expectedGate) {
@@ -58777,11 +58873,22 @@ var XmtpService = class _XmtpService {
     );
     return gate;
   }
-  cancelStreamRecoveryForAddress(address) {
+  // With `client`, only that client's recovery is cancelled, so a late caller
+  // cannot cancel the recovery of a newer instance on the same address.
+  cancelStreamRecoveryForAddress(address, client) {
     const addressKey = address.toLowerCase();
-    const cleanup = this.streamRecoveryCleanupByAddress.get(addressKey);
+    const entry = this.streamRecoveryCleanupByAddress.get(addressKey);
+    if (!entry || client && entry.client !== client) {
+      return;
+    }
     this.streamRecoveryCleanupByAddress.delete(addressKey);
-    cleanup?.();
+    entry.cleanup();
+  }
+  // True while `client` is the registered client of `address` (case-insensitive)
+  // and the address is neither stopped nor being released.
+  isCurrentListenOwner(address, client) {
+    const key = address.toLowerCase();
+    return this.getClientByAddress(address) === client && !this.stoppedAddresses.has(key) && !this.pendingReleaseByAddress.has(key);
   }
   getClientGeneration(client) {
     const existing = this.clientGenerationByClient.get(client);
@@ -58933,10 +59040,17 @@ var XmtpService = class _XmtpService {
     this.notifyAgentsWakeupAfterReplay();
     return summary;
   }
-  async startListeningForAddresses(addresses) {
+  // Starts (at most once per client) the listener of every registered address
+  // and reports each outcome. A "failed" client, i.e. one with neither a live
+  // listener nor an owned retry task, is released with `releasePhase` before
+  // this returns, so it is never served as a healthy instance.
+  async startListeningForAddresses(addresses, releasePhase = "listen-failed") {
     const valid = addresses.filter((addr) => this.clients.has(addr));
-    await parallelMap(valid, async (address) => {
-      const agent = this.clients.get(address);
+    const targets = valid.map((address) => ({
+      address,
+      client: this.clients.get(address)
+    }));
+    const listenForClient = async (address, agent) => {
       const clientGeneration = this.getClientGeneration(agent);
       const addressKey = address.toLowerCase();
       const tag = `[xmtp-sdk:${address}]`;
@@ -58947,6 +59061,11 @@ var XmtpService = class _XmtpService {
         onchainosAgentId: onchainosAgent?.agentId,
         role: onchainosAgent?.role
       };
+      const ownsAddress = () => this.isCurrentListenOwner(address, agent);
+      if (!ownsAddress()) {
+        logWithTimestamp(`${tag} listener setup skipped: client no longer current`);
+        return "skipped";
+      }
       try {
         await agent.client.conversations.syncAll([
           import_node_bindings2.ConsentState.Allowed,
@@ -58954,13 +59073,21 @@ var XmtpService = class _XmtpService {
         ]);
         logWithTimestamp(`${tag} conversations synced (non-Denied)`);
       } catch (err) {
-        logWithTimestamp(`${tag} conversation sync failed, skipping this client:`, err);
+        if (!ownsAddress()) {
+          logWithTimestamp(`${tag} stale conversation sync failed after replacement, ignored:`, err);
+          return "skipped";
+        }
+        logWithTimestamp(`${tag} conversation sync failed, listener not started:`, err);
         logger.error(
           LogEvent.CONVERSATIONS_STREAM_FAILED,
           err instanceof Error ? err : void 0,
           agentExtras(identity)
         );
-        return;
+        return "failed";
+      }
+      if (!ownsAddress()) {
+        logWithTimestamp(`${tag} listener setup skipped after sync: client no longer current`);
+        return "skipped";
       }
       agent.use(loggingMiddleware(identity));
       agent.use(selfFilterMiddleware());
@@ -58989,6 +59116,7 @@ var XmtpService = class _XmtpService {
         });
         const gate = new InboundReplayGate(inbound);
         this.inboundReplayGates.set(address.toLowerCase(), gate);
+        this.inboundReplayGateOwners.set(gate, agent);
         agent.use(gate.middleware);
       } else {
         logWithTimestamp(
@@ -59006,16 +59134,25 @@ var XmtpService = class _XmtpService {
       const MAX_RETRIES = 5;
       const BASE_DELAY_MS = 1e3;
       const startWithRetry = async (attempt = 0) => {
-        if (this.stoppedAddresses.has(address.toLowerCase()) || !this.clients.has(address)) {
+        if (!ownsAddress()) {
           logWithTimestamp(`${tag} start skipped: client stopped or removed`);
-          return;
+          return "skipped";
         }
         try {
           const liveStreamOptions = {
             consentStates: [import_node_bindings2.ConsentState.Allowed, import_node_bindings2.ConsentState.Unknown]
           };
           await agent.start(liveStreamOptions);
+          if (!ownsAddress()) {
+            logWithTimestamp(`${tag} stale agent.start resolved after replacement, ignored`);
+            return "skipped";
+          }
+          return "started";
         } catch (err) {
+          if (!ownsAddress()) {
+            logWithTimestamp(`${tag} stale agent.start failed after replacement, ignored:`, err);
+            return "skipped";
+          }
           logWithTimestamp(`${tag} agent.start error (attempt=${attempt}):`, err);
           logger.error(
             LogEvent.AGENT_START_FAILED,
@@ -59025,17 +59162,27 @@ var XmtpService = class _XmtpService {
               attempt: String(attempt)
             }
           );
-          scheduleRetry(attempt);
+          return scheduleRetry(attempt);
         }
       };
       const scheduleRetry = (attempt) => {
-        if (this.stoppedAddresses.has(address.toLowerCase()) || !this.clients.has(address)) {
+        if (!ownsAddress()) {
           logWithTimestamp(`${tag} reconnect skipped: client stopped or removed`);
-          return;
+          return "skipped";
         }
         if (attempt >= MAX_RETRIES) {
-          logWithTimestamp(`${tag} reached max retries (${MAX_RETRIES}), giving up reconnect`);
-          return;
+          logWithTimestamp(
+            `${tag} reached max retries (${MAX_RETRIES}), giving up reconnect; releasing client`
+          );
+          void this.releaseClient(
+            address,
+            agent,
+            identity.onchainosAgentId ?? "",
+            "listen/retry-exhausted"
+          ).catch((err) => {
+            logWithTimestamp(`${tag} release after retry exhaustion failed:`, err);
+          });
+          return "failed";
         }
         const delay = BASE_DELAY_MS * 2 ** attempt;
         logWithTimestamp(`${tag} reconnecting in ${delay}ms (attempt=${attempt + 1})`);
@@ -59043,6 +59190,7 @@ var XmtpService = class _XmtpService {
           () => void startWithRetry(attempt + 1),
           delay
         );
+        return "retrying";
       };
       const streamRecovery = new StreamRecoveryTelemetry();
       let recoveryTimeout;
@@ -59062,10 +59210,10 @@ var XmtpService = class _XmtpService {
           recoveryStabilityTimeout = void 0;
         }
       };
-      this.streamRecoveryCleanupByAddress.set(
-        addressKey,
-        cleanupStreamRecovery
-      );
+      this.streamRecoveryCleanupByAddress.set(addressKey, {
+        client: agent,
+        cleanup: cleanupStreamRecovery
+      });
       agent.on("unhandledError", (err) => {
         if (recoveryDisposed || this.clients.get(address) !== agent || this.stoppedAddresses.has(addressKey)) {
           return;
@@ -59227,9 +59375,54 @@ var XmtpService = class _XmtpService {
           `${tag} agent message event msg=${msg?.id ?? "(unknown)"} kind=${msg?.kind ?? "(unknown)"} conv=${conversation?.id ?? msg?.conversationId ?? "(unknown)"} sender=${msg?.senderInboxId ?? "(unknown)"} isText=${typeof ctx.isText === "function" ? String(ctx.isText()) : "unknown"} preview="${previewDebugContent(msg?.content)}"`
         );
       });
-      await startWithRetry();
-      logWithTimestamp(`${tag} message listener started`);
+      const outcome = await startWithRetry();
+      logWithTimestamp(`${tag} message listener ${outcome}`);
+      return outcome;
+    };
+    const settled = await parallelMap(targets, async ({ address, client }) => {
+      let task = this.listenTaskByClient.get(client);
+      if (!task) {
+        task = listenForClient(address, client);
+        this.listenTaskByClient.set(client, task);
+      }
+      let outcome;
+      try {
+        outcome = await task;
+      } catch (err) {
+        logWithTimestamp(`[xmtp-sdk:${address}] listener setup failed:`, err);
+        logger.error(
+          LogEvent.AGENT_START_FAILED,
+          err instanceof Error ? err : new Error(String(err)),
+          {
+            ...agentExtras({
+              walletAddress: address,
+              inboxId: client.client?.inboxId,
+              onchainosAgentId: this.getAgentByAddress(address)?.agentId
+            }),
+            phase: "listener-setup"
+          }
+        );
+        outcome = "failed";
+      }
+      if (outcome === "failed") {
+        await this.releaseClient(
+          address,
+          client,
+          this.getAgentByAddress(address)?.agentId ?? "",
+          releasePhase
+        );
+      }
+      return outcome;
+    });
+    const results = /* @__PURE__ */ new Map();
+    targets.forEach(({ address, client }, i) => {
+      const r = settled[i];
+      results.set(address, {
+        client,
+        outcome: r.status === "fulfilled" ? r.value : "failed"
+      });
     });
+    return results;
   }
   async replayOfflineMessagesForAddress(address, expectedClient, trigger = "periodic_repair", recoveryIdentity) {
     const addressReplayStartedAt = Date.now();
@@ -59705,7 +59898,7 @@ function buildSendEnvelope(params) {
 init_log();
 init_sentry_logger();
 init_log_fields();
-var import_node_crypto12 = require("node:crypto");
+var import_node_crypto11 = require("node:crypto");
 
 // ../core/src/a2a/concurrency.ts
 async function withSharedPromise(registry, key, fn) {
@@ -61107,17 +61300,17 @@ init_ai_provider();
 
 // src/agent-message-notice.ts
 init_log();
-var import_node_crypto11 = require("node:crypto");
+var import_node_crypto10 = require("node:crypto");
 init_session_store();
 init_ai_provider();
 
 // src/outbound-behavior.ts
 init_log();
-var import_node_crypto10 = require("node:crypto");
+var import_node_crypto9 = require("node:crypto");
 
 // src/openclaw-gateway.ts
 init_log();
-var import_node_crypto9 = require("node:crypto");
+var import_node_crypto8 = require("node:crypto");
 
 // ../core/src/openclaw-gateway-config.ts
 var import_node_fs17 = require("node:fs");
@@ -61610,7 +61803,7 @@ async function callDeleteSessions(params) {
   return await callOpenClawGateway({ method: "okx-a2a.delete_sessions", params });
 }
 async function callSessionsSend(params) {
-  const idempotencyKey = params.idempotencyKey ?? (0, import_node_crypto9.randomUUID)();
+  const idempotencyKey = params.idempotencyKey ?? (0, import_node_crypto8.randomUUID)();
   const sendParams = { key: params.key, message: params.message, idempotencyKey };
   try {
     return await callOpenClawGateway({ method: "sessions.send", params: sendParams });
@@ -61726,7 +61919,7 @@ async function sleep3(ms) {
 var MinimalGatewayClient = class {
   config;
   protocolVersion;
-  instanceId = (0, import_node_crypto9.randomUUID)();
+  instanceId = (0, import_node_crypto8.randomUUID)();
   pending = /* @__PURE__ */ new Map();
   ws = null;
   ready = false;
@@ -61814,7 +62007,7 @@ var MinimalGatewayClient = class {
       }));
     }
     const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
-    const id = `okx-a2a-${++this.requestSeq}-${(0, import_node_crypto9.randomUUID)()}`;
+    const id = `okx-a2a-${++this.requestSeq}-${(0, import_node_crypto8.randomUUID)()}`;
     const frame = { type: "req", id, method, params };
     return new Promise((resolve11, reject) => {
       const timer = setTimeout(() => {
@@ -61940,7 +62133,7 @@ function buildConnectParams(config, instanceId, protocolVersion) {
     client: {
       id: "gateway-client",
       displayName: "okx-a2a-node",
-      version: "0.2.18-beta-4dd056b897-261015113839",
+      version: "0.2.18",
       platform: "node",
       mode: "backend",
       instanceId
@@ -61951,7 +62144,7 @@ function buildConnectParams(config, instanceId, protocolVersion) {
     commands: [],
     permissions: {},
     locale: Intl.DateTimeFormat().resolvedOptions().locale || "en-US",
-    userAgent: `okx-a2a-node/${"0.2.18-beta-4dd056b897-261015113839"}`,
+    userAgent: `okx-a2a-node/${"0.2.18"}`,
     auth: {
       ...config.token ? { token: config.token } : {},
       ...config.password ? { password: config.password } : {}
@@ -62557,7 +62750,7 @@ function resolveSessionGateFallbackMs(env = process.env) {
   return DEFAULT_SESSION_GATE_FALLBACK_MS;
 }
 function resolveUserDeliveryId(input) {
-  return input.idempotencyKey?.trim() || (0, import_node_crypto10.randomUUID)();
+  return input.idempotencyKey?.trim() || (0, import_node_crypto9.randomUUID)();
 }
 var GATEWAY_RPC_TRANSPORT = "gateway_rpc";
 var USER_CHANNEL_TRANSPORT = "user_channel";
@@ -63471,7 +63664,7 @@ function buildSystemMessageIdempotencyKey(input) {
   return `system-message:${identity}`;
 }
 function stableHash2(value) {
-  return (0, import_node_crypto11.createHash)("sha256").update(value).digest("hex").slice(0, 24);
+  return (0, import_node_crypto10.createHash)("sha256").update(value).digest("hex").slice(0, 24);
 }
 
 // src/xmtp-send.ts
@@ -63940,7 +64133,7 @@ async function handleSqliteGroupSendCommand(params) {
     role: senderAgent?.role,
     sendDurationMs: Date.now() - sendStartMs
   });
-  const messageId = `outbound-${(0, import_node_crypto12.randomUUID)()}`;
+  const messageId = `outbound-${(0, import_node_crypto11.randomUUID)()}`;
   await notifyAgentMessageToUserAttention({
     direction: "outbound" /* OUTBOUND */,
     sender: {
@@ -64061,7 +64254,7 @@ async function handleGroupSendCommand(params) {
     sendDurationMs: Date.now() - sendStartMs
   });
   const now = Date.now();
-  const messageId = `outbound-${(0, import_node_crypto12.randomUUID)()}`;
+  const messageId = `outbound-${(0, import_node_crypto11.randomUUID)()}`;
   const stored = {
     id: messageId,
     direction: "outbound",
@@ -64280,7 +64473,7 @@ async function handleXmtpSendCommand(params) {
       sendDurationMs: Date.now() - sendStartMs
     });
     const now = Date.now();
-    const messageId = `outbound-${(0, import_node_crypto12.randomUUID)()}`;
+    const messageId = `outbound-${(0, import_node_crypto11.randomUUID)()}`;
     const stored = {
       id: messageId,
       direction: "outbound",
@@ -64327,357 +64520,6 @@ async function handleXmtpSendCommand(params) {
   }
 }
 
-// src/subscription-push.ts
-init_log();
-init_sentry_logger();
-
-// ../core/src/a2a/subscription-types.ts
-var SUBSCRIPTION_MESSAGE_TYPE = "a2a-subscription-push";
-
-// ../core/src/a2a/subscription-envelope.ts
-function isPlainObject2(value) {
-  return !!value && typeof value === "object" && !Array.isArray(value);
-}
-function buildSubscriptionEnvelope(params) {
-  const envelope = {
-    msgType: SUBSCRIPTION_MESSAGE_TYPE,
-    content: params.content,
-    senderAgentId: params.senderAgentId
-  };
-  if (params.deliveryId) {
-    envelope.deliveryId = params.deliveryId;
-  }
-  return JSON.stringify(envelope);
-}
-function isSubscriptionEnvelope(payload) {
-  return isPlainObject2(payload) && payload.msgType === SUBSCRIPTION_MESSAGE_TYPE;
-}
-function isNonEmptyString(value) {
-  return typeof value === "string" && value.length > 0;
-}
-function readSubscriptionEnvelope(payload) {
-  if (!isSubscriptionEnvelope(payload)) {
-    return { ok: false, reason: "not_subscription" };
-  }
-  const record = payload;
-  if (!isNonEmptyString(record.content)) {
-    return { ok: false, reason: "missing_content" };
-  }
-  const envelope = {
-    msgType: SUBSCRIPTION_MESSAGE_TYPE,
-    content: record.content,
-    senderAgentId: isNonEmptyString(record.senderAgentId) ? record.senderAgentId : ""
-  };
-  if (isNonEmptyString(record.deliveryId)) {
-    envelope.deliveryId = record.deliveryId;
-  }
-  return { ok: true, envelope };
-}
-
-// src/subscription-telemetry.ts
-init_log_fields();
-var SUBSCRIPTION_TRANSPORT = "xmtp";
-function definedExtras(input) {
-  return Object.entries(input).reduce((out, [key, value]) => {
-    if (typeof value === "string" && value.trim().length > 0) {
-      out[key] = value.trim();
-    }
-    return out;
-  }, {});
-}
-function countExtras(input) {
-  return Object.entries(input).reduce((out, [key, value]) => {
-    if (typeof value === "number" && Number.isFinite(value)) {
-      out[key] = String(value);
-    }
-    return out;
-  }, {});
-}
-function buildSubscriptionSendExtras(input) {
-  return {
-    stage: input.checkpoint,
-    ...logFieldExtras({
-      checkpoint: input.checkpoint,
-      outcome: input.outcome ?? null,
-      transport: SUBSCRIPTION_TRANSPORT,
-      eventFamily: "outbound",
-      deliveryId: input.deliveryId ?? null
-    }),
-    ...definedExtras({
-      aspAgentId: input.aspAgentId,
-      conversationId: input.conversationId,
-      reason: input.reason
-    }),
-    ...countExtras({
-      targetCount: input.targetCount,
-      sentCount: input.sentCount,
-      failedCount: input.failedCount,
-      notGroupCount: input.notGroupCount
-    })
-  };
-}
-function buildSubscriptionInboundExtras(input) {
-  return {
-    stage: input.checkpoint,
-    ...logFieldExtras({
-      checkpoint: input.checkpoint,
-      outcome: input.outcome ?? null,
-      transport: SUBSCRIPTION_TRANSPORT,
-      eventFamily: "inbound",
-      deliveryId: input.deliveryId ?? null
-    }),
-    ...definedExtras({
-      userAgentId: input.userAgentId,
-      conversationId: input.conversationId,
-      messageId: input.messageId,
-      senderInboxId: input.senderInboxId,
-      reason: input.reason,
-      errorCode: input.errorCode
-    }),
-    ...countExtras({
-      returnedCount: input.returnedCount,
-      invalidCount: input.invalidCount,
-      ownedCount: input.ownedCount,
-      ignoredCount: input.ignoredCount
-    })
-  };
-}
-function buildSubscriptionJobExtras(input) {
-  return {
-    stage: input.checkpoint,
-    ...logFieldExtras({
-      checkpoint: input.checkpoint,
-      outcome: input.outcome,
-      transport: SUBSCRIPTION_TRANSPORT,
-      eventFamily: "dispatch",
-      deliveryId: input.deliveryId ?? null
-    }),
-    ...definedExtras({
-      jobId: input.jobId,
-      userAgentId: input.userAgentId,
-      aspAgentId: input.aspAgentId,
-      conversationId: input.conversationId,
-      reason: input.reason
-    }),
-    ...countExtras({
-      total: input.total,
-      started: input.started,
-      failed: input.failed,
-      skippedDuplicate: input.skippedDuplicate
-    })
-  };
-}
-
-// src/subscription-push.ts
-var DEFAULT_CONCURRENCY = 20;
-var conversationSyncPromises2 = /* @__PURE__ */ new WeakMap();
-function describeError(err) {
-  if (err instanceof Error) {
-    return err.message;
-  }
-  if (typeof err === "string" && err.length > 0) {
-    return err;
-  }
-  return "unknown error";
-}
-async function requireXmtpClient2(service, address) {
-  const existing = service.getClientByAddress(address);
-  if (existing) {
-    return existing;
-  }
-  await service.refreshAgents();
-  const refreshed = service.getClientByAddress(address);
-  if (!refreshed) {
-    throw new Error(`no XMTP client found for ${address}`);
-  }
-  return refreshed;
-}
-function resolveLocalAddress(service, myAgentId) {
-  const address = service.getAddressByAgentId(myAgentId);
-  if (!address) {
-    throw new Error(`No local communication address found for myAgentId=${myAgentId}`);
-  }
-  return address;
-}
-async function syncConversationsOnLocalMiss2(agent) {
-  const conversations = agent.client.conversations;
-  const existing = conversationSyncPromises2.get(conversations);
-  if (existing) {
-    return existing;
-  }
-  const pending = conversations.sync();
-  conversationSyncPromises2.set(conversations, pending);
-  try {
-    await pending;
-  } finally {
-    if (conversationSyncPromises2.get(conversations) === pending) {
-      conversationSyncPromises2.delete(conversations);
-    }
-  }
-}
-async function findGroupConversation2(agent, conversationId) {
-  let conversation = await agent.client.conversations.getConversationById(conversationId);
-  if (!(conversation instanceof Group)) {
-    await syncConversationsOnLocalMiss2(agent);
-    conversation = await agent.client.conversations.getConversationById(conversationId);
-  }
-  return conversation instanceof Group ? conversation : null;
-}
-async function sendSubscriptionToGroup(params) {
-  const { agent, conversationId, command, myXmtpAddress, senderRole } = params;
-  let conversation;
-  try {
-    conversation = await findGroupConversation2(agent, conversationId);
-  } catch (err) {
-    return { conversationId, status: "not_group", error: describeError(err) };
-  }
-  if (!conversation) {
-    return {
-      conversationId,
-      status: "not_group",
-      error: `conversationId=${conversationId} is not a Group (DM or unknown conversation)`
-    };
-  }
-  const envelope = buildSubscriptionEnvelope({
-    content: command.content,
-    senderAgentId: command.myAgentId,
-    deliveryId: command.deliveryId
-  });
-  const sendStartMs = Date.now();
-  try {
-    const xmtpMessageId = await conversation.sendText(envelope);
-    logXmtpMessageSent({
-      xmtpMessageId,
-      conversationId,
-      // V2 has no job dimension (FR-1) — deliveryId (or a fixed marker)
-      // stands in for the telemetry taxonomy's jobId slot.
-      jobId: command.deliveryId ?? "subscription-push",
-      chatType: "group",
-      component: "node_xmtp_subscription_push",
-      myXmtpAddress,
-      senderAgentId: command.myAgentId,
-      role: senderRole,
-      sendDurationMs: Date.now() - sendStartMs
-    });
-    const messageId = typeof xmtpMessageId === "string" && xmtpMessageId.length > 0 ? xmtpMessageId : String(xmtpMessageId);
-    logWithTimestamp(
-      `[okx-agent-task] subscription-push sent conversationId=${conversationId} deliveryId=${command.deliveryId ?? "(none)"}`
-    );
-    return { conversationId, status: "sent", messageId };
-  } catch (err) {
-    logWithTimestamp(
-      `[okx-agent-task] subscription-push failed conversationId=${conversationId} deliveryId=${command.deliveryId ?? "(none)"}`
-    );
-    return { conversationId, status: "failed", error: describeError(err) };
-  }
-}
-function summarizeSubscriptionPush(results) {
-  let sentCount = 0;
-  let failedCount = 0;
-  for (const result of results) {
-    if (result.status === "sent") {
-      sentCount++;
-    } else {
-      failedCount++;
-    }
-  }
-  return { conversationCount: results.length, sentCount, failedCount };
-}
-async function handleSubscriptionPushCommand(params) {
-  const { command, service } = params;
-  const aspAgentId = command.myAgentId;
-  const deliveryId = command.deliveryId;
-  const conversationIds = command.conversationIds ?? [];
-  logger.info(
-    LogEvent.SUBSCRIPTION_PUSH_STARTED,
-    buildSubscriptionSendExtras({
-      checkpoint: "outbound/subscription_push_started",
-      aspAgentId,
-      deliveryId,
-      targetCount: conversationIds.length
-    })
-  );
-  if (conversationIds.length === 0) {
-    logger.info(
-      LogEvent.SUBSCRIPTION_PUSH_EMPTY_TARGETS,
-      buildSubscriptionSendExtras({
-        checkpoint: "outbound/subscription_push_empty_targets",
-        outcome: "ignored",
-        aspAgentId,
-        deliveryId,
-        targetCount: 0,
-        reason: "empty_targets"
-      })
-    );
-    return { conversationCount: 0, sentCount: 0, failedCount: 0, results: [] };
-  }
-  const myXmtpAddress = resolveLocalAddress(service, command.myAgentId);
-  const agent = await requireXmtpClient2(service, myXmtpAddress);
-  const senderRole = service.getAgentByAddress?.(myXmtpAddress)?.role;
-  logger.info(
-    LogEvent.SUBSCRIPTION_PUSH_TARGETS_RESOLVED,
-    buildSubscriptionSendExtras({
-      checkpoint: "outbound/subscription_push_targets_resolved",
-      aspAgentId,
-      deliveryId,
-      targetCount: conversationIds.length
-    })
-  );
-  const settled = await parallelMap(
-    conversationIds,
-    (conversationId) => sendSubscriptionToGroup({
-      agent,
-      conversationId,
-      command,
-      myXmtpAddress,
-      senderRole
-    }),
-    DEFAULT_CONCURRENCY
-  );
-  const results = settled.map((outcome, index2) => {
-    if (outcome.status === "fulfilled") {
-      return outcome.value;
-    }
-    return {
-      conversationId: conversationIds[index2],
-      status: "failed",
-      error: describeError(outcome.reason)
-    };
-  });
-  for (const result of results) {
-    if (result.status === "sent") {
-      continue;
-    }
-    logger.error(
-      LogEvent.SUBSCRIPTION_PUSH_TARGET_FAILED,
-      void 0,
-      buildSubscriptionSendExtras({
-        checkpoint: "outbound/subscription_push_target_failed",
-        outcome: "failed",
-        aspAgentId,
-        deliveryId,
-        conversationId: result.conversationId,
-        reason: result.status
-      })
-    );
-  }
-  const summary = summarizeSubscriptionPush(results);
-  const summaryOutcome = summary.failedCount === 0 ? "success" : summary.sentCount > 0 ? "partial" : "failed";
-  logger.info(
-    LogEvent.SUBSCRIPTION_PUSH_SUMMARY,
-    buildSubscriptionSendExtras({
-      checkpoint: "outbound/subscription_push_summary",
-      outcome: summaryOutcome,
-      aspAgentId,
-      deliveryId,
-      targetCount: summary.conversationCount,
-      sentCount: summary.sentCount,
-      failedCount: summary.failedCount
-    })
-  );
-  return { ...summary, results };
-}
-
 // src/command-processor.ts
 init_session_store();
 init_ai_provider();
@@ -65358,9 +65200,6 @@ function commandSentryExtra(command, extra = {}) {
     base.myAgentId = command.myAgentId ?? "";
     base.toAgentId = command.toAgentId ?? "";
     base.toXmtpAddress = command.toXmtpAddress ?? "";
-  } else if (command.type === "xmtp-subscription-push") {
-    base.myAgentId = command.myAgentId;
-    base.conversationCount = command.conversationIds.length;
   } else if (command.type === "xmtp-deny-pending-conversation") {
     base.groupId = command.groupId;
     base.jobId = command.jobId ?? "";
@@ -65716,10 +65555,6 @@ async function handleDaemonCommand(command, params) {
     });
     return { ok: true, messageId: result.messageId };
   }
-  if (command.type === "xmtp-subscription-push") {
-    const result = await handleSubscriptionPushCommand({ command, service: params.service });
-    return { ok: true, payload: result };
-  }
   if (command.type === "xmtp-get-pending-list") {
     return { ok: true, payload: await listPendingTaskRequests(params) };
   }
@@ -65802,12 +65637,12 @@ async function listPendingTaskRequests(params) {
 }
 async function denyPendingConversationsByJobId(jobId, params, content) {
   const pending = await listPendingTaskRequests(params);
-  const matched = pending.filter((item) => isPlainObject3(item) && readString2(item.jobId) === jobId);
+  const matched = pending.filter((item) => isPlainObject2(item) && readString2(item.jobId) === jobId);
   const clientAddresses = [...params.service.getClients().keys()];
   const targetsByKey = collectDenyTargetsFromPending(matched, clientAddresses);
   const groupIds = /* @__PURE__ */ new Set();
   for (const item of matched) {
-    if (!isPlainObject3(item)) {
+    if (!isPlainObject2(item)) {
       continue;
     }
     const groupId = readString2(item.groupId);
@@ -65834,7 +65669,7 @@ async function denyPendingConversationsByJobId(jobId, params, content) {
 function collectDenyTargetsFromPending(pending, fallbackAddresses) {
   const targetsByKey = /* @__PURE__ */ new Map();
   for (const item of pending) {
-    if (!isPlainObject3(item)) {
+    if (!isPlainObject2(item)) {
       continue;
     }
     const groupId = readString2(item.groupId);
@@ -65859,7 +65694,7 @@ ${groupId}`, {
 async function resolvePendingTargetsByGroupId(groupId, addresses, params) {
   const addressSet = addresses ? new Set(addresses) : null;
   const pending = (await listPendingTaskRequests(params)).filter((item) => {
-    if (!isPlainObject3(item) || readString2(item.groupId) !== groupId) {
+    if (!isPlainObject2(item) || readString2(item.groupId) !== groupId) {
       return false;
     }
     const address = readString2(item.myXmtpAddress);
@@ -65979,7 +65814,7 @@ function filterKnownPendingGroups(items, sessionStore) {
     return items;
   }
   return items.filter((item) => {
-    if (!isPlainObject3(item)) {
+    if (!isPlainObject2(item)) {
       return true;
     }
     const jobId = readString2(item.jobId);
@@ -65990,7 +65825,7 @@ function filterKnownPendingGroups(items, sessionStore) {
     return sessionStore.querySessions({ jobId, toAgentId, limit: 1 }).length === 0;
   });
 }
-function isPlainObject3(value) {
+function isPlainObject2(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function readString2(value) {
@@ -66124,10 +65959,6 @@ function formatCommandCompleted(command, result) {
   if (command.type === "xmtp-send") {
     return `[okx-agent-task] xmtp-send command completed id=${command.id} job=${command.jobId} messageId=${result.messageId}`;
   }
-  if (command.type === "xmtp-subscription-push") {
-    const payload = isPlainObject3(result.payload) ? result.payload : {};
-    return `[okx-agent-task] xmtp-subscription-push command completed id=${command.id} deliveryId=${command.deliveryId ?? "(none)"} conversationCount=${payload.conversationCount ?? 0} sentCount=${payload.sentCount ?? 0} failedCount=${payload.failedCount ?? 0}`;
-  }
   if (command.type === "xmtp-get-pending-list") {
     return `[okx-agent-task] xmtp-get-pending-list command completed id=${command.id}`;
   }
@@ -66148,8 +65979,8 @@ function formatCommandCompleted(command, result) {
   return `[okx-agent-task] xmtp-refresh-agents command completed id=${command.id}`;
 }
 function formatXmtpDebugCompleted(command, payload) {
-  const record = isPlainObject3(payload) ? payload : {};
-  const summary = isPlainObject3(record.summary) ? record.summary : {};
+  const record = isPlainObject2(payload) ? payload : {};
+  const summary = isPlainObject2(record.summary) ? record.summary : {};
   const count = command.action === "group-list" ? record.groupCount ?? 0 : command.action === "group-inspect" ? record.conversationFound ? 1 : 0 : summary.matchedCount ?? 0;
   return `[okx-agent-task] xmtp-debug command completed id=${command.id} action=${command.action} rows=${String(count)}`;
 }
@@ -66304,393 +66135,12 @@ function trimForUser2(value) {
 
 // src/message-handler.ts
 init_log();
-var import_node_crypto13 = require("node:crypto");
+var import_node_crypto12 = require("node:crypto");
 init_sentry_logger();
 init_log_fields();
 init_paths();
 init_session_store();
 init_ai_provider();
-
-// src/subscription-inbound.ts
-init_log();
-function decideSubscriptionGate(input) {
-  if (!isSubscriptionEnvelope(input.payload)) {
-    return { kind: "not_subscription" };
-  }
-  if (input.chatType === "dm") {
-    return { kind: "drop", reason: "dm_subscription" };
-  }
-  if (input.chatType === "unknown") {
-    return { kind: "drop", reason: "unknown_conversation_subscription" };
-  }
-  const read = readSubscriptionEnvelope(input.payload);
-  if (!read.ok) {
-    return { kind: "drop", reason: "invalid_envelope", detail: read.reason };
-  }
-  if (!input.senderInboxId) {
-    return { kind: "drop", reason: "missing_sender_inbox_id" };
-  }
-  return { kind: "v2", envelope: read.envelope };
-}
-function partitionSubscriptionJobsByOwner(input) {
-  const owned = [];
-  for (const job of input.jobs) {
-    if (job.userAgentId === input.localAgentId) {
-      owned.push(job);
-    }
-  }
-  return {
-    owned,
-    returnedCount: input.jobs.length,
-    ownedCount: owned.length,
-    ignoredCount: input.jobs.length - owned.length
-  };
-}
-function normalizeSubscriptionJobs(input) {
-  const seen = /* @__PURE__ */ new Set();
-  const normalized = [];
-  for (const job of input.jobs) {
-    const dedupKey = `${job.jobId}|${job.userAgentId}|${job.aspAgentId}`;
-    if (seen.has(dedupKey)) {
-      continue;
-    }
-    seen.add(dedupKey);
-    normalized.push({
-      jobId: job.jobId,
-      userAgentId: job.userAgentId,
-      aspAgentId: job.aspAgentId,
-      msgType: SUBSCRIPTION_MESSAGE_TYPE,
-      content: input.envelope.content,
-      ...input.envelope.deliveryId ? { deliveryId: input.envelope.deliveryId } : {},
-      conversationId: input.conversationId,
-      senderInboxId: input.senderInboxId
-    });
-  }
-  return normalized;
-}
-function subscriptionIdempotencyKey(input) {
-  const messageDimension = input.deliveryId || input.messageId;
-  return `${input.myXmtpAddress}|${messageDimension}|${input.jobId}`;
-}
-var SUBSCRIPTION_TARGETS_MAX = 2e3;
-var subscriptionTargets = /* @__PURE__ */ new Map();
-function tryMarkSubscriptionTarget(key) {
-  if (subscriptionTargets.has(key)) {
-    return false;
-  }
-  subscriptionTargets.set(key, Date.now());
-  while (subscriptionTargets.size > SUBSCRIPTION_TARGETS_MAX) {
-    const oldest = subscriptionTargets.keys().next().value;
-    if (oldest === void 0) {
-      break;
-    }
-    subscriptionTargets.delete(oldest);
-  }
-  return true;
-}
-function resetSubscriptionTargetsForTests() {
-  subscriptionTargets.clear();
-}
-var SUBSCRIPTION_FANOUT_MAX = 250;
-function redactSenderInboxId(senderInboxId, left = 8, right = 6) {
-  if (!senderInboxId) {
-    return "(none)";
-  }
-  if (senderInboxId.length <= left + right + 1) {
-    return senderInboxId;
-  }
-  return `${senderInboxId.slice(0, left)}\u2026${senderInboxId.slice(-right)}`;
-}
-async function fanOutSubscriptionJobs(input) {
-  const { jobs, myXmtpAddress, messageId, dispatch, concurrency } = input;
-  const total = jobs.length;
-  const capacityAnomaly = total > SUBSCRIPTION_FANOUT_MAX;
-  if (capacityAnomaly) {
-    logWithTimestamp(
-      `[okx-agent-task:${myXmtpAddress}] subscription fan-out capacity anomaly: jobs=${total} max=${SUBSCRIPTION_FANOUT_MAX} message=${messageId}`
-    );
-  }
-  const settled = await parallelMap(
-    jobs,
-    async (job) => {
-      const idempotencyKey = subscriptionIdempotencyKey({
-        myXmtpAddress,
-        deliveryId: job.deliveryId,
-        messageId,
-        jobId: job.jobId
-      });
-      if (subscriptionTargets.has(idempotencyKey)) {
-        return { key: idempotencyKey, outcome: "duplicate" };
-      }
-      const dispatchOutcome = await dispatch(job, idempotencyKey);
-      const isDurableDuplicate = !!dispatchOutcome && dispatchOutcome.created === false;
-      return { key: idempotencyKey, outcome: isDurableDuplicate ? "duplicate" : "started" };
-    },
-    concurrency ?? 20
-  );
-  let started = 0;
-  let failed = 0;
-  let skippedDuplicate = 0;
-  const results = [];
-  settled.forEach((result, idx) => {
-    const job = jobs[idx];
-    if (result.status === "rejected") {
-      failed += 1;
-      results.push({ jobId: job?.jobId ?? "(unknown)", outcome: "failed", error: result.reason });
-      logWithTimestamp(
-        `[okx-agent-task:${myXmtpAddress}] subscription dispatch failed message=${messageId} job=${job?.jobId ?? "(unknown)"} sender=${redactSenderInboxId(job?.senderInboxId)}:`,
-        result.reason
-      );
-      return;
-    }
-    tryMarkSubscriptionTarget(result.value.key);
-    if (result.value.outcome === "duplicate") {
-      skippedDuplicate += 1;
-      results.push({ jobId: job?.jobId ?? "(unknown)", outcome: "duplicate" });
-    } else {
-      started += 1;
-      results.push({ jobId: job?.jobId ?? "(unknown)", outcome: "started" });
-    }
-  });
-  return { total, started, failed, skippedDuplicate, capacityAnomaly, results };
-}
-
-// ../core/src/xmtp-sdk/onchainos/list-jobs-by-verified-sender.ts
-init_log();
-init_sentry_logger();
-function isPlainObject4(value) {
-  return !!value && typeof value === "object" && !Array.isArray(value);
-}
-function isNonEmptyString2(value) {
-  return typeof value === "string" && value.length > 0;
-}
-function redactLogValue(value, left = 6, right = 4) {
-  if (!value) {
-    return "(none)";
-  }
-  if (value.length <= left + right + 1) {
-    return "(redacted)";
-  }
-  return `${value.slice(0, left)}\u2026${value.slice(-right)}`;
-}
-function guardSessionExpired3(stdout, command) {
-  if (isSessionExpired(stdout)) {
-    reportSessionExpired(command);
-  }
-}
-function guardCatchSessionExpired3(err, command) {
-  const stdout = String(err?.stdout ?? "");
-  if (stdout && isSessionExpired(stdout)) {
-    reportSessionExpired(command);
-  }
-}
-function buildListJobsByVerifiedSenderArgs(params) {
-  return [
-    "agent",
-    "list-jobs-by-verified-sender",
-    "--group-id",
-    params.groupId,
-    "--sender-inbox-id",
-    params.senderInboxId,
-    "--agentic-id",
-    params.agenticId
-  ];
-}
-var KNOWN_ERROR_CODES2 = {
-  "130100079": "sender_not_authorized",
-  "130100073": "sender_not_eligible"
-};
-function extractErrorText(errorLike) {
-  if (typeof errorLike === "string") {
-    return errorLike;
-  }
-  if (typeof errorLike === "number") {
-    return String(errorLike);
-  }
-  if (errorLike && typeof errorLike === "object") {
-    const anyErr = errorLike;
-    return [anyErr.code, anyErr.message, anyErr.stdout, anyErr.stderr].filter((value) => typeof value === "string" || typeof value === "number").map(String).join(" ");
-  }
-  return errorLike == null ? "" : String(errorLike);
-}
-function classifyListJobsError(errorLike) {
-  const text = extractErrorText(errorLike);
-  for (const [code, reason] of Object.entries(KNOWN_ERROR_CODES2)) {
-    if (text.includes(code)) {
-      return { reason, errorCode: code };
-    }
-  }
-  if (/\b401\b/.test(text)) {
-    return { reason: "auth_error", errorCode: "401" };
-  }
-  if (/\b403\b/.test(text)) {
-    return { reason: "auth_error", errorCode: "403" };
-  }
-  return { reason: "invalid_response" };
-}
-function normalizeListJobsResponse(data) {
-  const rawJobs = isPlainObject4(data) && Array.isArray(data.jobs) ? data.jobs : [];
-  const seen = /* @__PURE__ */ new Set();
-  const jobs = [];
-  let invalidCount = 0;
-  for (const item of rawJobs) {
-    if (!isPlainObject4(item) || !isNonEmptyString2(item.jobId) || !isNonEmptyString2(item.userAgentId) || !isNonEmptyString2(item.aspAgentId)) {
-      invalidCount += 1;
-      continue;
-    }
-    const key = `${item.jobId}|${item.userAgentId}|${item.aspAgentId}`;
-    if (seen.has(key)) {
-      continue;
-    }
-    seen.add(key);
-    jobs.push({ jobId: item.jobId, userAgentId: item.userAgentId, aspAgentId: item.aspAgentId });
-  }
-  return { jobs, invalidCount };
-}
-async function listJobsByVerifiedSender(params, execFn = exec) {
-  logWithTimestamp(
-    `[onchainos] listing jobs by verified sender: group=${params.groupId} sender=${redactLogValue(params.senderInboxId)} agentic=${params.agenticId}`
-  );
-  let stdout;
-  let stderr;
-  try {
-    ({ stdout, stderr } = await execFn(buildListJobsByVerifiedSenderArgs(params)));
-  } catch (err) {
-    guardCatchSessionExpired3(err, "list-jobs-by-verified-sender");
-    const classified = classifyListJobsError(err);
-    const reason = classified.reason === "invalid_response" ? "network_error" : classified.reason;
-    warnWithTimestamp(
-      `[onchainos] list-jobs-by-verified-sender exec failed (group=${params.groupId} sender=${redactLogValue(params.senderInboxId)}); fail-closed reason=${reason}`
-    );
-    return { status: "fail_closed", jobs: [], invalidCount: 0, reason, errorCode: classified.errorCode };
-  }
-  if (stderr) {
-    logWithTimestamp(`[onchainos] stderr (list-jobs-by-verified-sender): ${stderr}`);
-  }
-  let res;
-  try {
-    res = parseCliJson(stdout, "list-jobs-by-verified-sender", {
-      groupId: params.groupId,
-      agenticId: params.agenticId
-    });
-  } catch {
-    return { status: "fail_closed", jobs: [], invalidCount: 0, reason: "invalid_response" };
-  }
-  if (!res.ok) {
-    guardSessionExpired3(stdout, "list-jobs-by-verified-sender");
-    const classified = classifyListJobsError(res.error);
-    warnWithTimestamp(
-      `[onchainos] list-jobs-by-verified-sender ok=false (group=${params.groupId}); fail-closed reason=${classified.reason}`
-    );
-    logger.error(
-      LogEvent.ONCHAINOS_CLI_ERROR,
-      new Error("list-jobs-by-verified-sender ok=false"),
-      cliOkFalseExtras(stdout, "list-jobs-by-verified-sender", {
-        groupId: params.groupId,
-        agenticId: params.agenticId,
-        reason: classified.reason
-      })
-    );
-    return { status: "fail_closed", jobs: [], invalidCount: 0, reason: classified.reason, errorCode: classified.errorCode };
-  }
-  const { jobs, invalidCount } = normalizeListJobsResponse(res.data);
-  if (jobs.length === 0) {
-    logWithTimestamp(
-      `[onchainos] list-jobs-by-verified-sender: empty (group=${params.groupId} invalidCount=${invalidCount})`
-    );
-    return { status: "empty", jobs, invalidCount };
-  }
-  logWithTimestamp(
-    `[onchainos] list-jobs-by-verified-sender: ok (group=${params.groupId} jobs=${jobs.length} invalidCount=${invalidCount})`
-  );
-  return { status: "ok", jobs, invalidCount };
-}
-var LIST_JOBS_BY_VERIFIED_SENDER_HELP_TOKEN = "list-jobs-by-verified-sender";
-function listJobsByVerifiedSenderHelpAdvertisesCommand(helpText) {
-  if (typeof helpText !== "string" || helpText.length === 0) {
-    return false;
-  }
-  const lower = helpText.toLowerCase();
-  if (/unknown command|unrecognized|not a valid command|no such (sub)?command|command not found/.test(lower)) {
-    return false;
-  }
-  return lower.includes(LIST_JOBS_BY_VERIFIED_SENDER_HELP_TOKEN);
-}
-var CAPABILITY_UPGRADE_PAIR_KEY = "onchainos:list-jobs-by-verified-sender";
-var CAPABILITY_UPGRADE_REASON = "OnchainOS does not support `agent list-jobs-by-verified-sender`; the V2 subscription shared-group inbound path is fail-closed until OnchainOS is upgraded. Upgrade the OnchainOS CLI, then re-run.";
-var capabilityProbe2 = null;
-var capabilityRecommendedPairs = /* @__PURE__ */ new Set();
-function resetListJobsByVerifiedSenderCapabilityForTests() {
-  capabilityProbe2 = null;
-  capabilityRecommendedPairs.clear();
-}
-function maybeRecommendListJobsUpgrade(capability) {
-  if (capability.supported || capabilityRecommendedPairs.has(CAPABILITY_UPGRADE_PAIR_KEY)) {
-    return;
-  }
-  warnWithTimestamp(
-    `[onchainos] list-jobs-by-verified-sender unsupported (reason=${capability.reason}); ${CAPABILITY_UPGRADE_REASON}`
-  );
-  const hook = XmtpService.getInstance().tools?.notifyUpgradeRecommendation;
-  if (!hook) {
-    return;
-  }
-  capabilityRecommendedPairs.add(CAPABILITY_UPGRADE_PAIR_KEY);
-  try {
-    void Promise.resolve(
-      hook({
-        component: "onchainos",
-        capability: LIST_JOBS_BY_VERIFIED_SENDER_HELP_TOKEN,
-        reason: CAPABILITY_UPGRADE_REASON
-      })
-    ).catch((err) => {
-      warnWithTimestamp("[onchainos] list-jobs-by-verified-sender upgrade notice async delivery failed:", err);
-    });
-  } catch (err) {
-    warnWithTimestamp("[onchainos] list-jobs-by-verified-sender upgrade notice threw:", err);
-  }
-}
-function detectListJobsByVerifiedSenderSupport(execFn = exec) {
-  if (!capabilityProbe2) {
-    capabilityProbe2 = (async () => {
-      try {
-        const { stdout, stderr } = await execFn([
-          "agent",
-          "list-jobs-by-verified-sender",
-          "--help"
-        ]);
-        const supported = listJobsByVerifiedSenderHelpAdvertisesCommand(`${stdout}
-${stderr}`);
-        logWithTimestamp(
-          `[onchainos] list-jobs-by-verified-sender capability: ${supported ? "supported" : "unsupported_cli_capability"}`
-        );
-        return supported ? { supported: true } : { supported: false, reason: "unsupported_cli_capability" };
-      } catch (err) {
-        logWithTimestamp(
-          "[onchainos] list-jobs-by-verified-sender --help probe failed; treating as onchainos_upgrade_required:",
-          err
-        );
-        return { supported: false, reason: "onchainos_upgrade_required" };
-      }
-    })().then((capability) => {
-      maybeRecommendListJobsUpgrade(capability);
-      return capability;
-    });
-  }
-  return capabilityProbe2;
-}
-async function listJobsByVerifiedSenderWithCapability(params, execFn = exec) {
-  const capability = await detectListJobsByVerifiedSenderSupport(execFn);
-  if (!capability.supported) {
-    warnWithTimestamp(
-      `[onchainos] list-jobs-by-verified-sender skipped: CLI capability unavailable (reason=${capability.reason}) group=${params.groupId} sender=${redactLogValue(params.senderInboxId)}`
-    );
-    return { status: "fail_closed", jobs: [], invalidCount: 0, reason: capability.reason };
-  }
-  return listJobsByVerifiedSender(params, execFn);
-}
-
-// src/message-handler.ts
 var PROCESSED_IDS_MAX = 1e3;
 var processedMessageIds = /* @__PURE__ */ new Map();
 function tryMarkProcessed(messageId) {
@@ -66707,7 +66157,7 @@ function tryMarkProcessed(messageId) {
   }
   return true;
 }
-function isPlainObject5(value) {
+function isPlainObject3(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function safeStringify(value) {
@@ -66768,9 +66218,9 @@ function readNumber(value) {
 }
 function resolveSessionAgentId(params) {
   const { chatType, payload, myXmtpAddress } = params;
-  const payloadObject = isPlainObject5(payload) ? payload : null;
-  const sender = isPlainObject5(payloadObject?.sender) ? payloadObject.sender : null;
-  const message = isPlainObject5(payloadObject?.message) ? payloadObject.message : null;
+  const payloadObject = isPlainObject3(payload) ? payload : null;
+  const sender = isPlainObject3(payloadObject?.sender) ? payloadObject.sender : null;
+  const message = isPlainObject3(payloadObject?.message) ? payloadObject.message : null;
   const localAgentId = XmtpService.getInstance().getAgentByAddress(myXmtpAddress)?.agentId ?? null;
   if (chatType === "group") {
     return readString3(sender?.agentId) ?? readString3(payloadObject?.receiverAgentId) ?? localAgentId;
@@ -66781,7 +66231,7 @@ function resolveSessionAgentId(params) {
   return localAgentId;
 }
 function routeMessage(chatType, parsed, payload) {
-  if (!parsed || !isPlainObject5(payload)) {
+  if (!parsed || !isPlainObject3(payload)) {
     return {
       jobId: BACKUP_JOB_ID,
       route: "backup",
@@ -66793,7 +66243,7 @@ function routeMessage(chatType, parsed, payload) {
     return jobId ? { jobId, route: "job", routeReason: "group-job-id" } : { jobId: BACKUP_JOB_ID, route: "backup", routeReason: "group-missing-job-id" };
   }
   if (chatType === "dm") {
-    const message = isPlainObject5(payload.message) ? payload.message : null;
+    const message = isPlainObject3(payload.message) ? payload.message : null;
     const nestedJobId = readString3(message?.jobId);
     const directJobId = readString3(payload.jobId);
     const jobId = nestedJobId ?? directJobId;
@@ -66806,10 +66256,10 @@ function routeMessage(chatType, parsed, payload) {
   return { jobId: BACKUP_JOB_ID, route: "backup", routeReason: "unknown-conversation" };
 }
 function extractDirectToUserNotification(payload) {
-  if (!isPlainObject5(payload)) {
+  if (!isPlainObject3(payload)) {
     return { kind: "none" };
   }
-  const message = isPlainObject5(payload.message) ? payload.message : null;
+  const message = isPlainObject3(payload.message) ? payload.message : null;
   if (message?.isDirectToUser !== true) {
     return { kind: "none" };
   }
@@ -66833,10 +66283,10 @@ function extractDirectToUserNotification(payload) {
   };
 }
 function extractSystemNotification(payload) {
-  if (!isPlainObject5(payload)) {
+  if (!isPlainObject3(payload)) {
     return null;
   }
-  const message = isPlainObject5(payload.message) ? payload.message : null;
+  const message = isPlainObject3(payload.message) ? payload.message : null;
   const isDirectCommunication = message?.isDirectCommunication === true;
   if (message?.source !== "system" && !isDirectCommunication) {
     return null;
@@ -67071,7 +66521,7 @@ function inboundStageExtras(stage, outcome) {
     })
   };
 }
-function definedExtras2(input) {
+function definedExtras(input) {
   return Object.entries(input).reduce((out, [key, value]) => {
     const text = readString3(value);
     if (text) {
@@ -67103,7 +66553,7 @@ function buildInboundTerminalExtras(input) {
       originPlatform: classifyOriginPlatform({ env: process.env }),
       deliveryId: resolveDeliveryId({ messageId, jobId, sessionKey })
     }),
-    ...definedExtras2({
+    ...definedExtras({
       messageId,
       conversationId,
       chatType,
@@ -67137,7 +66587,7 @@ function maybeNotifyInboundAgentMessage(params) {
     return;
   }
   const content = payloadObject.content;
-  const sender = isPlainObject5(payloadObject.sender) ? payloadObject.sender : null;
+  const sender = isPlainObject3(payloadObject.sender) ? payloadObject.sender : null;
   const localAgent = XmtpService.getInstance().getAgentByAddress(params.deps.myXmtpAddress);
   void notifyAgentMessageToUserAttention({
     direction: "inbound" /* INBOUND */,
@@ -67168,11 +66618,11 @@ function stringifySystemPayload(payload) {
   }
 }
 function summarizePayloadForLog(payload) {
-  if (!isPlainObject5(payload)) {
+  if (!isPlainObject3(payload)) {
     return "payload=non-object";
   }
-  const message = isPlainObject5(payload.message) ? payload.message : null;
-  const sender = isPlainObject5(payload.sender) ? payload.sender : null;
+  const message = isPlainObject3(payload.message) ? payload.message : null;
+  const sender = isPlainObject3(payload.sender) ? payload.sender : null;
   const jobId = readString3(payload.jobId) ?? readString3(message?.jobId);
   const parts = [
     readString3(payload.msgType) ? `type=${readString3(payload.msgType)}` : null,
@@ -67441,7 +66891,7 @@ async function verifyInboundA2AGroupMessage(params) {
       messageId,
       groupId,
       jobId,
-      agentId: readString3(isPlainObject5(payload.sender) ? payload.sender.agentId : null),
+      agentId: readString3(isPlainObject3(payload.sender) ? payload.sender.agentId : null),
       localAgentId: myAgent?.agentId ?? null,
       senderAddress,
       senderInboxId,
@@ -67467,7 +66917,7 @@ async function verifyInboundA2AGroupMessage(params) {
     });
     return false;
   }
-  const sender = isPlainObject5(payload.sender) ? payload.sender : null;
+  const sender = isPlainObject3(payload.sender) ? payload.sender : null;
   const senderAgentId = readString3(sender?.agentId);
   const senderRole = readNumber(sender?.role);
   if (!senderAgentId || !myAgent) {
@@ -67636,302 +67086,9 @@ ${failureMessage}`,
   }
   return true;
 }
-async function processSubscriptionInbound(ctx, deps, input) {
-  const { decision, conversationId, messageId } = input;
-  const senderInboxId = ctx.message.senderInboxId ?? "";
-  if (decision.kind === "drop") {
-    logger.info(
-      LogEvent.SUBSCRIPTION_INBOUND_GATE_DROPPED,
-      buildSubscriptionInboundExtras({
-        checkpoint: "inbound/subscription_gate_dropped",
-        outcome: "dropped",
-        conversationId,
-        messageId,
-        senderInboxId: shortenLogValue(senderInboxId),
-        reason: decision.reason
-      })
-    );
-    logWithTimestamp(
-      `[okx-agent-task:${deps.myXmtpAddress}] subscription message dropped reason=${decision.reason}${decision.detail ? ` detail=${decision.detail}` : ""} conv=${conversationId} message=${shortenLogValue(messageId)} sender=${shortenLogValue(senderInboxId)}`
-    );
-    return true;
-  }
-  if (decision.kind === "not_subscription") {
-    return true;
-  }
-  const { envelope } = decision;
-  const agenticId = XmtpService.getInstance().getAgentByAddress(deps.myXmtpAddress)?.agentId;
-  if (!agenticId) {
-    logWithTimestamp(
-      `[okx-agent-task:${deps.myXmtpAddress}] subscription fail-closed: no local agenticId for ${deps.myXmtpAddress}, conv=${conversationId} message=${shortenLogValue(messageId)}`
-    );
-    logger.error(
-      LogEvent.SUBSCRIPTION_INBOUND_AGENTIC_ID_MISSING,
-      new Error("Subscription inbound: local agenticId not resolved"),
-      buildSubscriptionInboundExtras({
-        checkpoint: "inbound/subscription_agentic_id",
-        outcome: "blocked",
-        conversationId,
-        messageId,
-        senderInboxId: shortenLogValue(senderInboxId),
-        reason: "missing_agentic_id"
-      })
-    );
-    return true;
-  }
-  logWithTimestamp(
-    `[okx-agent-task:${deps.myXmtpAddress}] subscription received msgType=${envelope.msgType} conv=${conversationId} message=${shortenLogValue(messageId)} sender=${shortenLogValue(senderInboxId)}`
-  );
-  logger.info(
-    LogEvent.SUBSCRIPTION_INBOUND_RECEIVED,
-    buildSubscriptionInboundExtras({
-      checkpoint: "inbound/subscription_received",
-      userAgentId: agenticId,
-      conversationId,
-      messageId,
-      deliveryId: envelope.deliveryId,
-      senderInboxId: shortenLogValue(senderInboxId)
-    })
-  );
-  const listJobs = deps.listJobsByVerifiedSenderImpl ?? listJobsByVerifiedSenderWithCapability;
-  logger.info(
-    LogEvent.SUBSCRIPTION_JOBS_QUERY_STARTED,
-    buildSubscriptionInboundExtras({
-      checkpoint: "inbound/subscription_jobs_query_started",
-      userAgentId: agenticId,
-      conversationId,
-      messageId
-    })
-  );
-  const listJobsResult = await listJobs({
-    groupId: conversationId,
-    senderInboxId,
-    agenticId
-  });
-  logWithTimestamp(
-    `[okx-agent-task:${deps.myXmtpAddress}] subscription queried status=${listJobsResult.status} jobs=${listJobsResult.jobs.length} invalid=${listJobsResult.invalidCount} conv=${conversationId} message=${shortenLogValue(messageId)}`
-  );
-  if (listJobsResult.status === "fail_closed") {
-    logger.error(
-      LogEvent.SUBSCRIPTION_JOBS_FAIL_CLOSED,
-      new Error("Subscription inbound: listJobsByVerifiedSender fail-closed"),
-      buildSubscriptionInboundExtras({
-        checkpoint: "inbound/subscription_jobs_fail_closed",
-        outcome: "blocked",
-        userAgentId: agenticId,
-        conversationId,
-        messageId,
-        senderInboxId: shortenLogValue(senderInboxId),
-        reason: listJobsResult.reason ?? "unknown",
-        errorCode: listJobsResult.errorCode
-      })
-    );
-    return true;
-  }
-  if (listJobsResult.status === "empty") {
-    logWithTimestamp(
-      `[okx-agent-task:${deps.myXmtpAddress}] subscription empty: no verified jobs for conv=${conversationId} message=${shortenLogValue(messageId)}`
-    );
-    logger.info(
-      LogEvent.SUBSCRIPTION_JOBS_EMPTY,
-      buildSubscriptionInboundExtras({
-        checkpoint: "inbound/subscription_jobs_empty",
-        outcome: "ignored",
-        userAgentId: agenticId,
-        conversationId,
-        messageId,
-        reason: "jobs_empty",
-        returnedCount: 0,
-        invalidCount: listJobsResult.invalidCount
-      })
-    );
-    return true;
-  }
-  logger.info(
-    LogEvent.SUBSCRIPTION_JOBS_QUERY_SUCCEEDED,
-    buildSubscriptionInboundExtras({
-      checkpoint: "inbound/subscription_jobs_query_succeeded",
-      userAgentId: agenticId,
-      conversationId,
-      messageId,
-      returnedCount: listJobsResult.jobs.length,
-      invalidCount: listJobsResult.invalidCount
-    })
-  );
-  const ownership = partitionSubscriptionJobsByOwner({
-    jobs: listJobsResult.jobs,
-    localAgentId: agenticId
-  });
-  logWithTimestamp(
-    `[okx-agent-task:${deps.myXmtpAddress}] subscription routed receiver=${agenticId} returned=${ownership.returnedCount} localOwned=${ownership.ownedCount} ignored=${ownership.ignoredCount} conv=${conversationId} message=${shortenLogValue(messageId)}`
-  );
-  logger.info(
-    LogEvent.SUBSCRIPTION_INBOUND_OWNERSHIP_ROUTED,
-    buildSubscriptionInboundExtras({
-      checkpoint: "inbound/subscription_ownership_routed",
-      outcome: ownership.ownedCount === 0 ? "ignored" : null,
-      userAgentId: agenticId,
-      conversationId,
-      messageId,
-      returnedCount: ownership.returnedCount,
-      ownedCount: ownership.ownedCount,
-      ignoredCount: ownership.ignoredCount
-    })
-  );
-  if (ownership.ownedCount === 0) {
-    return true;
-  }
-  const normalizedJobs = normalizeSubscriptionJobs({
-    jobs: ownership.owned,
-    envelope,
-    conversationId,
-    senderInboxId
-  });
-  logWithTimestamp(
-    `[okx-agent-task:${deps.myXmtpAddress}] subscription expanded jobs=${normalizedJobs.length} conv=${conversationId} message=${shortenLogValue(messageId)}`
-  );
-  let senderXmtpAddress = null;
-  try {
-    const resolved = await ctx.getSenderAddress();
-    senderXmtpAddress = resolved ? resolved : null;
-  } catch (err) {
-    logWithTimestamp(
-      `[okx-agent-task:${deps.myXmtpAddress}] subscription sender address unresolved (degrading to null) conv=${conversationId} message=${shortenLogValue(messageId)}:`,
-      err
-    );
-  }
-  const fanoutResult = await fanOutSubscriptionJobs({
-    jobs: normalizedJobs,
-    myXmtpAddress: deps.myXmtpAddress,
-    messageId,
-    dispatch: async (job, idempotencyKey) => {
-      const sessionKey = buildSessionKey({
-        jobId: job.jobId,
-        myAgentId: job.userAgentId,
-        toAgentId: job.aspAgentId
-      });
-      deps.sessionStore?.upsertSession({
-        sessionKey,
-        jobId: job.jobId,
-        myAgentId: job.userAgentId,
-        toAgentId: job.aspAgentId,
-        groupId: job.conversationId,
-        myAgentXmtpAddress: deps.myXmtpAddress,
-        toAgentXmtpAddress: senderXmtpAddress
-      });
-      return deps.onSessionMessage?.({
-        sessionKey,
-        content: JSON.stringify({
-          msgType: job.msgType,
-          content: job.content,
-          ...job.deliveryId ? { deliveryId: job.deliveryId } : {},
-          jobId: job.jobId,
-          userAgentId: job.userAgentId,
-          aspAgentId: job.aspAgentId,
-          conversationId: job.conversationId,
-          senderInboxId: job.senderInboxId,
-          // Raw XMTP messageId preserved for sender/receiver telemetry join;
-          // the durable dedup identity is the idempotencyKey passed as this
-          // session-message's own `messageId` field below (M1 fix).
-          xmtpMessageId: messageId
-        }),
-        messageId: idempotencyKey,
-        // Durable exactly-once enqueue key (M2): the wiring persists via
-        // CommandStore.submitIdempotent keyed on sessionKey+messageId so a
-        // re-processed / replayed message never creates a second command.
-        idempotencyKey,
-        jobId: job.jobId,
-        agentId: job.userAgentId
-      });
-    }
-  });
-  logWithTimestamp(
-    `[okx-agent-task:${deps.myXmtpAddress}] subscription fan-out succeeded=${fanoutResult.started} failed=${fanoutResult.failed} skippedDuplicate=${fanoutResult.skippedDuplicate} total=${fanoutResult.total} capacityAnomaly=${fanoutResult.capacityAnomaly} conv=${conversationId} message=${shortenLogValue(messageId)}`
-  );
-  const normalizedJobsById = new Map(normalizedJobs.map((job) => [job.jobId, job]));
-  for (const result of fanoutResult.results) {
-    const job = normalizedJobsById.get(result.jobId);
-    if (result.outcome === "started") {
-      logger.info(
-        LogEvent.SUBSCRIPTION_JOB_DISPATCHED,
-        buildSubscriptionJobExtras({
-          checkpoint: "dispatch/subscription_job_dispatched",
-          outcome: "success",
-          jobId: result.jobId,
-          userAgentId: agenticId,
-          aspAgentId: job?.aspAgentId,
-          conversationId,
-          deliveryId: envelope.deliveryId
-        })
-      );
-    } else if (result.outcome === "duplicate") {
-      logger.info(
-        LogEvent.SUBSCRIPTION_JOB_DUPLICATE_IGNORED,
-        buildSubscriptionJobExtras({
-          checkpoint: "dispatch/subscription_job_duplicate_ignored",
-          outcome: "ignored",
-          jobId: result.jobId,
-          userAgentId: agenticId,
-          aspAgentId: job?.aspAgentId,
-          conversationId,
-          deliveryId: envelope.deliveryId,
-          reason: "duplicate_delivery"
-        })
-      );
-    } else {
-      logger.error(
-        LogEvent.SUBSCRIPTION_JOB_FAILED,
-        toLoggableError(result.error),
-        buildSubscriptionJobExtras({
-          checkpoint: "dispatch/subscription_job_failed",
-          outcome: "failed",
-          jobId: result.jobId,
-          userAgentId: agenticId,
-          aspAgentId: job?.aspAgentId,
-          conversationId,
-          deliveryId: envelope.deliveryId,
-          reason: "session_dispatch_failed"
-        })
-      );
-    }
-  }
-  logger.info(
-    LogEvent.SUBSCRIPTION_FANOUT_SUMMARY,
-    buildSubscriptionJobExtras({
-      checkpoint: "dispatch/subscription_fanout_summary",
-      outcome: fanoutResult.failed === 0 ? "success" : fanoutResult.started > 0 || fanoutResult.skippedDuplicate > 0 ? "partial" : "failed",
-      conversationId,
-      userAgentId: agenticId,
-      total: fanoutResult.total,
-      started: fanoutResult.started,
-      failed: fanoutResult.failed,
-      skippedDuplicate: fanoutResult.skippedDuplicate
-    })
-  );
-  return true;
-}
 async function processFileMessage(ctx, deps, options = {}) {
   const messageId = ctx.message.id ?? "";
   const timing = createInboundTimingTracker(extractXmtpSentAtMs2(ctx.message));
-  const subscriptionPrecheckRawText = extractRawText(ctx.message.content);
-  const subscriptionPrecheckParse = parseJson2(subscriptionPrecheckRawText);
-  if (subscriptionPrecheckParse.ok && isSubscriptionEnvelope(subscriptionPrecheckParse.data)) {
-    const { chatType: subscriptionChatType, conversationId: subscriptionConversationId } = getConversationInfo(ctx.conversation);
-    const gateDecision = decideSubscriptionGate({
-      // getConversationInfo's declared StoredChatType also lists "system",
-      // but that value is only ever produced for stored-message bookkeeping
-      // elsewhere in this file — the conversation-type branch above never
-      // returns it, so this narrowing is safe.
-      chatType: subscriptionChatType === "system" ? "unknown" : subscriptionChatType,
-      payload: subscriptionPrecheckParse.data,
-      senderInboxId: ctx.message.senderInboxId ?? ""
-    });
-    return processSubscriptionInbound(ctx, deps, {
-      decision: gateDecision,
-      conversationId: subscriptionConversationId,
-      messageId: messageId || `subscription-${(0, import_node_crypto13.randomUUID)()}`
-    });
-  }
   if (messageId && !tryMarkProcessed(messageId)) {
     logWithTimestamp(`[okx-agent-task:${deps.myXmtpAddress}] duplicate message ignored: ${messageId}`);
     logger.info(LogEvent.INBOUND_IGNORED_DUPLICATE, timing.extras({
@@ -67954,6 +67111,19 @@ async function processFileMessage(ctx, deps, options = {}) {
     chatType,
     ...extra
   });
+  if (chatType === "dm") {
+    const dmTrustStartedAt = Date.now();
+    const trusted = await isTrustedDmSender({
+      myXmtpAddress: deps.myXmtpAddress,
+      senderInboxId: ctx.message.senderInboxId ?? "",
+      messageId,
+      conversationId
+    });
+    timing.mark("dmTrustCheck", dmTrustStartedAt);
+    if (!trusted) {
+      return true;
+    }
+  }
   const parseStartedAt = Date.now();
   const receivedRawText = extractRawText(ctx.message.content);
   const parseResult = parseJson2(receivedRawText);
@@ -67969,26 +67139,9 @@ async function processFileMessage(ctx, deps, options = {}) {
     }
   }
   timing.mark("payloadParse", parseStartedAt);
-  const parsedDmData = parseResult.ok ? parseResult.data : null;
-  const parsedDmMessage = isPlainObject5(parsedDmData) && isPlainObject5(parsedDmData.message) ? parsedDmData.message : null;
-  const dmCarriesSystemMarkers = parsedDmMessage?.isDirectToUser === true || parsedDmMessage?.source === "system" || parsedDmMessage?.isDirectCommunication === true;
-  const isA2ADm = chatType === "dm" && parseResult.ok && isA2AEnvelope(parseResult.data) && !dmCarriesSystemMarkers;
-  if (chatType === "dm" && !isA2ADm) {
-    const dmTrustStartedAt = Date.now();
-    const trusted = await isTrustedDmSender({
-      myXmtpAddress: deps.myXmtpAddress,
-      senderInboxId: ctx.message.senderInboxId ?? "",
-      messageId,
-      conversationId
-    });
-    timing.mark("dmTrustCheck", dmTrustStartedAt);
-    if (!trusted) {
-      return true;
-    }
-  }
   const directToUser = chatType === "dm" && parseResult.ok ? extractDirectToUserNotification(parseResult.data) : { kind: "none" };
   if (directToUser.kind === "invalid") {
-    const droppedMessageId = messageId || `direct-to-user-${(0, import_node_crypto13.randomUUID)()}`;
+    const droppedMessageId = messageId || `direct-to-user-${(0, import_node_crypto12.randomUUID)()}`;
     logger.error(
       LogEvent.INBOUND_DROP_DM_INVALID_PAYLOAD,
       new Error("Invalid direct-to-user system DM"),
@@ -68012,7 +67165,7 @@ async function processFileMessage(ctx, deps, options = {}) {
     await dispatchDirectToUserNotification({
       deps,
       notification: directToUser.notification,
-      messageId: messageId || `direct-to-user-${(0, import_node_crypto13.randomUUID)()}`,
+      messageId: messageId || `direct-to-user-${(0, import_node_crypto12.randomUUID)()}`,
       timing,
       source: options.source ?? "live"
     });
@@ -68020,7 +67173,7 @@ async function processFileMessage(ctx, deps, options = {}) {
   }
   const systemNotification = chatType === "dm" && parseResult.ok ? extractSystemNotification(parseResult.data) : null;
   if (systemNotification) {
-    const systemMessageId = messageId || `system-${(0, import_node_crypto13.randomUUID)()}`;
+    const systemMessageId = messageId || `system-${(0, import_node_crypto12.randomUUID)()}`;
     logWithTimestamp(
       `[okx-agent-task:${deps.myXmtpAddress}] xmtp_system_message_received agentId=${systemNotification.agentId ?? ""} msg=${shortenLogValue(systemMessageId)} event=${systemNotification.event ?? ""} job=${shortenLogValue(systemNotification.jobId)} conv=${conversationId} source=${options.source ?? "live"} rawBytes=${Buffer.byteLength(rawText, "utf8")} rawPreview=${previewRawEnvelope(rawText)}`
     );
@@ -68181,7 +67334,7 @@ async function processFileMessage(ctx, deps, options = {}) {
   timing.mark("routeResolve", routeStartedAt);
   if (route.route === "job" && parseResult.ok && isA2AEnvelope(parseResult.data) && !isValidExternalJobId(route.jobId)) {
     const payloadObject = parseResult.data;
-    const sender = isPlainObject5(payloadObject.sender) ? payloadObject.sender : null;
+    const sender = isPlainObject3(payloadObject.sender) ? payloadObject.sender : null;
     logWithTimestamp(
       `[okx-agent-task:${deps.myXmtpAddress}] inbound A2A message has invalid jobId, dropping: jobLength=${route.jobId.length} group=${conversationId}`
     );
@@ -68210,32 +67363,7 @@ async function processFileMessage(ctx, deps, options = {}) {
     });
     return true;
   }
-  if (isA2ADm && route.route !== "job") {
-    const payloadObject = parseResult.data;
-    const sender = isPlainObject5(payloadObject.sender) ? payloadObject.sender : null;
-    recordInvalidXmtpMessageBestEffort({
-      messageId,
-      groupId: conversationId,
-      jobId: null,
-      agentId: readString3(sender?.agentId),
-      localAgentId: XmtpService.getInstance().getAgentByAddress(deps.myXmtpAddress)?.agentId ?? null,
-      senderInboxId: ctx.message.senderInboxId ?? "",
-      reason: "dm_a2a_missing_job_id",
-      stage: "inbound/job_id_validation",
-      logTag: `[okx-agent-task:${deps.myXmtpAddress}]`
-    });
-    logger.info(LogEvent.INBOUND_DROP_INVALID_JOBID, {
-      ...agentExtras({ walletAddress: deps.myXmtpAddress }),
-      conversationId,
-      messageId,
-      chatType,
-      peerInboxId: ctx.message.senderInboxId ?? "",
-      ...inboundStageExtras("inbound/job_id_validation", "dropped"),
-      reason: "dm_a2a_missing_job_id"
-    });
-    return true;
-  }
-  if (route.route === "job" && chatType !== "group" && !isA2ADm) {
+  if (route.route === "job" && chatType !== "group") {
     const providerBindStartedAt = Date.now();
     const providerGate = await bindMessageJobProviderToCurrentDefault(deps, route.jobId, "inbound-xmtp");
     timing.mark("providerBind", providerBindStartedAt);
@@ -68275,7 +67403,7 @@ async function processFileMessage(ctx, deps, options = {}) {
     );
   }
   if (route.route === "job" && chatType === "group") {
-    const payloadObject = isPlainObject5(parseResult.ok ? parseResult.data : null) ? parseResult.data : null;
+    const payloadObject = isPlainObject3(parseResult.ok ? parseResult.data : null) ? parseResult.data : null;
     const service = XmtpService.getInstance();
     const trustedSystemSender = service.isTrustedSystemAccountSender({
       senderAddress,
@@ -68301,7 +67429,7 @@ async function processFileMessage(ctx, deps, options = {}) {
       });
       return true;
     }
-    const sender = isPlainObject5(payloadObject?.sender) ? payloadObject.sender : null;
+    const sender = isPlainObject3(payloadObject?.sender) ? payloadObject.sender : null;
     const localAgent = service.getAgentByAddress(deps.myXmtpAddress);
     const myAgentId = localAgent?.agentId ?? readString3(payloadObject?.receiverAgentId) ?? sessionAgentId ?? null;
     const toAgentId = readString3(sender?.agentId);
@@ -68341,7 +67469,7 @@ async function processFileMessage(ctx, deps, options = {}) {
       }));
       return true;
     }
-    const routedMessageId = messageId || `group-${(0, import_node_crypto13.randomUUID)()}`;
+    const routedMessageId = messageId || `group-${(0, import_node_crypto12.randomUUID)()}`;
     const sessionKey = ensureInboundGroupSession(deps, {
       jobId: route.jobId,
       myAgentId,
@@ -68406,102 +67534,8 @@ async function processFileMessage(ctx, deps, options = {}) {
     );
     return true;
   }
-  if (route.route === "job" && isA2ADm) {
-    const payloadObject = parseResult.data;
-    const accepted = await verifyInboundA2AGroupMessage({
-      payload: parseResult.data,
-      myXmtpAddress: deps.myXmtpAddress,
-      senderAddress,
-      senderInboxId: ctx.message.senderInboxId ?? "",
-      jobId: route.jobId,
-      groupId: conversationId,
-      messageId,
-      consentState: void 0,
-      trustedSystemSender: false,
-      isOfflineReplay: options.isOfflineReplay ?? false,
-      timing
-    });
-    if (!accepted) {
-      return true;
-    }
-    const providerBindStartedAt = Date.now();
-    const providerGate = await bindMessageJobProviderToCurrentDefault(deps, route.jobId, "inbound-xmtp");
-    timing.mark("providerBind", providerBindStartedAt);
-    if (!providerGate.allowed) {
-      logger.info(LogEvent.INBOUND_IGNORED_NON_BUSINESS, timing.extras({
-        ...buildInboundTerminalExtras({
-          terminalState: "provider_gate_denied",
-          myXmtpAddress: deps.myXmtpAddress,
-          messageId,
-          conversationId,
-          chatType,
-          jobId: route.jobId,
-          route: route.route,
-          reason: "job_provider_gate_denied"
-        }),
-        routeReason: route.routeReason,
-        providerBinding: providerGate.provider ?? ""
-      }));
-      return true;
-    }
-    const myAgentId = XmtpService.getInstance().getAgentByAddress(deps.myXmtpAddress)?.agentId ?? readString3(payloadObject.receiverAgentId) ?? sessionAgentId ?? null;
-    const sender = isPlainObject5(payloadObject.sender) ? payloadObject.sender : null;
-    const toAgentId = readString3(sender?.agentId);
-    const routedMessageId = messageId || `dm-${(0, import_node_crypto13.randomUUID)()}`;
-    const sessionKey = ensureInboundGroupSession(deps, {
-      jobId: route.jobId,
-      myAgentId,
-      toAgentId,
-      groupId: null,
-      toAgentXmtpAddress: senderAddress || readString3(payloadObject.fromXmtpAddress)
-    });
-    const dispatchStartedAt = Date.now();
-    void Promise.resolve(deps.onSessionMessage?.({
-      sessionKey,
-      content: rawText,
-      messageId: routedMessageId,
-      jobId: route.jobId,
-      agentId: myAgentId
-    })).then(() => {
-      timing.mark("sessionDispatch", dispatchStartedAt);
-      logger.info(LogEvent.INBOUND_DELIVERED, commonDeliveryExtras({
-        taskId: route.jobId,
-        agentId: myAgentId ?? "",
-        peerWalletAddress: senderAddress,
-        peerInboxId: ctx.message.senderInboxId ?? "",
-        peerAgentId: toAgentId ?? "",
-        sessionKey,
-        messageId: routedMessageId,
-        route: "dm",
-        ...inboundStageExtras("inbound/dm_session_dispatch", "success"),
-        dispatchTarget: deps.onSessionMessage ? "session" : "none"
-      }));
-    }).catch((err) => {
-      logWithTimestamp(`[okx-agent-task:${deps.myXmtpAddress}] onSessionMessage failed:`, err);
-      logger.error(LogEvent.INBOUND_DISPATCH_FAILED, toLoggableError(err), timing.extras({
-        ...buildInboundTerminalExtras({
-          terminalState: "dispatch_failed",
-          myXmtpAddress: deps.myXmtpAddress,
-          messageId: routedMessageId,
-          conversationId,
-          chatType,
-          jobId: route.jobId,
-          sessionKey,
-          route: "dm",
-          reason: "session_dispatch_failed"
-        }),
-        checkpoint: "inbound/dm_session_dispatch_failed",
-        agentId: myAgentId ?? "",
-        peerAgentId: toAgentId ?? ""
-      }));
-    });
-    logWithTimestamp(
-      `[okx-agent-task:${deps.myXmtpAddress}] session dispatch queued route=dm session=${sessionKey} message=${shortenLogValue(routedMessageId)} ${summarizePayloadForLog(parseResult.data)}`
-    );
-    return true;
-  }
   const stored = {
-    id: messageId || `local-${(0, import_node_crypto13.randomUUID)()}`,
+    id: messageId || `local-${(0, import_node_crypto12.randomUUID)()}`,
     direction: "inbound",
     route: route.route,
     routeReason: route.routeReason,
@@ -68519,8 +67553,8 @@ async function processFileMessage(ctx, deps, options = {}) {
   await deps.store.append(route.jobId, stored, sessionAgentId);
   timing.mark("storeAppend", storeAppendStartedAt);
   if ((route.route === "job" || parseResult.ok && !isA2AEnvelope(stored.payload)) && !options.skipNotify) {
-    const payloadObject = isPlainObject5(stored.payload) ? stored.payload : null;
-    const sender = isPlainObject5(payloadObject?.sender) ? payloadObject.sender : null;
+    const payloadObject = isPlainObject3(stored.payload) ? stored.payload : null;
+    const sender = isPlainObject3(payloadObject?.sender) ? payloadObject.sender : null;
     const localAgent = XmtpService.getInstance().getAgentByAddress(deps.myXmtpAddress);
     const sessionKey = route.route === "job" ? buildSessionKey({
       jobId: route.jobId,
@@ -68538,8 +67572,8 @@ async function processFileMessage(ctx, deps, options = {}) {
     });
   }
   if (route.route === "job" && chatType === "group" && conversationId && senderAddress) {
-    const payloadObject = isPlainObject5(stored.payload) ? stored.payload : null;
-    const sender = isPlainObject5(payloadObject?.sender) ? payloadObject.sender : null;
+    const payloadObject = isPlainObject3(stored.payload) ? stored.payload : null;
+    const sender = isPlainObject3(payloadObject?.sender) ? payloadObject.sender : null;
     await deps.store.updateXmtpSession(route.jobId, {
       xmtpGroupId: conversationId,
       myXmtpAddress: deps.myXmtpAddress,
@@ -68682,7 +67716,7 @@ function processOfflineFromCoreDeps(store, ctx, deps, options) {
 function buildSystemStoredMessage(params) {
   const now = Date.now();
   return {
-    id: params.id ?? `system-${now}-${(0, import_node_crypto13.randomUUID)()}`,
+    id: params.id ?? `system-${now}-${(0, import_node_crypto12.randomUUID)()}`,
     direction: "system",
     route: "backup",
     routeReason: params.reason,
@@ -68698,7 +67732,7 @@ function buildSystemStoredMessage(params) {
   };
 }
 function isA2AEnvelope(payload) {
-  return isPlainObject5(payload) && payload.msgType === A2A_MESSAGE_TYPE;
+  return isPlainObject3(payload) && payload.msgType === A2A_MESSAGE_TYPE;
 }
 
 // src/listener.ts
@@ -68826,7 +67860,7 @@ async function enqueueAiJobMessageDispatch(params) {
   await commands.submit(command);
   return command;
 }
-async function enqueueAiSessionMessageDispatchIdempotent(params) {
+async function enqueueAiSessionMessageDispatch(params) {
   const commands = params.commands ?? new CommandStore(params.homeDir);
   const messageId = params.event.messageId ?? `session-${Date.now()}`;
   const command = commands.createAiSessionMessageDispatchCommand({
@@ -68836,25 +67870,15 @@ async function enqueueAiSessionMessageDispatchIdempotent(params) {
     jobId: params.event.jobId,
     agentId: params.event.agentId
   });
-  const idempotencyKey = params.event.idempotencyKey?.trim();
-  if (idempotencyKey) {
-    const dbKey = `${command.sessionKey}
-${command.messageId}`;
-    const result = await commands.submitIdempotent(command, dbKey);
-    return {
-      command: result.created ? command : { ...command, id: result.commandId },
-      created: result.created
-    };
-  }
   await commands.submit(command);
-  return { command, created: true };
+  return command;
 }
 
 // src/listener.ts
 init_paths();
 
 // src/user-attention-watchers.ts
-var import_node_crypto14 = require("node:crypto");
+var import_node_crypto13 = require("node:crypto");
 init_sentry_logger();
 var 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.";
 var USER_ATTENTION_WATCHER_SCAN_MS = 500;
@@ -68897,7 +67921,7 @@ function isOriginalParentProcessAlive(options) {
 }
 function registerUserAttentionWatcher(options) {
   return options.store.registerUserAttentionWatcher({
-    id: options.id ?? (0, import_node_crypto14.randomUUID)(),
+    id: options.id ?? (0, import_node_crypto13.randomUUID)(),
     provider: options.provider,
     jobId: options.jobId,
     nowMs: options.nowMs ?? Date.now(),
@@ -69189,35 +68213,6 @@ var ListenerMaintenanceGate = class {
   }
 };
 var UPGRADE_RECOMMENDATION_IDEMPOTENCY_KEY = "system:onchainos-offline-replay-upgrade";
-var LIST_JOBS_UPGRADE_RECOMMENDATION_IDEMPOTENCY_KEY = "system:onchainos-list-jobs-by-verified-sender-upgrade";
-function buildUpgradeRecommendationNotice(input) {
-  const capability = input.capability?.trim() ?? "";
-  if (capability === MESSAGE_ELIGIBLE_OFFLINE_REPLAY_HELP_TOKEN) {
-    return {
-      title: "OnchainOS upgrade recommended",
-      content: "The installed OnchainOS version does not support offline-replay preferences. Subscription messages will continue to replay normally. Upgrade OnchainOS to enable this capability.\n\nSuggested command: onchainos upgrade",
-      idempotencyKey: UPGRADE_RECOMMENDATION_IDEMPOTENCY_KEY
-    };
-  }
-  if (capability === LIST_JOBS_BY_VERIFIED_SENDER_HELP_TOKEN) {
-    return {
-      title: "OnchainOS upgrade required for Subscription Shared Group",
-      content: "The installed OnchainOS version does not support the verified-sender task query required by Subscription Shared Group. Until OnchainOS is upgraded, Subscription Shared Group messages fail closed and are NOT routed to an AI Session. Upgrade OnchainOS to enable this capability.\n\nSuggested command: onchainos upgrade",
-      idempotencyKey: LIST_JOBS_UPGRADE_RECOMMENDATION_IDEMPOTENCY_KEY
-    };
-  }
-  const capabilitySlug = capability ? capability.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "") : "";
-  const idempotencyKey = capabilitySlug ? `system:onchainos-${capabilitySlug}-upgrade` : "system:onchainos-capability-upgrade";
-  const capabilityLabel = capability || "a required capability";
-  const reasonSuffix = input.reason?.trim() ? ` ${input.reason.trim()}` : "";
-  return {
-    title: "OnchainOS upgrade recommended",
-    content: `The installed OnchainOS version does not support ${capabilityLabel}.${reasonSuffix} Upgrade OnchainOS to enable this capability.
-
-Suggested command: onchainos upgrade`,
-    idempotencyKey
-  };
-}
 function resolveOfflineReplayIntervalSec(systemConfig) {
   const interval = systemConfig.offlineReplayInterval;
   if (typeof interval !== "number" || !Number.isFinite(interval) || interval <= 0) {
@@ -69446,12 +68441,8 @@ async function runListenerWithLock(options, paths) {
       onJobMessageStored: async (event) => {
         await enqueueAiJobMessageDispatch({ commands, event });
       },
-      // Returns { created } so the V2 subscription fan-out can distinguish a
-      // durable DB duplicate (idempotent success) from a fresh enqueue. V1
-      // group/system callers ignore the return; their events carry no
-      // idempotencyKey, so the plain submit path (unchanged) is used.
       onSessionMessage: async (event) => {
-        return enqueueAiSessionMessageDispatchIdempotent({ commands, event });
+        await enqueueAiSessionMessageDispatch({ commands, event });
       }
     }),
     processOfflineMessage: (ctx, deps, replayOptions) => processOfflineFromCoreDeps(store, ctx, deps, {
@@ -69461,7 +68452,7 @@ async function runListenerWithLock(options, paths) {
         await enqueueAiJobMessageDispatch({ commands, event });
       },
       onSessionMessage: async (event) => {
-        return enqueueAiSessionMessageDispatchIdempotent({ commands, event });
+        await enqueueAiSessionMessageDispatch({ commands, event });
       }
     }),
     notifySessionExpired: (command) => {
@@ -69479,12 +68470,12 @@ async function runListenerWithLock(options, paths) {
       });
     },
     notifyUpgradeRecommendation: (input) => {
-      const notice = buildUpgradeRecommendationNotice(input);
+      const content = "The installed OnchainOS version does not support offline-replay preferences. Subscription messages will continue to replay normally. Upgrade OnchainOS to enable this capability.\n\nSuggested command: onchainos upgrade";
       void notifySystemMessageToUser({
-        title: notice.title,
-        content: notice.content,
+        title: "OnchainOS upgrade recommended",
+        content,
         store: sessionStore,
-        idempotencyKey: notice.idempotencyKey
+        idempotencyKey: UPGRADE_RECOMMENDATION_IDEMPOTENCY_KEY
       }).catch((err) => {
         logWithTimestamp(
           `[okx-agent-task] upgrade recommendation notify failed component=${input.component} capability=${input.capability}:`,
@@ -69493,12 +68484,12 @@ async function runListenerWithLock(options, paths) {
       });
     }
   });
-  service.setPluginVersion("0.2.18-beta-4dd056b897-261015113839");
+  service.setPluginVersion("0.2.18");
   await service.init();
   const pluginVersionStatus = service.pluginVersionStatus;
   if (pluginVersionStatus.unavailable) {
     throw new Error(
-      `@okxweb3/a2a-node v${"0.2.18-beta-4dd056b897-261015113839"} is below the required minimum v${pluginVersionStatus.minVersion}`
+      `@okxweb3/a2a-node v${"0.2.18"} is below the required minimum v${pluginVersionStatus.minVersion}`
     );
   }
   const systemConfig = service.getSystemConfig();
@@ -69526,7 +68517,7 @@ async function runListenerWithLock(options, paths) {
       onchainosAgentId: "*",
       reason: "system-config missing sentryDsn",
       pluginId: "@okxweb3/a2a-node",
-      pluginVersion: "0.2.18-beta-4dd056b897-261015113839"
+      pluginVersion: "0.2.18"
     });
   }
   logWithTimestamp(
@@ -70988,7 +69979,7 @@ var import_node_path34 = require("node:path");
 var import_jszip = __toESM(require_lib3());
 
 // src/logs-export-archive.ts
-var import_node_crypto15 = require("node:crypto");
+var import_node_crypto14 = require("node:crypto");
 var import_node_fs24 = require("node:fs");
 var import_promises13 = require("node:fs/promises");
 var import_node_path31 = require("node:path");
@@ -71624,7 +70615,7 @@ async function writeArchiveAtomically(outputPath, archive, overwrite) {
   await (0, import_promises13.mkdir)((0, import_node_path31.dirname)(outputPath), { recursive: true });
   const temporaryPath = (0, import_node_path31.join)(
     (0, import_node_path31.dirname)(outputPath),
-    `.${(0, import_node_path31.basename)(outputPath)}.${(0, import_node_crypto15.randomUUID)()}.tmp`
+    `.${(0, import_node_path31.basename)(outputPath)}.${(0, import_node_crypto14.randomUUID)()}.tmp`
   );
   try {
     await (0, import_promises13.writeFile)(temporaryPath, archive, { flag: "wx", mode: 384 });
@@ -71643,7 +70634,7 @@ async function writeArchiveAtomically(outputPath, archive, overwrite) {
   }
 }
 function hashDiagnosticFileContent(content) {
-  return (0, import_node_crypto15.createHash)("sha256").update(content).digest("hex");
+  return (0, import_node_crypto14.createHash)("sha256").update(content).digest("hex");
 }
 function isUnavailableError(err) {
   return !!err && typeof err === "object" && "diagnosticUnavailable" in err;
@@ -71903,7 +70894,7 @@ function isProvider2(value) {
 }
 
 // src/logs-export-utils.ts
-var import_node_crypto16 = require("node:crypto");
+var import_node_crypto15 = require("node:crypto");
 var import_node_fs26 = require("node:fs");
 var import_promises14 = require("node:fs/promises");
 var import_node_path33 = require("node:path");
@@ -72046,7 +71037,7 @@ async function assertRegularFile2(path2) {
 }
 async function inspectRegularFile(path2) {
   const file = await assertRegularFile2(path2);
-  const hash2 = (0, import_node_crypto16.createHash)("sha256");
+  const hash2 = (0, import_node_crypto15.createHash)("sha256");
   for await (const chunk of (0, import_node_fs26.createReadStream)(path2)) {
     hash2.update(chunk);
   }
@@ -72299,7 +71290,7 @@ async function exportDiagnosticLogs(options) {
     node: process.version,
     platform: process.platform,
     arch: process.arch,
-    packageVersion: true ? "0.2.18-beta-4dd056b897-261015113839" : "unknown",
+    packageVersion: true ? "0.2.18" : "unknown",
     sensitiveContentIncluded: options.includeSensitiveContent,
     listenerAndLlmContentIncluded: true,
     credentialsAlwaysRedacted: true,
@@ -74211,7 +73202,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.18-beta-4dd056b897-261015113839" : "0.0.0"),
+    cliVersion: options.cliVersion ?? (true ? "0.2.18" : "0.0.0"),
     fixMode: options.fix === true,
     nonInteractive: options.nonInteractive === true,
     packageChanged: false,
@@ -74458,7 +73449,6 @@ init_autostart_windows();
   InboundReplayGate,
   InvalidXmtpMessageStore,
   JOB_PROVIDER_BINDING_SOURCES,
-  LIST_JOBS_BY_VERIFIED_SENDER_HELP_TOKEN,
   ListenerDeferredTaskScheduler,
   ListenerMaintenanceGate,
   LogEvent,
@@ -74468,9 +73458,6 @@ init_autostart_windows();
   NATIVE_LAUNCHER_EXE_NAME,
   OPENCLAW_GATEWAY_ROUTE_GROUP_ID,
   ProviderNotReadyError,
-  RUN_LOG_FILENAME_MAX_BYTES,
-  SUBSCRIPTION_FANOUT_MAX,
-  SUBSCRIPTION_MESSAGE_TYPE,
   SYSTEM_NOTIFICATION_SESSION_KEY,
   SessionBusyTracker,
   SessionStore,
@@ -74516,9 +73503,7 @@ init_autostart_windows();
   buildInboundTerminalExtras,
   buildLaunchdPlist,
   buildLauncherEntryJs,
-  buildListJobsByVerifiedSenderArgs,
   buildMessageEligibleArgs,
-  buildRunLogFileName,
   buildSchtasksCreateArgs,
   buildSchtasksDeleteArgs,
   buildSchtasksEndArgs,
@@ -74527,14 +73512,9 @@ init_autostart_windows();
   buildSeaConfig,
   buildServicePath,
   buildSessionKey,
-  buildSubscriptionEnvelope,
-  buildSubscriptionInboundExtras,
-  buildSubscriptionJobExtras,
-  buildSubscriptionSendExtras,
   buildSystemMessageNotice,
   buildSystemStoredMessage,
   buildSystemdUserService,
-  buildUpgradeRecommendationNotice,
   buildWin32OnchainosCandidates,
   buildWindowsParentProcessProbe,
   buildXmtpMessageSentExtra,
@@ -74549,7 +73529,6 @@ init_autostart_windows();
   checkCodexReadiness,
   claimActiveDaemon,
   classifyJobBindingSource,
-  classifyListJobsError,
   clearCodexReadinessCache,
   codexCommandResolvesWithoutOverride,
   codexReadinessCacheKey,
@@ -74561,12 +73540,10 @@ init_autostart_windows();
   createOutboundBehavior,
   createUserAttentionWatchParentMonitor,
   currentOpenClawGatewaySessionKey,
-  decideSubscriptionGate,
   detectAiProviders,
   detectAiRuntimeSurface,
   detectCurrentAiProvider,
   detectGatewayInvocation,
-  detectListJobsByVerifiedSenderSupport,
   detectMessageEligibleOfflineReplaySupport,
   detectRuntime,
   ensureDaemonReady,
@@ -74580,7 +73557,6 @@ init_autostart_windows();
   extractDirectToUserNotification,
   extractRateLimitEndpoint,
   extractXmtpSentAtMs,
-  fanOutSubscriptionJobs,
   findWindowsNativeOkxA2aExe,
   followFile,
   formatDoctorReportForHumans,
@@ -74593,7 +73569,6 @@ init_autostart_windows();
   getXmtpCreationCooldown,
   handleCapabilitiesCommand,
   handleDoctorCommand,
-  handleSubscriptionPushCommand,
   handleXmtpDebugCommand,
   handleXmtpSendCommand,
   handleXmtpTestCommand,
@@ -74608,7 +73583,6 @@ init_autostart_windows();
   invalidateResolvedOnchainosBinForTests,
   isAutostartManagerUnavailableError,
   isDefaultTaskHome,
-  isFingerprintKey,
   isGatewayAvailableForHeartbeat,
   isHermesGatewayPluginEnabled,
   isInfoEventAllowlisted,
@@ -74619,7 +73593,6 @@ init_autostart_windows();
   isPrereleaseVersion,
   isRetryableOpenClawGatewayError,
   isSqliteBusyError,
-  isSubscriptionEnvelope,
   isSystemdManagerUnavailableMessage,
   isTagKey,
   isValidExternalJobId,
@@ -74628,12 +73601,8 @@ init_autostart_windows();
   killProcessTree,
   launchdPlistHasCurrentRestartPolicy,
   listAllAgentsWithMetadata,
-  listJobsByVerifiedSender,
-  listJobsByVerifiedSenderHelpAdvertisesCommand,
-  listJobsByVerifiedSenderWithCapability,
   logWinCompat,
   logXmtpMessageSent,
-  logger,
   maybeRecommendOnchainosUpgrade,
   mergeA2AEnvelopeTips,
   messageEligibleHelpAdvertisesOfflineReplay,
@@ -74641,8 +73610,6 @@ init_autostart_windows();
   normalizeAiProvider,
   normalizeAiRuntimeProvider,
   normalizeHermesOkxA2aPluginConfig,
-  normalizeListJobsResponse,
-  normalizeSubscriptionJobs,
   notifyAgentMessageToUserAttention,
   notifyDirectToUserAttention,
   notifySystemMessageToUser,
@@ -74653,7 +73620,6 @@ init_autostart_windows();
   parsePluginYamlVersion,
   parseWalletLoginStatus,
   parseWindowsParentProcessJson,
-  partitionSubscriptionJobsByOwner,
   performRuntimeSwitch,
   persistAiRuntimeSurfaceBestEffort,
   persistCurrentRuntimeSelectionForNewJob,
@@ -74663,14 +73629,12 @@ init_autostart_windows();
   printXmtpTestUsage,
   probeCodexAuthStatus,
   processFileMessage,
-  processSubscriptionInbound,
   queryWalletLoginStatus,
   readAiProviderTimeoutMs,
   readAiRuntimeSurfaceBestEffort,
   readCachedCodexReadiness,
   readLastLines,
   readParentProcessCommandForPlatform,
-  readSubscriptionEnvelope,
   readUserAttentionWatcherEvent,
   refreshAgentsAndWait,
   refreshOnchainosVersionMetadata,
@@ -74681,10 +73645,8 @@ init_autostart_windows();
   replayScanBackoffWithJitterMs,
   reportDoctorRunToSentry,
   reportUserNotificationFailure,
-  resetListJobsByVerifiedSenderCapabilityForTests,
   resetMessageEligibleOfflineReplayCapabilityForTests,
   resetResolvedOnchainosBinForTests,
-  resetSubscriptionTargetsForTests,
   resetXmtpCreationCooldownForTests,
   resolveAiPermissionPreset,
   resolveAiProviderCommand,
@@ -74738,8 +73700,6 @@ init_autostart_windows();
   stopOpenClawGateway,
   stopSystemdAutostart,
   subscribeUserAttentionEvents,
-  subscriptionIdempotencyKey,
-  summarizeSubscriptionPush,
   summarizeXmtpTestEvents,
   switchProvider,
   switchProviderWithReadinessGate,
@@ -74748,7 +73708,6 @@ init_autostart_windows();
   tailFile,
   toOpenClawGatewaySessionKey,
   toWindowsInvocation,
-  tryMarkSubscriptionTarget,
   writeAiPermissionPresetToConfig
 });
 /*! Bundled license information: