a2a-xmtp 1.4.2 → 1.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "a2a-xmtp",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "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 推理 → 安全校验 → 回复
    */
@@ -122,16 +130,21 @@ export class MessageOrchestrator {
         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,
         });
 
-        // 群聊：计入自己的消息 + 清除 claim
+        // 群聊：清除 claim（self 消息计数由 bridge.onSelfGroupMessage 处理）
         if (payload.conversation.isGroup) {
-          // 自己发的消息 handleIncoming 不会收到（跳过 self），
-          // 手动递增以保持与其他 agent 的 messageCount 同步
-          this.groupScheduler.recordMessage(payload.conversation.id);
           this.groupScheduler.clearClaim(payload.conversation.id);
         }
 

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

@@ -186,6 +186,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,
@@ -232,9 +235,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 +247,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 +271,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();