a2a-xmtp 1.4.0 → 1.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "a2a-xmtp",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "type": "module",
   "main": "src/index.ts",
   "description": "Decentralized Agent-to-Agent E2EE messaging for OpenClaw via XMTP",

package/src/coordination/group-scheduler.ts

@@ -39,10 +39,16 @@ export class GroupScheduler {
 
   /**
    * 初始化或获取群组状态。成员变化时自动重算。
+   * @param agentAddresses 已知的 agent 地址集合，仅 agent 参与轮询；
+   *                       非 agent（如群主/人类）不参与 speaking order。
    */
-  getOrInitGroup(groupId: string, members: string[]): GroupConversationState {
+  getOrInitGroup(groupId: string, members: string[], agentAddresses?: Set<string>): GroupConversationState {
     const existing = this.groups.get(groupId);
-    const order = this.computeSpeakingOrder(groupId, members);
+    // 仅保留 agent 地址参与轮询，非 agent 跳过
+    const agentMembers = agentAddresses
+      ? members.filter((m) => agentAddresses.has(m.toLowerCase()))
+      : members;
+    const order = this.computeSpeakingOrder(groupId, agentMembers);
 
     // 成员变化 → 重算并重置计数
     if (existing && !arraysEqual(existing.speakingOrder, order)) {

package/src/coordination/message-orchestrator.ts

@@ -4,6 +4,7 @@
 // ============================================================
 
 import type { XmtpBridge } from "../transport/xmtp-bridge.js";
+import type { IdentityRegistry } from "../transport/identity-registry.js";
 import { formatA2AMessage, type A2AInjectPayload } from "../types.js";
 import { GroupScheduler } from "./group-scheduler.js";
 import type { PolicyEngine } from "./policy-engine.js";
@@ -49,6 +50,7 @@ export class MessageOrchestrator {
     private logger: Logger,
     private policyEngine: PolicyEngine,
     groupScheduler: GroupScheduler,
+    private registry: IdentityRegistry,
   ) {
     this.groupScheduler = groupScheduler;
   }
@@ -122,15 +124,16 @@ export class MessageOrchestrator {
         const replyText = this.extractReplyText(messages);
         if (!replyText) return;
 
-        // 记录本 agent 的 turn
-        this.policyEngine.recordTurn(payload.conversation.id);
-
+        // recordTurn 由 bridge.sendMessage 内部调用，此处不重复
         await bridge.sendMessage(payload.from.xmtpAddress, replyText, {
           conversationId: payload.conversation.id,
         });
 
-        // 群聊：清除 claim 状态（回复已发送）
+        // 群聊：计入自己的消息 + 清除 claim
         if (payload.conversation.isGroup) {
+          // 自己发的消息 handleIncoming 不会收到（跳过 self），
+          // 手动递增以保持与其他 agent 的 messageCount 同步
+          this.groupScheduler.recordMessage(payload.conversation.id);
           this.groupScheduler.clearClaim(payload.conversation.id);
         }
 
@@ -155,8 +158,17 @@ export class MessageOrchestrator {
     const members = payload.conversation.participants;
     const myAddress = bridge.address;
 
-    // 初始化群组状态
-    this.groupScheduler.getOrInitGroup(convId, members);
+    // 筛选出 agent 地址：自己 + registry 中已知的 agent
+    const agentAddresses = new Set<string>();
+    agentAddresses.add(myAddress.toLowerCase());
+    for (const addr of members) {
+      if (this.registry.getAgentId(addr)) {
+        agentAddresses.add(addr.toLowerCase());
+      }
+    }
+
+    // 初始化群组状态（仅 agent 参与轮询，人类/admin 不参与）
+    this.groupScheduler.getOrInitGroup(convId, members, agentAddresses);
 
     // 检查 turn budget 是否耗尽
     if (this.policyEngine.isTurnExhausted(convId)) {

package/src/coordination/policy-engine.ts

@@ -28,10 +28,10 @@ export class PolicyEngine {
     this.localAgentIds.add(agentId);
   }
 
-  checkOutgoing(params: PolicyCheckParams): PolicyCheckResult {
-    return this.check(params);
-  }
-
+  /**
+   * 入站检查：consent + TTL + turn budget（不检查 cool-down，
+   * 否则刚发完消息后收到的回复会被静默丢弃）
+   */
   checkIncoming(params: PolicyCheckParams): PolicyCheckResult {
     const consent = this.getConsent(params.from);
     if (consent === "deny") {
@@ -43,10 +43,23 @@ export class PolicyEngine {
         reason: `Sender ${params.from} not explicitly allowed (consent: ${consent})`,
       };
     }
-    return this.check(params);
+    // 仅检查 TTL + turn budget，不检查 cool-down
+    const state = this.getOrCreateState(params.conversationId);
+    const now = Date.now();
+    const ttlMs = this.policy.ttlMinutes * 60 * 1000;
+    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 };
   }
 
-  private check(params: PolicyCheckParams): PolicyCheckResult {
+  /**
+   * 出站检查：TTL + turn budget + cool-down
+   */
+  checkOutgoing(params: PolicyCheckParams): PolicyCheckResult {
     const state = this.getOrCreateState(params.conversationId);
     const now = Date.now();
 

package/src/index.ts

@@ -163,6 +163,7 @@ export default definePluginEntry({
           ctx.logger,
           policyEngine,
           groupScheduler,
+          registry,
         );
 
         // 初始化主 Agent 的 XMTP Bridge