@okxweb3/a2a-node 0.0.2-beta-38940d220c-260609234729 → 0.0.4

package/README.md

@@ -50,24 +50,25 @@ okx-a2a xmtp-send \
   --job-id <jobId> \
   --session-agent-id <sessionAgentId> \
   --my-agent-id <localAgentId> \
+  --to-agent-id <remoteAgentId> \
   --message <content>
 ```
 
 The same command works before and after the job JSON has `xmtpGroupId`.
 If `xmtpGroupId` exists, the CLI reuses that group. If it does not exist,
-the CLI uses `jobId + localAgentId` to infer the provider, creates the group,
-and persists it to the job JSON.
+pass `--to-agent-id` or `--to-address`; the CLI resolves agent metadata through
+the local cache first, then falls back to supported onchainos lookup commands.
 `sessionAgentId` selects `okx-agent-task-{jobId}-{agentId}.json` when a job
 has multiple active agent conversations.
 
-Optional target override:
+Address target:
 
 ```bash
 okx-a2a xmtp-send \
   --job-id <jobId> \
   --session-agent-id <sessionAgentId> \
   --my-agent-id <localAgentId> \
-  --to-agent-id <remoteAgentId> \
+  --to-address <remoteXmtpAddress> \
   --message <content>
 ```
 

package/dist/cli.js

@@ -18099,6 +18099,7 @@ var init_sentry_logger = __esm({
       "stage",
       "status",
       "subcommand",
+      "taskId",
       "type"
     ]);
     SENTRY_FINGERPRINT_KEYS = [
@@ -18420,7 +18421,7 @@ var init_sentry_config = __esm({
     environment = process.env.SENTRY_ENV === "dev" ? "dev" : "prod";
     SENTRY_CONFIG = {
       projectName: "okx/openclaw-okx-a2a-extension",
-      release: "0.0.2-beta-38940d220c-260609234729",
+      release: "0.0.4",
       environment
     };
   }
@@ -79915,57 +79916,6 @@ function createEmptyTaskFile(jobId, sessionAgentId) {
     messages: []
   };
 }
-function sameAddress(left, right) {
-  return !!left && !!right && left.toLowerCase() === right.toLowerCase();
-}
-function isNonEmptyString(value) {
-  return typeof value === "string" && value.length > 0;
-}
-function extractJsonObjects(raw) {
-  const objects = [];
-  let start = -1;
-  let depth = 0;
-  let inString = false;
-  let escaped = false;
-  for (let i = 0; i < raw.length; i++) {
-    const char = raw[i];
-    if (start === -1) {
-      if (char === "{") {
-        start = i;
-        depth = 1;
-        inString = false;
-        escaped = false;
-      }
-      continue;
-    }
-    if (inString) {
-      if (escaped) {
-        escaped = false;
-      } else if (char === "\\") {
-        escaped = true;
-      } else if (char === '"') {
-        inString = false;
-      }
-      continue;
-    }
-    if (char === '"') {
-      inString = true;
-    } else if (char === "{") {
-      depth++;
-    } else if (char === "}") {
-      depth--;
-      if (depth === 0) {
-        const candidate = raw.slice(start, i + 1);
-        const parsed = parseJson(candidate);
-        if (parsed) {
-          objects.push(parsed);
-        }
-        start = -1;
-      }
-    }
-  }
-  return objects;
-}
 function selectReplyTarget(messages, replyToMessageId) {
   if (replyToMessageId) {
     const exact = messages.find((message) => message.id === replyToMessageId);
@@ -80140,176 +80090,100 @@ function inferMyXmtpAddress(params) {
   }
   throw new Error("Cannot infer local XMTP address; pass --my-agent-id <id>");
 }
-function findDataObject(raw, predicate) {
-  const objects = extractJsonObjects(raw);
-  for (let i = objects.length - 1; i >= 0; i--) {
-    const object = objects[i];
-    if (!isPlainObject(object)) {
-      continue;
+async function resolveAgentByIdFromCacheOrNetwork(service, agentId) {
+  const local = service.getAgentByAgentId(agentId);
+  if (local) {
+    resolvedAgentByIdCache.set(local.agentId, local);
+    if (local.communicationAddress) {
+      resolvedAgentByAddressCache.set(local.communicationAddress.toLowerCase(), local);
     }
-    const data = isPlainObject(object.data) ? object.data : object;
-    if (predicate(data)) {
-      return data;
+    return local;
+  }
+  const cached = resolvedAgentByIdCache.get(agentId);
+  if (cached) {
+    return cached;
+  }
+  const [remote] = await fetchAgentsByIds([agentId]);
+  if (remote?.agentId) {
+    resolvedAgentByIdCache.set(remote.agentId, remote);
+    if (remote.communicationAddress) {
+      resolvedAgentByAddressCache.set(remote.communicationAddress.toLowerCase(), remote);
     }
   }
-  return null;
+  return remote;
 }
-async function fetchTaskStatus(jobId, myAgentId) {
-  const { stdout, stderr } = await exec([
-    "agent",
-    "status",
-    jobId,
-    "--agent-id",
-    myAgentId
-  ]);
-  const data = findDataObject(`${stdout}
-${stderr}`, (item) => {
-    return readString(item.jobId)?.toLowerCase() === jobId.toLowerCase();
-  });
-  if (!data) {
-    return null;
+async function resolveAgentByAddressFromCacheOrNetwork(service, communicationAddress) {
+  const local = service.getAgentByAddress(communicationAddress);
+  if (local) {
+    resolvedAgentByIdCache.set(local.agentId, local);
+    resolvedAgentByAddressCache.set(local.communicationAddress.toLowerCase(), local);
+    return local;
   }
-  return {
-    jobId: readString(data.jobId) ?? void 0,
-    providerAgentId: readString(data.providerAgentId),
-    providerAgentAddress: readString(data.providerAgentAddress),
-    designatedProvider: readString(data.designatedProvider)
-  };
-}
-async function fetchTaskRecommendations(jobId, myAgentId) {
-  const { stdout, stderr } = await exec([
-    "agent",
-    "recommend",
-    jobId,
-    "--agent-id",
-    myAgentId
-  ]);
-  const data = findDataObject(`${stdout}
-${stderr}`, (item) => Array.isArray(item.recommendations));
-  const recommendations = Array.isArray(data?.recommendations) ? data.recommendations : [];
-  return recommendations.filter(isPlainObject).map((item) => ({
-    providerAgentId: readString(item.providerAgentId),
-    providerAddress: readString(item.providerAddress)
-  }));
-}
-async function searchAgents(query) {
-  const { stdout, stderr } = await exec([
-    "agent",
-    "search",
-    "--query",
-    query,
-    "--page",
-    "1",
-    "--page-size",
-    "10"
-  ]);
-  const data = findDataObject(`${stdout}
-${stderr}`, (item) => {
-    return Array.isArray(item.list);
-  });
-  const list = Array.isArray(data?.list) ? data.list : [];
-  return list.filter(isPlainObject).map((item) => ({
-    agentId: readString(item.agentId) ?? void 0,
-    communicationAddress: readString(item.communicationAddress) ?? void 0
-  }));
-}
-async function fetchAgentByWalletAddress(walletAddress) {
-  const candidates = await searchAgents(walletAddress);
-  const ids = candidates.map((item) => item.agentId).filter(isNonEmptyString);
-  if (ids.length === 0) {
-    return void 0;
+  const cached = resolvedAgentByAddressCache.get(communicationAddress.toLowerCase());
+  if (cached) {
+    return cached;
+  }
+  const remote = await fetchAgentByAddress(communicationAddress);
+  if (remote?.agentId) {
+    resolvedAgentByIdCache.set(remote.agentId, remote);
+    if (remote.communicationAddress) {
+      resolvedAgentByAddressCache.set(remote.communicationAddress.toLowerCase(), remote);
+    }
   }
-  const agents = await fetchAgentsByIds(ids);
-  return agents.find((agent) => {
-    return sameAddress(agent.agentWalletAddress, walletAddress) || sameAddress(agent.ownerAddress, walletAddress);
-  }) ?? agents[0];
+  return remote;
 }
-async function resolveRemoteAgentFromJob(jobId, myAgentId) {
+async function resolveRemoteByAgentId(params) {
+  const { service, agentId, fallbackAddress, logContext } = params;
+  let remoteAgent;
   try {
-    const status = await fetchTaskStatus(jobId, myAgentId);
-    if (status?.providerAgentId) {
-      const [agent] = await fetchAgentsByIds([status.providerAgentId]);
-      if (agent?.communicationAddress) {
-        return agent;
-      }
-    }
-    const providerWallet = status?.providerAgentAddress ?? status?.designatedProvider;
-    if (providerWallet) {
-      const agent = await fetchAgentByWalletAddress(providerWallet);
-      if (agent?.communicationAddress) {
-        return agent;
-      }
-    }
+    remoteAgent = await resolveAgentByIdFromCacheOrNetwork(service, agentId);
   } catch (err2) {
-    console.log(
-      `[okx-agent-task] failed to infer provider from task status job=${jobId} myAgentId=${myAgentId}:`,
-      err2
-    );
+    if (!fallbackAddress) {
+      throw err2;
+    }
+    logRecipientStatusLookupFailed(logContext, err2);
   }
-  try {
-    const recommendations = await fetchTaskRecommendations(jobId, myAgentId);
-    for (const recommendation of recommendations) {
-      if (recommendation.providerAgentId) {
-        const [agent] = await fetchAgentsByIds([recommendation.providerAgentId]);
-        if (agent?.communicationAddress) {
-          return agent;
-        }
-      }
-      if (recommendation.providerAddress) {
-        const agent = await fetchAgentByWalletAddress(recommendation.providerAddress);
-        if (agent?.communicationAddress) {
-          return agent;
-        }
-      }
+  if (!remoteAgent?.communicationAddress && fallbackAddress) {
+    try {
+      const fallbackAgent = await resolveAgentByAddressFromCacheOrNetwork(service, fallbackAddress);
+      remoteAgent = fallbackAgent ?? remoteAgent;
+    } catch (err2) {
+      console.log(
+        `[okx-agent-task] remote agent lookup failed for ${fallbackAddress}, continuing without receiverAgentId:`,
+        err2
+      );
     }
-  } catch (err2) {
-    console.log(
-      `[okx-agent-task] failed to infer provider from recommendations job=${jobId} myAgentId=${myAgentId}:`,
-      err2
-    );
   }
-  return void 0;
+  if (!remoteAgent?.communicationAddress && !fallbackAddress) {
+    throw new Error(`No communication address found for toAgentId=${agentId}`);
+  }
+  assertRecipientAvailable(remoteAgent);
+  return {
+    toXmtpAddress: remoteAgent?.communicationAddress ?? fallbackAddress,
+    toAgentId: remoteAgent?.agentId ?? agentId,
+    remoteAgent
+  };
 }
 async function resolveRemote(params) {
   const { command, file, service } = params;
   if (command.toAgentId) {
-    let remoteAgent;
-    try {
-      [remoteAgent] = await fetchAgentsByIds([command.toAgentId]);
-    } catch (err2) {
-      const fallbackAddress = command.toXmtpAddress ?? file.toXmtpAddress;
-      if (!fallbackAddress) {
-        throw err2;
-      }
-      logRecipientStatusLookupFailed(`toAgentId=${command.toAgentId}`, err2);
-      return {
-        toXmtpAddress: fallbackAddress,
-        toAgentId: command.toAgentId,
-        remoteAgent: void 0
-      };
-    }
-    if (!remoteAgent?.communicationAddress) {
-      throw new Error(`No communication address found for toAgentId=${command.toAgentId}`);
-    }
-    assertRecipientAvailable(remoteAgent);
-    return {
-      toXmtpAddress: remoteAgent.communicationAddress,
-      toAgentId: remoteAgent.agentId,
-      remoteAgent
-    };
+    return resolveRemoteByAgentId({
+      service,
+      agentId: command.toAgentId,
+      fallbackAddress: command.toXmtpAddress ?? file.toXmtpAddress,
+      logContext: `toAgentId=${command.toAgentId}`
+    });
   }
   const toXmtpAddress = command.toXmtpAddress ?? file.toXmtpAddress;
   if (toXmtpAddress) {
-    let remoteAgent = service.getAgentByAddress(toXmtpAddress);
-    if (!remoteAgent) {
-      try {
-        remoteAgent = await fetchAgentByAddress(toXmtpAddress);
-      } catch (err2) {
-        console.log(
-          `[okx-agent-task] remote agent lookup failed for ${toXmtpAddress}, continuing without receiverAgentId:`,
-          err2
-        );
-      }
+    let remoteAgent;
+    try {
+      remoteAgent = await resolveAgentByAddressFromCacheOrNetwork(service, toXmtpAddress);
+    } catch (err2) {
+      console.log(
+        `[okx-agent-task] remote agent lookup failed for ${toXmtpAddress}, continuing without receiverAgentId:`,
+        err2
+      );
     }
     assertRecipientAvailable(remoteAgent);
     return {
@@ -80318,59 +80192,29 @@ async function resolveRemote(params) {
       remoteAgent
     };
   }
-  if (command.myAgentId) {
-    const remoteAgent = await resolveRemoteAgentFromJob(command.jobId, command.myAgentId);
-    if (remoteAgent?.communicationAddress) {
-      assertRecipientAvailable(remoteAgent);
-      return {
-        toXmtpAddress: remoteAgent.communicationAddress,
-        toAgentId: remoteAgent.agentId,
-        remoteAgent
-      };
-    }
-  }
   throw new Error(
-    "job JSON has no xmtpGroupId and provider could not be inferred; pass --my-agent-id <id> or optionally --to-agent-id/--to-address"
+    "job JSON has no xmtpGroupId or remote address; pass --to-agent-id or --to-address"
   );
 }
 async function resolveRemoteWithoutFile(params) {
   const { command, service } = params;
   if (command.toAgentId) {
+    return resolveRemoteByAgentId({
+      service,
+      agentId: command.toAgentId,
+      fallbackAddress: command.toXmtpAddress,
+      logContext: `toAgentId=${command.toAgentId}`
+    });
+  }
+  if (command.toXmtpAddress) {
     let remoteAgent;
     try {
-      [remoteAgent] = await fetchAgentsByIds([command.toAgentId]);
+      remoteAgent = await resolveAgentByAddressFromCacheOrNetwork(service, command.toXmtpAddress);
     } catch (err2) {
-      if (!command.toXmtpAddress) {
-        throw err2;
-      }
-      logRecipientStatusLookupFailed(`toAgentId=${command.toAgentId}`, err2);
-      return {
-        toXmtpAddress: command.toXmtpAddress,
-        toAgentId: command.toAgentId,
-        remoteAgent: void 0
-      };
-    }
-    if (!remoteAgent?.communicationAddress) {
-      throw new Error(`No communication address found for toAgentId=${command.toAgentId}`);
-    }
-    assertRecipientAvailable(remoteAgent);
-    return {
-      toXmtpAddress: remoteAgent.communicationAddress,
-      toAgentId: remoteAgent.agentId,
-      remoteAgent
-    };
-  }
-  if (command.toXmtpAddress) {
-    let remoteAgent = service.getAgentByAddress(command.toXmtpAddress);
-    if (!remoteAgent) {
-      try {
-        remoteAgent = await fetchAgentByAddress(command.toXmtpAddress);
-      } catch (err2) {
-        console.log(
-          `[okx-agent-task] remote agent lookup failed for ${command.toXmtpAddress}, continuing without receiverAgentId:`,
-          err2
-        );
-      }
+      console.log(
+        `[okx-agent-task] remote agent lookup failed for ${command.toXmtpAddress}, continuing without receiverAgentId:`,
+        err2
+      );
     }
     assertRecipientAvailable(remoteAgent);
     return {
@@ -80508,16 +80352,14 @@ async function ensureGroupSession(params) {
     let remoteAgent;
     if (stored.toAgentId) {
       try {
-        [remoteAgent] = await fetchAgentsByIds([stored.toAgentId]);
+        remoteAgent = await resolveAgentByIdFromCacheOrNetwork(service, stored.toAgentId);
       } catch (err2) {
         logRecipientStatusLookupFailed(`stored.toAgentId=${stored.toAgentId}`, err2);
       }
-    } else {
-      remoteAgent = service.getAgentByAddress(stored.toXmtpAddress);
     }
     if (!remoteAgent) {
       try {
-        remoteAgent = await fetchAgentByAddress(stored.toXmtpAddress);
+        remoteAgent = await resolveAgentByAddressFromCacheOrNetwork(service, stored.toXmtpAddress);
       } catch {
         remoteAgent = void 0;
       }
@@ -80815,7 +80657,7 @@ async function handleXmtpSendCommand(params) {
   });
   return { messageId };
 }
-var import_node_crypto6, TASK_MIN_VERSION, sqliteGroupSessionPromises;
+var import_node_crypto6, TASK_MIN_VERSION, sqliteGroupSessionPromises, resolvedAgentByIdCache, resolvedAgentByAddressCache;
 var init_xmtp_send = __esm({
   "src/xmtp-send.ts"() {
     "use strict";
@@ -80824,12 +80666,13 @@ var init_xmtp_send = __esm({
     init_envelope();
     init_concurrency2();
     init_xmtp_sdk();
-    init_bin();
     init_onchainos();
     init_session_store();
     init_agent_message_notice();
     TASK_MIN_VERSION = 1;
     sqliteGroupSessionPromises = /* @__PURE__ */ new Map();
+    resolvedAgentByIdCache = /* @__PURE__ */ new Map();
+    resolvedAgentByAddressCache = /* @__PURE__ */ new Map();
   }
 });
 
@@ -84791,12 +84634,12 @@ async function runListenerWithLock(options, paths) {
       }));
     }
   });
-  service.setPluginVersion("0.0.2-beta-38940d220c-260609234729");
+  service.setPluginVersion("0.0.4");
   await service.init();
   const pluginVersionStatus = service.pluginVersionStatus;
   if (pluginVersionStatus.unavailable) {
     throw new Error(
-      `@okxweb3/a2a-node v${"0.0.2-beta-38940d220c-260609234729"} is below the required minimum v${pluginVersionStatus.minVersion}`
+      `@okxweb3/a2a-node v${"0.0.4"} is below the required minimum v${pluginVersionStatus.minVersion}`
     );
   }
   const systemConfig = service.getSystemConfig();
@@ -84814,7 +84657,7 @@ async function runListenerWithLock(options, paths) {
       onchainosAgentId: "*",
       reason: "system-config missing sentryDsn",
       pluginId: "@okxweb3/a2a-node",
-      pluginVersion: "0.0.2-beta-38940d220c-260609234729"
+      pluginVersion: "0.0.4"
     });
   }
   console.log(

package/dist/index.js

@@ -66785,6 +66785,7 @@ var SENTRY_TAG_KEYS = /* @__PURE__ */ new Set([
   "stage",
   "status",
   "subcommand",
+  "taskId",
   "type"
 ]);
 var SENTRY_FINGERPRINT_KEYS = [
@@ -81034,57 +81035,6 @@ function createEmptyTaskFile(jobId, sessionAgentId) {
     messages: []
   };
 }
-function sameAddress(left, right) {
-  return !!left && !!right && left.toLowerCase() === right.toLowerCase();
-}
-function isNonEmptyString(value) {
-  return typeof value === "string" && value.length > 0;
-}
-function extractJsonObjects(raw) {
-  const objects = [];
-  let start = -1;
-  let depth = 0;
-  let inString = false;
-  let escaped = false;
-  for (let i = 0; i < raw.length; i++) {
-    const char = raw[i];
-    if (start === -1) {
-      if (char === "{") {
-        start = i;
-        depth = 1;
-        inString = false;
-        escaped = false;
-      }
-      continue;
-    }
-    if (inString) {
-      if (escaped) {
-        escaped = false;
-      } else if (char === "\\") {
-        escaped = true;
-      } else if (char === '"') {
-        inString = false;
-      }
-      continue;
-    }
-    if (char === '"') {
-      inString = true;
-    } else if (char === "{") {
-      depth++;
-    } else if (char === "}") {
-      depth--;
-      if (depth === 0) {
-        const candidate = raw.slice(start, i + 1);
-        const parsed = parseJson(candidate);
-        if (parsed) {
-          objects.push(parsed);
-        }
-        start = -1;
-      }
-    }
-  }
-  return objects;
-}
 function selectReplyTarget(messages, replyToMessageId) {
   if (replyToMessageId) {
     const exact = messages.find((message) => message.id === replyToMessageId);
@@ -81259,176 +81209,102 @@ function inferMyXmtpAddress(params) {
   }
   throw new Error("Cannot infer local XMTP address; pass --my-agent-id <id>");
 }
-function findDataObject(raw, predicate) {
-  const objects = extractJsonObjects(raw);
-  for (let i = objects.length - 1; i >= 0; i--) {
-    const object = objects[i];
-    if (!isPlainObject(object)) {
-      continue;
+var resolvedAgentByIdCache = /* @__PURE__ */ new Map();
+var resolvedAgentByAddressCache = /* @__PURE__ */ new Map();
+async function resolveAgentByIdFromCacheOrNetwork(service, agentId) {
+  const local = service.getAgentByAgentId(agentId);
+  if (local) {
+    resolvedAgentByIdCache.set(local.agentId, local);
+    if (local.communicationAddress) {
+      resolvedAgentByAddressCache.set(local.communicationAddress.toLowerCase(), local);
     }
-    const data = isPlainObject(object.data) ? object.data : object;
-    if (predicate(data)) {
-      return data;
+    return local;
+  }
+  const cached = resolvedAgentByIdCache.get(agentId);
+  if (cached) {
+    return cached;
+  }
+  const [remote] = await fetchAgentsByIds([agentId]);
+  if (remote?.agentId) {
+    resolvedAgentByIdCache.set(remote.agentId, remote);
+    if (remote.communicationAddress) {
+      resolvedAgentByAddressCache.set(remote.communicationAddress.toLowerCase(), remote);
     }
   }
-  return null;
+  return remote;
 }
-async function fetchTaskStatus(jobId, myAgentId) {
-  const { stdout, stderr } = await exec([
-    "agent",
-    "status",
-    jobId,
-    "--agent-id",
-    myAgentId
-  ]);
-  const data = findDataObject(`${stdout}
-${stderr}`, (item) => {
-    return readString(item.jobId)?.toLowerCase() === jobId.toLowerCase();
-  });
-  if (!data) {
-    return null;
+async function resolveAgentByAddressFromCacheOrNetwork(service, communicationAddress) {
+  const local = service.getAgentByAddress(communicationAddress);
+  if (local) {
+    resolvedAgentByIdCache.set(local.agentId, local);
+    resolvedAgentByAddressCache.set(local.communicationAddress.toLowerCase(), local);
+    return local;
   }
-  return {
-    jobId: readString(data.jobId) ?? void 0,
-    providerAgentId: readString(data.providerAgentId),
-    providerAgentAddress: readString(data.providerAgentAddress),
-    designatedProvider: readString(data.designatedProvider)
-  };
-}
-async function fetchTaskRecommendations(jobId, myAgentId) {
-  const { stdout, stderr } = await exec([
-    "agent",
-    "recommend",
-    jobId,
-    "--agent-id",
-    myAgentId
-  ]);
-  const data = findDataObject(`${stdout}
-${stderr}`, (item) => Array.isArray(item.recommendations));
-  const recommendations = Array.isArray(data?.recommendations) ? data.recommendations : [];
-  return recommendations.filter(isPlainObject).map((item) => ({
-    providerAgentId: readString(item.providerAgentId),
-    providerAddress: readString(item.providerAddress)
-  }));
-}
-async function searchAgents(query) {
-  const { stdout, stderr } = await exec([
-    "agent",
-    "search",
-    "--query",
-    query,
-    "--page",
-    "1",
-    "--page-size",
-    "10"
-  ]);
-  const data = findDataObject(`${stdout}
-${stderr}`, (item) => {
-    return Array.isArray(item.list);
-  });
-  const list = Array.isArray(data?.list) ? data.list : [];
-  return list.filter(isPlainObject).map((item) => ({
-    agentId: readString(item.agentId) ?? void 0,
-    communicationAddress: readString(item.communicationAddress) ?? void 0
-  }));
-}
-async function fetchAgentByWalletAddress(walletAddress) {
-  const candidates = await searchAgents(walletAddress);
-  const ids = candidates.map((item) => item.agentId).filter(isNonEmptyString);
-  if (ids.length === 0) {
-    return void 0;
+  const cached = resolvedAgentByAddressCache.get(communicationAddress.toLowerCase());
+  if (cached) {
+    return cached;
+  }
+  const remote = await fetchAgentByAddress(communicationAddress);
+  if (remote?.agentId) {
+    resolvedAgentByIdCache.set(remote.agentId, remote);
+    if (remote.communicationAddress) {
+      resolvedAgentByAddressCache.set(remote.communicationAddress.toLowerCase(), remote);
+    }
   }
-  const agents = await fetchAgentsByIds(ids);
-  return agents.find((agent) => {
-    return sameAddress(agent.agentWalletAddress, walletAddress) || sameAddress(agent.ownerAddress, walletAddress);
-  }) ?? agents[0];
+  return remote;
 }
-async function resolveRemoteAgentFromJob(jobId, myAgentId) {
+async function resolveRemoteByAgentId(params) {
+  const { service, agentId, fallbackAddress, logContext } = params;
+  let remoteAgent;
   try {
-    const status = await fetchTaskStatus(jobId, myAgentId);
-    if (status?.providerAgentId) {
-      const [agent] = await fetchAgentsByIds([status.providerAgentId]);
-      if (agent?.communicationAddress) {
-        return agent;
-      }
-    }
-    const providerWallet = status?.providerAgentAddress ?? status?.designatedProvider;
-    if (providerWallet) {
-      const agent = await fetchAgentByWalletAddress(providerWallet);
-      if (agent?.communicationAddress) {
-        return agent;
-      }
-    }
+    remoteAgent = await resolveAgentByIdFromCacheOrNetwork(service, agentId);
   } catch (err2) {
-    console.log(
-      `[okx-agent-task] failed to infer provider from task status job=${jobId} myAgentId=${myAgentId}:`,
-      err2
-    );
+    if (!fallbackAddress) {
+      throw err2;
+    }
+    logRecipientStatusLookupFailed(logContext, err2);
   }
-  try {
-    const recommendations = await fetchTaskRecommendations(jobId, myAgentId);
-    for (const recommendation of recommendations) {
-      if (recommendation.providerAgentId) {
-        const [agent] = await fetchAgentsByIds([recommendation.providerAgentId]);
-        if (agent?.communicationAddress) {
-          return agent;
-        }
-      }
-      if (recommendation.providerAddress) {
-        const agent = await fetchAgentByWalletAddress(recommendation.providerAddress);
-        if (agent?.communicationAddress) {
-          return agent;
-        }
-      }
+  if (!remoteAgent?.communicationAddress && fallbackAddress) {
+    try {
+      const fallbackAgent = await resolveAgentByAddressFromCacheOrNetwork(service, fallbackAddress);
+      remoteAgent = fallbackAgent ?? remoteAgent;
+    } catch (err2) {
+      console.log(
+        `[okx-agent-task] remote agent lookup failed for ${fallbackAddress}, continuing without receiverAgentId:`,
+        err2
+      );
     }
-  } catch (err2) {
-    console.log(
-      `[okx-agent-task] failed to infer provider from recommendations job=${jobId} myAgentId=${myAgentId}:`,
-      err2
-    );
   }
-  return void 0;
+  if (!remoteAgent?.communicationAddress && !fallbackAddress) {
+    throw new Error(`No communication address found for toAgentId=${agentId}`);
+  }
+  assertRecipientAvailable(remoteAgent);
+  return {
+    toXmtpAddress: remoteAgent?.communicationAddress ?? fallbackAddress,
+    toAgentId: remoteAgent?.agentId ?? agentId,
+    remoteAgent
+  };
 }
 async function resolveRemote(params) {
   const { command, file, service } = params;
   if (command.toAgentId) {
-    let remoteAgent;
-    try {
-      [remoteAgent] = await fetchAgentsByIds([command.toAgentId]);
-    } catch (err2) {
-      const fallbackAddress = command.toXmtpAddress ?? file.toXmtpAddress;
-      if (!fallbackAddress) {
-        throw err2;
-      }
-      logRecipientStatusLookupFailed(`toAgentId=${command.toAgentId}`, err2);
-      return {
-        toXmtpAddress: fallbackAddress,
-        toAgentId: command.toAgentId,
-        remoteAgent: void 0
-      };
-    }
-    if (!remoteAgent?.communicationAddress) {
-      throw new Error(`No communication address found for toAgentId=${command.toAgentId}`);
-    }
-    assertRecipientAvailable(remoteAgent);
-    return {
-      toXmtpAddress: remoteAgent.communicationAddress,
-      toAgentId: remoteAgent.agentId,
-      remoteAgent
-    };
+    return resolveRemoteByAgentId({
+      service,
+      agentId: command.toAgentId,
+      fallbackAddress: command.toXmtpAddress ?? file.toXmtpAddress,
+      logContext: `toAgentId=${command.toAgentId}`
+    });
   }
   const toXmtpAddress = command.toXmtpAddress ?? file.toXmtpAddress;
   if (toXmtpAddress) {
-    let remoteAgent = service.getAgentByAddress(toXmtpAddress);
-    if (!remoteAgent) {
-      try {
-        remoteAgent = await fetchAgentByAddress(toXmtpAddress);
-      } catch (err2) {
-        console.log(
-          `[okx-agent-task] remote agent lookup failed for ${toXmtpAddress}, continuing without receiverAgentId:`,
-          err2
-        );
-      }
+    let remoteAgent;
+    try {
+      remoteAgent = await resolveAgentByAddressFromCacheOrNetwork(service, toXmtpAddress);
+    } catch (err2) {
+      console.log(
+        `[okx-agent-task] remote agent lookup failed for ${toXmtpAddress}, continuing without receiverAgentId:`,
+        err2
+      );
     }
     assertRecipientAvailable(remoteAgent);
     return {
@@ -81437,59 +81313,29 @@ async function resolveRemote(params) {
       remoteAgent
     };
   }
-  if (command.myAgentId) {
-    const remoteAgent = await resolveRemoteAgentFromJob(command.jobId, command.myAgentId);
-    if (remoteAgent?.communicationAddress) {
-      assertRecipientAvailable(remoteAgent);
-      return {
-        toXmtpAddress: remoteAgent.communicationAddress,
-        toAgentId: remoteAgent.agentId,
-        remoteAgent
-      };
-    }
-  }
   throw new Error(
-    "job JSON has no xmtpGroupId and provider could not be inferred; pass --my-agent-id <id> or optionally --to-agent-id/--to-address"
+    "job JSON has no xmtpGroupId or remote address; pass --to-agent-id or --to-address"
   );
 }
 async function resolveRemoteWithoutFile(params) {
   const { command, service } = params;
   if (command.toAgentId) {
+    return resolveRemoteByAgentId({
+      service,
+      agentId: command.toAgentId,
+      fallbackAddress: command.toXmtpAddress,
+      logContext: `toAgentId=${command.toAgentId}`
+    });
+  }
+  if (command.toXmtpAddress) {
     let remoteAgent;
     try {
-      [remoteAgent] = await fetchAgentsByIds([command.toAgentId]);
+      remoteAgent = await resolveAgentByAddressFromCacheOrNetwork(service, command.toXmtpAddress);
     } catch (err2) {
-      if (!command.toXmtpAddress) {
-        throw err2;
-      }
-      logRecipientStatusLookupFailed(`toAgentId=${command.toAgentId}`, err2);
-      return {
-        toXmtpAddress: command.toXmtpAddress,
-        toAgentId: command.toAgentId,
-        remoteAgent: void 0
-      };
-    }
-    if (!remoteAgent?.communicationAddress) {
-      throw new Error(`No communication address found for toAgentId=${command.toAgentId}`);
-    }
-    assertRecipientAvailable(remoteAgent);
-    return {
-      toXmtpAddress: remoteAgent.communicationAddress,
-      toAgentId: remoteAgent.agentId,
-      remoteAgent
-    };
-  }
-  if (command.toXmtpAddress) {
-    let remoteAgent = service.getAgentByAddress(command.toXmtpAddress);
-    if (!remoteAgent) {
-      try {
-        remoteAgent = await fetchAgentByAddress(command.toXmtpAddress);
-      } catch (err2) {
-        console.log(
-          `[okx-agent-task] remote agent lookup failed for ${command.toXmtpAddress}, continuing without receiverAgentId:`,
-          err2
-        );
-      }
+      console.log(
+        `[okx-agent-task] remote agent lookup failed for ${command.toXmtpAddress}, continuing without receiverAgentId:`,
+        err2
+      );
     }
     assertRecipientAvailable(remoteAgent);
     return {
@@ -81627,16 +81473,14 @@ async function ensureGroupSession(params) {
     let remoteAgent;
     if (stored.toAgentId) {
       try {
-        [remoteAgent] = await fetchAgentsByIds([stored.toAgentId]);
+        remoteAgent = await resolveAgentByIdFromCacheOrNetwork(service, stored.toAgentId);
       } catch (err2) {
         logRecipientStatusLookupFailed(`stored.toAgentId=${stored.toAgentId}`, err2);
       }
-    } else {
-      remoteAgent = service.getAgentByAddress(stored.toXmtpAddress);
     }
     if (!remoteAgent) {
       try {
-        remoteAgent = await fetchAgentByAddress(stored.toXmtpAddress);
+        remoteAgent = await resolveAgentByAddressFromCacheOrNetwork(service, stored.toXmtpAddress);
       } catch {
         remoteAgent = void 0;
       }
@@ -83393,7 +83237,7 @@ function startUserAttentionWatcherCoordinator(options) {
 var environment = process.env.SENTRY_ENV === "dev" ? "dev" : "prod";
 var SENTRY_CONFIG = {
   projectName: "okx/openclaw-okx-a2a-extension",
-  release: "0.0.2-beta-38940d220c-260609234729",
+  release: "0.0.4",
   environment
 };
 
@@ -83512,12 +83356,12 @@ async function runListenerWithLock(options, paths) {
       }));
     }
   });
-  service.setPluginVersion("0.0.2-beta-38940d220c-260609234729");
+  service.setPluginVersion("0.0.4");
   await service.init();
   const pluginVersionStatus = service.pluginVersionStatus;
   if (pluginVersionStatus.unavailable) {
     throw new Error(
-      `@okxweb3/a2a-node v${"0.0.2-beta-38940d220c-260609234729"} is below the required minimum v${pluginVersionStatus.minVersion}`
+      `@okxweb3/a2a-node v${"0.0.4"} is below the required minimum v${pluginVersionStatus.minVersion}`
     );
   }
   const systemConfig = service.getSystemConfig();
@@ -83535,7 +83379,7 @@ async function runListenerWithLock(options, paths) {
       onchainosAgentId: "*",
       reason: "system-config missing sentryDsn",
       pluginId: "@okxweb3/a2a-node",
-      pluginVersion: "0.0.2-beta-38940d220c-260609234729"
+      pluginVersion: "0.0.4"
     });
   }
   console.log(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@okxweb3/a2a-node",
-  "version": "0.0.2-beta-38940d220c-260609234729",
+  "version": "0.0.4",
   "description": "Host-agnostic Node CLI for E2E encrypted agent-to-agent communication via XMTP",
   "main": "dist/index.js",
   "bin": {