a2a-xmtp 1.4.1 → 1.4.3

package/package.json

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

package/src/coordination/group-scheduler.ts

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

package/src/coordination/message-orchestrator.ts

@@ -4,7 +4,6 @@
 // ============================================================
 
 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";
@@ -50,7 +49,6 @@ export class MessageOrchestrator {
     private logger: Logger,
     private policyEngine: PolicyEngine,
     groupScheduler: GroupScheduler,
-    private registry: IdentityRegistry,
   ) {
     this.groupScheduler = groupScheduler;
   }
@@ -68,6 +66,14 @@ export class MessageOrchestrator {
     }
   }
 
+  /**
+   * 群聊 self 消息计数（由 bridge.onSelfGroupMessage 触发）
+   * 保持 messageCount 与其他 agent 同步。
+   */
+  handleSelfGroupMessage(conversationId: string): void {
+    this.groupScheduler.recordMessage(conversationId);
+  }
+
   /**
    * 处理收到的 XMTP 消息：群聊 round-robin 调度 → LLM 推理 → 安全校验 → 回复
    */
@@ -124,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);
         }
 
@@ -155,20 +166,17 @@ export class MessageOrchestrator {
     payload: A2AInjectPayload,
   ): Promise<boolean> {
     const convId = payload.conversation.id;
-    const members = payload.conversation.participants;
     const myAddress = bridge.address;
 
-    // 筛选出 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());
-      }
-    }
+    // 用 XMTP 原生角色信息筛选：只有普通 Member (permissionLevel=0) 参与轮询
+    // Admin/SuperAdmin 通常是人类，不参与 round-robin
+    const details = payload.conversation.participantDetails;
+    const agentMembers = details
+      ? details.filter((p) => p.permissionLevel === 0).map((p) => p.address)
+      : payload.conversation.participants; // fallback：无角色信息时用全部成员
 
-    // 初始化群组状态（仅 agent 参与轮询，人类/admin 不参与）
-    this.groupScheduler.getOrInitGroup(convId, members, agentAddresses);
+    // 初始化群组状态
+    this.groupScheduler.getOrInitGroup(convId, agentMembers);
 
     // 检查 turn budget 是否耗尽
     if (this.policyEngine.isTurnExhausted(convId)) {

package/src/coordination/policy-engine.ts

@@ -30,7 +30,9 @@ export class PolicyEngine {
 
   /**
    * 入站检查：consent + TTL + turn budget（不检查 cool-down，
-   * 否则刚发完消息后收到的回复会被静默丢弃）
+   * 否则刚发完消息后收到的回复会被静默丢弃）。
+   * 注意：turn budget 拦截不影响 messageCount 同步，因为
+   * self 消息通过 bridge.onSelfGroupMessage 独立计数。
    */
   checkIncoming(params: PolicyCheckParams): PolicyCheckResult {
     const consent = this.getConsent(params.from);
@@ -43,7 +45,6 @@ export class PolicyEngine {
         reason: `Sender ${params.from} not explicitly allowed (consent: ${consent})`,
       };
     }
-    // 仅检查 TTL + turn budget，不检查 cool-down
     const state = this.getOrCreateState(params.conversationId);
     const now = Date.now();
     const ttlMs = this.policy.ttlMinutes * 60 * 1000;

package/src/index.ts

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

@@ -7,7 +7,7 @@ import { Agent, createUser, createSigner } from "@xmtp/agent-sdk";
 import type { IdentityRegistry } from "./identity-registry.js";
 import { PolicyEngine } from "../coordination/policy-engine.js";
 import type { XmtpWalletConfig, InboxMessage, A2AContentType, A2AInjectPayload, GroupInfo } from "../types.js";
-import { createA2APayload, CLAIM_PREFIX } from "../types.js";
+import { createA2APayload, CLAIM_PREFIX, type GroupParticipant } from "../types.js";
 import { GroupScheduler } from "../coordination/group-scheduler.js";
 
 /** IdentifierKind.Ethereum = 0 (const enum, 不能在 isolatedModules 下直接访问) */
@@ -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({
@@ -258,15 +268,19 @@ export class XmtpBridge {
     const convState = this.policyEngine.getConversationState(ctx.conversation.id);
     const turn = convState?.turn ?? 0;
 
-    // 群聊时获取参与者列表
+    // 群聊时获取参与者列表（含角色信息）
     let participants: string[] = [];
-    const isGroup = ctx.conversation.isGroup ?? false;
+    let participantDetails: GroupParticipant[] | undefined;
     if (isGroup) {
       try {
         const members = await ctx.conversation.members();
         participants = members.map((m: any) =>
           m.accountAddresses?.[0]?.toLowerCase() ?? m.inboxId,
         );
+        participantDetails = members.map((m: any) => ({
+          address: (m.accountAddresses?.[0]?.toLowerCase() ?? m.inboxId) as string,
+          permissionLevel: (m.permissionLevel ?? 0) as number,
+        }));
       } catch { /* 获取成员失败时保持空数组 */ }
     }
 
@@ -276,6 +290,7 @@ export class XmtpBridge {
       conversationId: ctx.conversation.id,
       isGroup,
       participants,
+      participantDetails,
       messageId: ctx.message.id ?? crypto.randomUUID(),
       content,
       contentType,

package/src/types.ts

@@ -12,6 +12,13 @@ export interface XmtpWalletConfig {
 
 export type XmtpEnv = "dev" | "production";
 
+/** 群成员信息（含角色） */
+export interface GroupParticipant {
+  address: string;
+  /** XMTP PermissionLevel: 0=Member, 1=Admin, 2=SuperAdmin */
+  permissionLevel: number;
+}
+
 /** 注入 Agent session 的消息格式 */
 export interface A2AInjectPayload {
   type: "a2a-xmtp";
@@ -24,6 +31,8 @@ export interface A2AInjectPayload {
     id: string;
     isGroup: boolean;
     participants: string[];
+    /** 群成员详细信息（含角色），仅群聊时有值 */
+    participantDetails?: GroupParticipant[];
   };
   message: {
     id: string;
@@ -86,8 +95,8 @@ export interface GroupConversationState {
   lastClaim: { sender: string; timestamp: number; messageId: string } | null;
 }
 
-/** Claim 消息前缀（零宽空格 + [processing]:） */
-export const CLAIM_PREFIX = "\u200B[processing]:";
+/** Claim 消息前缀（可见标记，避免 XMTP 传输时被 strip） */
+export const CLAIM_PREFIX = "__CLAIM__:";
 
 /** 默认群聊调度配置 */
 export const DEFAULT_GROUP_SCHEDULING: GroupSchedulingConfig = {
@@ -150,6 +159,7 @@ export function createA2APayload(params: {
   conversationId: string;
   isGroup: boolean;
   participants: string[];
+  participantDetails?: GroupParticipant[];
   messageId: string;
   content: string;
   contentType: A2AContentType;
@@ -168,6 +178,7 @@ export function createA2APayload(params: {
       id: params.conversationId,
       isGroup: params.isGroup,
       participants: params.participants,
+      participantDetails: params.participantDetails,
     },
     message: {
       id: params.messageId,