a2a-xmtp 1.4.2 → 1.4.4

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.2",
+  "version": "1.4.4",
   "type": "module",
   "main": "src/index.ts",
   "description": "Decentralized Agent-to-Agent E2EE messaging for OpenClaw via XMTP",

package/src/coordination/message-orchestrator.ts

@@ -66,6 +66,14 @@ export class MessageOrchestrator {
     }
   }
 
+  /**
+   * 群聊 self 消息计数（由 bridge.onSelfGroupMessage 触发）
+   * 保持 messageCount 与其他 agent 同步。
+   */
+  handleSelfGroupMessage(conversationId: string): void {
+    this.groupScheduler.recordMessage(conversationId);
+  }
+
   /**
    * 处理收到的 XMTP 消息：群聊 round-robin 调度 → LLM 推理 → 安全校验 → 回复
    */
@@ -100,43 +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;
-
-        // recordTurn 由 bridge.sendMessage 内部调用，此处不重复
-        await bridge.sendMessage(payload.from.xmtpAddress, replyText, {
-          conversationId: payload.conversation.id,
-        });
-
-        // 群聊：计入自己的消息 + 清除 claim
-        if (payload.conversation.isGroup) {
-          // 自己发的消息 handleIncoming 不会收到（跳过 self），
-          // 手动递增以保持与其他 agent 的 messageCount 同步
-          this.groupScheduler.recordMessage(payload.conversation.id);
-          this.groupScheduler.clearClaim(payload.conversation.id);
-        }
+      // 提取回复文本
+      const replyText = this.extractReplyText(messages);
+      if (!replyText) return;
 
-        this.logger.info(`[a2a-xmtp] Replied to ${senderLabel} in ${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;
       }
+
+      // recordTurn 由 bridge.sendMessage 内部调用，此处不重复
+      await bridge.sendMessage(payload.from.xmtpAddress, replyText, {
+        conversationId: 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)}`,
@@ -195,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)}`,
@@ -216,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/coordination/policy-engine.ts

@@ -29,9 +29,10 @@ export class PolicyEngine {
   }
 
   /**
-   * 入站检查：consent + TTL（不检查 turn budget 和 cool-down）
-   * turn budget 仅在出站/调度层检查，确保 turn 耗尽后仍能接收消息、
-   * 缓存到 inbox、维持 messageCount 同步。
+   * 入站检查：consent + TTL + turn budget（不检查 cool-down，
+   * 否则刚发完消息后收到的回复会被静默丢弃）。
+   * 注意：turn budget 拦截不影响 messageCount 同步，因为
+   * self 消息通过 bridge.onSelfGroupMessage 独立计数。
    */
   checkIncoming(params: PolicyCheckParams): PolicyCheckResult {
     const consent = this.getConsent(params.from);
@@ -50,6 +51,9 @@ export class PolicyEngine {
     if (now - state.createdAt > ttlMs) {
       return { allowed: false, reason: `Conversation TTL expired (${this.policy.ttlMinutes} min)` };
     }
+    if (state.turn >= this.policy.maxTurns) {
+      return { allowed: false, reason: `Turn budget exhausted (${state.turn}/${this.policy.maxTurns})` };
+    }
     return { allowed: true };
   }
 

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";
@@ -131,12 +133,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 +155,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);
@@ -186,6 +192,10 @@ export default definePluginEntry({
           bridge.onClaim = (conversationId, senderAddress, messageId) =>
             orchestrator.handleClaim(conversationId, senderAddress, messageId);
 
+          // 群聊 self 消息计数回调：保持 messageCount 同步
+          bridge.onSelfGroupMessage = (conversationId) =>
+            orchestrator.handleSelfGroupMessage(conversationId);
+
           await bridge.start();
           bridges.set(AGENT_ID, bridge);
 

package/src/transport/xmtp-bridge.ts

@@ -28,6 +28,9 @@ export class XmtpBridge {
   /** Claim 消息回调（由 orchestrator 设置，用于群聊调度） */
   onClaim?: (conversationId: string, senderAddress: string, messageId: string) => void;
 
+  /** 群聊 self 消息计数回调（由 orchestrator 设置，用于 round-robin 同步） */
+  onSelfGroupMessage?: (conversationId: string) => void;
+
   constructor(
     readonly agentId: string,
     private walletConfig: XmtpWalletConfig,
@@ -106,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[]> {
@@ -232,9 +236,7 @@ export class XmtpBridge {
 
   private async handleIncoming(ctx: any, contentType: A2AContentType): Promise<void> {
     const senderAddress: string = await ctx.getSenderAddress();
-
-    if (senderAddress.toLowerCase() === this.address.toLowerCase()) return;
-
+    const isSelf = senderAddress.toLowerCase() === this.address.toLowerCase();
     const content = String(ctx.message.content);
 
     // 识别 claim 消息：不计数、不缓存、通知调度器
@@ -246,6 +248,15 @@ export class XmtpBridge {
       return;
     }
 
+    // 群聊 self 消息：仅计数（保持 messageCount 同步），不触发响应
+    const isGroup = ctx.conversation.isGroup ?? false;
+    if (isSelf) {
+      if (isGroup && this.onSelfGroupMessage) {
+        this.onSelfGroupMessage(ctx.conversation.id);
+      }
+      return;
+    }
+
     const senderAgentId = await this.registry.resolveAgentId(senderAddress);
 
     const policyResult = this.policyEngine.checkIncoming({
@@ -261,7 +272,6 @@ export class XmtpBridge {
     // 群聊时获取参与者列表（含角色信息）
     let participants: string[] = [];
     let participantDetails: GroupParticipant[] | undefined;
-    const isGroup = ctx.conversation.isGroup ?? false;
     if (isGroup) {
       try {
         const members = await ctx.conversation.members();