a2a-xmtp 1.4.3 → 1.4.5

package/README.md

@@ -17,37 +17,7 @@ Decentralized Agent-to-Agent E2EE messaging for [OpenClaw](https://openclaw.ai)
 openclaw plugins install a2a-xmtp
 ```
 
-## Configure
-
-Edit `~/.openclaw/openclaw.json`:
-
-```json
-{
-  "tools": {
-    "profile": "full"
-  },
-  "plugins": {
-    "entries": {
-      "a2a-xmtp": {
-        "enabled": true,
-        "config": {
-          "xmtp": {
-            "env": "dev",
-            "dbPath": "~/.openclaw/xmtp-data"
-          }
-        }
-      }
-    }
-  }
-}
-```
-
-Then restart:
-
-```bash
-mkdir -p ~/.openclaw/xmtp-data
-openclaw gateway restart
-```
+That's it. The plugin auto-generates an XMTP wallet, creates data directories, and starts with sensible defaults.
 
 ## Verify
 

package/openclaw.plugin.json

@@ -2,6 +2,7 @@
   "id": "a2a-xmtp",
   "name": "Agent-to-Agent IM (XMTP)",
   "description": "Decentralized Agent-to-Agent E2EE messaging powered by XMTP protocol",
+  "enabledByDefault": true,
   "configSchema": {
     "type": "object",
     "additionalProperties": false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "a2a-xmtp",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "type": "module",
   "main": "src/index.ts",
   "description": "Decentralized Agent-to-Agent E2EE messaging for OpenClaw via XMTP",
@@ -18,7 +18,8 @@
     "build": "tsc",
     "test": "vitest run",
     "test:watch": "vitest",
-    "lint": "tsc --noEmit"
+    "lint": "tsc --noEmit",
+    "server": "node --import tsx src/server/index.ts"
   },
   "dependencies": {
     "@xmtp/agent-sdk": "^2.3.0",
@@ -29,9 +30,6 @@
     "vitest": "^3.0.0",
     "@types/node": "^22.0.0"
   },
-  "peerDependencies": {
-    "openclaw": "*"
-  },
   "openclaw": {
     "extensions": [
       "./src/index.ts"

package/src/coordination/message-orchestrator.ts

@@ -108,48 +108,49 @@ export class MessageOrchestrator {
       const result = await this.subagentApi.waitForRun({ runId, timeoutMs: 60000 });
       if (result.status === "error") {
         this.logger.error(`[a2a-xmtp] Subagent error: ${result.error}`);
-      } else if (result.status === "timeout") {
-        this.logger.warn(`[a2a-xmtp] Subagent timeout for ${sessionKey}`);
+        return;
+      }
+      if (result.status === "timeout") {
+        this.logger.warn(`[a2a-xmtp] Subagent timeout for ${sessionKey}, checking for late reply...`);
       }
 
-      if (result.status === "ok") {
-        const { messages } = await this.subagentApi.getSessionMessages({
-          sessionKey,
-          limit: 5,
-        });
+      // timeout 时 LLM 可能已经返回了内容（如限流重试后成功），仍尝试提取回复
+      const { messages } = await this.subagentApi.getSessionMessages({
+        sessionKey,
+        limit: 5,
+      });
 
-        // 安全检查：白名单机制
-        if (this.hasForbiddenToolCalls(messages)) {
-          this.logger.warn(
-            `[a2a-xmtp] SECURITY: Blocked reply — LLM called non-whitelisted tool, triggered by XMTP message from ${senderLabel}. Possible prompt injection.`,
-          );
-          return;
-        }
+      // 安全检查：白名单机制
+      if (this.hasForbiddenToolCalls(messages)) {
+        this.logger.warn(
+          `[a2a-xmtp] SECURITY: Blocked reply — LLM called non-whitelisted tool, triggered by XMTP message from ${senderLabel}. Possible prompt injection.`,
+        );
+        return;
+      }
 
-        // 提取回复文本
-        const replyText = this.extractReplyText(messages);
-        if (!replyText) return;
+      // 提取回复文本
+      const replyText = this.extractReplyText(messages);
+      if (!replyText) return;
 
-        // 发送前最终检查 turn budget（收窄 race window）
-        if (payload.conversation.isGroup && this.policyEngine.isTurnExhausted(payload.conversation.id)) {
-          this.logger.info(
-            `[a2a-xmtp] Turn budget exhausted before send in ${payload.conversation.id}, dropping reply`,
-          );
-          return;
-        }
-
-        // recordTurn 由 bridge.sendMessage 内部调用，此处不重复
-        await bridge.sendMessage(payload.from.xmtpAddress, replyText, {
-          conversationId: payload.conversation.id,
-        });
+      // 发送前最终检查 turn budget（收窄 race window）
+      if (payload.conversation.isGroup && this.policyEngine.isTurnExhausted(payload.conversation.id)) {
+        this.logger.info(
+          `[a2a-xmtp] Turn budget exhausted before send in ${payload.conversation.id}, dropping reply`,
+        );
+        return;
+      }
 
-        // 群聊：清除 claim（self 消息计数由 bridge.onSelfGroupMessage 处理）
-        if (payload.conversation.isGroup) {
-          this.groupScheduler.clearClaim(payload.conversation.id);
-        }
+      // recordTurn 由 bridge.sendMessage 内部调用，此处不重复
+      await bridge.sendMessage(payload.from.xmtpAddress, replyText, {
+        conversationId: payload.conversation.id,
+      });
 
-        this.logger.info(`[a2a-xmtp] Replied to ${senderLabel} in ${payload.conversation.id}`);
+      // 群聊：清除 claim（self 消息计数由 bridge.onSelfGroupMessage 处理）
+      if (payload.conversation.isGroup) {
+        this.groupScheduler.clearClaim(payload.conversation.id);
       }
+
+      this.logger.info(`[a2a-xmtp] Replied to ${senderLabel} in ${payload.conversation.id}`);
     } catch (err) {
       this.logger.error(
         `[a2a-xmtp] Failed to trigger subagent: ${err instanceof Error ? err.message : String(err)}`,
@@ -208,7 +209,10 @@ export class MessageOrchestrator {
 
       // 发送 claim
       try {
-        await bridge.sendClaim(convId, payload.message.id);
+        const claimMsgId = await bridge.sendClaim(convId, payload.message.id);
+        this.logger.info(
+          `[a2a-xmtp] Claim sent: ${claimMsgId} in ${convId}`,
+        );
       } catch (err) {
         this.logger.warn(
           `[a2a-xmtp] Failed to send claim: ${err instanceof Error ? err.message : String(err)}`,
@@ -229,27 +233,48 @@ export class MessageOrchestrator {
       const timedOut = await waitWithAbort(decision.timeoutMs, abortCtrl.signal);
 
       if (!timedOut) {
-        // 被取消 = 收到了 claim 或回复 → 保持沉默
+        // 收到了 claim → 等待 claim 过期，看指定回复者是否真的发出了回复
         this.logger.info(
-          `[a2a-xmtp] Saw claim/reply in ${convId}, staying silent`,
+          `[a2a-xmtp] Saw claim in ${convId}, waiting for actual reply...`,
         );
-        return false;
-      }
+        const claimExpireMs = this.groupScheduler.getConfig().claimExpireMs;
+        await sleep(claimExpireMs);
+
+        // claim 已被清除 = 回复已发送 → 不需要接管
+        if (!this.groupScheduler.hasActiveClaim(convId) && !this.groupScheduler.isClaimExpired(convId)) {
+          this.logger.info(
+            `[a2a-xmtp] Claim cleared (reply sent) in ${convId}, staying silent`,
+          );
+          return false;
+        }
+
+        // claim 过期且未清除 = 指定回复者失败 → failover
+        this.logger.warn(
+          `[a2a-xmtp] Claim expired without reply in ${convId}, failing over`,
+        );
+      } else {
+        // 超时且没有 claim → 检查是否有未过期的 claim（可能在等待期间收到）
+        if (this.groupScheduler.hasActiveClaim(convId)) {
+          this.logger.info(
+            `[a2a-xmtp] Active claim exists in ${convId}, staying silent`,
+          );
+          return false;
+        }
 
-      // 超时且没有 claim → 检查是否有未过期的 claim（可能在等待期间收到）
-      if (this.groupScheduler.hasActiveClaim(convId)) {
         this.logger.info(
-          `[a2a-xmtp] Active claim exists in ${convId}, staying silent`,
+          `[a2a-xmtp] No claim received in ${convId}, failing over`,
         );
-        return false;
       }
 
-      // 接管：发送 claim 并回复
+      // Failover：接管回复
       this.logger.info(
         `[a2a-xmtp] Failover: taking over msg #${msgIndex} in ${convId}`,
       );
       try {
-        await bridge.sendClaim(convId, payload.message.id);
+        const claimMsgId = await bridge.sendClaim(convId, payload.message.id);
+        this.logger.info(
+          `[a2a-xmtp] Failover claim sent: ${claimMsgId} in ${convId}`,
+        );
       } catch (err) {
         this.logger.warn(
           `[a2a-xmtp] Failed to send failover claim: ${err instanceof Error ? err.message : String(err)}`,

package/src/index.ts

@@ -5,6 +5,8 @@
 
 import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
 import { Type } from "@sinclair/typebox";
+import { mkdirSync } from "node:fs";
+import { join } from "node:path";
 import { IdentityRegistry } from "./transport/identity-registry.js";
 import { PolicyEngine } from "./coordination/policy-engine.js";
 import { GroupScheduler } from "./coordination/group-scheduler.js";
@@ -18,15 +20,19 @@ import { DEFAULT_PLUGIN_CONFIG, type PluginConfig } from "./types.js";
 
 const AGENT_ID = "main"; // OpenClaw 默认 agent
 
+// Module-level singletons: OpenClaw may call register() multiple times from different
+// subsystems (gateway, plugins) within the same process. Shared state must live at
+// module scope so all closures (tools, HTTP routes, service) reference the same instances.
+const bridges = new Map<string, XmtpBridge>();
+let registry: IdentityRegistry;
+let policyEngine: PolicyEngine;
+
 export default definePluginEntry({
   id: "a2a-xmtp",
   name: "Agent-to-Agent IM (XMTP)",
   description: "Decentralized Agent-to-Agent E2EE messaging powered by XMTP protocol",
 
   register(api) {
-    const bridges = new Map<string, XmtpBridge>();
-    let registry: IdentityRegistry;
-    let policyEngine: PolicyEngine;
 
     // ── 1. 注册 Tools ──
 
@@ -131,12 +137,13 @@ export default definePluginEntry({
       async start(ctx) {
         ctx.logger.info("[a2a-xmtp] Starting XMTP Bridge Service...");
 
-        // 加载配置
+        // 加载配置（所有选项均有默认值，用户无需手动编辑配置文件）
         const pluginCfg = (ctx.config as any)?.plugins?.entries?.["a2a-xmtp"]?.config;
+        const defaultDbPath = join(ctx.stateDir, "xmtp-data");
         const config: PluginConfig = {
           xmtp: {
             env: pluginCfg?.xmtp?.env ?? DEFAULT_PLUGIN_CONFIG.xmtp.env,
-            dbPath: pluginCfg?.xmtp?.dbPath ?? DEFAULT_PLUGIN_CONFIG.xmtp.dbPath,
+            dbPath: pluginCfg?.xmtp?.dbPath ?? defaultDbPath,
           },
           policy: {
             maxTurns: pluginCfg?.policy?.maxTurns ?? DEFAULT_PLUGIN_CONFIG.policy.maxTurns,
@@ -152,6 +159,9 @@ export default definePluginEntry({
           walletKey: pluginCfg?.walletKey,
         };
 
+        // 自动创建数据目录
+        mkdirSync(config.xmtp.dbPath, { recursive: true });
+
         // 初始化核心组件
         registry = new IdentityRegistry(ctx.stateDir, config.xmtp.env);
         policyEngine = new PolicyEngine(config.policy);

package/src/transport/xmtp-bridge.ts

@@ -109,12 +109,13 @@ export class XmtpBridge {
   /**
    * 发送 claim 消息到群聊，表明本 agent 将要回复。
    */
-  async sendClaim(conversationId: string, messageId: string): Promise<void> {
+  async sendClaim(conversationId: string, messageId: string): Promise<string> {
     if (!this.agent) throw new Error(`Bridge for ${this.agentId} not started`);
     const conv = await this.agent.client.conversations.getConversationById(conversationId);
     if (!conv) throw new Error(`Conversation ${conversationId} not found`);
     const claimText = GroupScheduler.formatClaimMessage(messageId);
-    await conv.sendText(claimText);
+    const claimMsgId = await conv.sendText(claimText);
+    return String(claimMsgId);
   }
 
   async getInbox(opts?: { limit?: number; from?: string }): Promise<InboxMessage[]> {