@ynhcj/xiaoyi-channel 0.0.224-next → 0.0.226-next

package/dist/index.js

@@ -306,6 +306,53 @@ function registerCronRecoveryHook(api) {
         logger.log(`${logTag} ═══════════════════════════════════════════`);
     });
 }
+/**
+ * 从 sessions_spawn 工具结果中提取 ACP child sessionKey。
+ * 兼容三种 result 形态：{status, childSessionKey} 直返、JSON 字符串、
+ * {content:[{text: "<json>"}], details:{...}} 工具信封。
+ * 仅接受 status="accepted" 且 key 形如 agent:<id>:acp:<uuid> 的结果。
+ */
+function extractAcceptedAcpChildSessionKey(result) {
+    const pick = (obj) => {
+        if (!obj || typeof obj !== "object")
+            return null;
+        const record = obj;
+        if (record.status !== "accepted")
+            return null;
+        const key = record.childSessionKey;
+        return typeof key === "string" && key.includes(":acp:") ? key : null;
+    };
+    const direct = pick(result);
+    if (direct)
+        return direct;
+    const envelope = result;
+    const fromDetails = pick(envelope?.details);
+    if (fromDetails)
+        return fromDetails;
+    if (Array.isArray(envelope?.content)) {
+        for (const item of envelope.content) {
+            if (typeof item?.text !== "string")
+                continue;
+            try {
+                const fromText = pick(JSON.parse(item.text));
+                if (fromText)
+                    return fromText;
+            }
+            catch {
+                // 非 JSON 文本，忽略
+            }
+        }
+    }
+    if (typeof result === "string") {
+        try {
+            return pick(JSON.parse(result));
+        }
+        catch {
+            return null;
+        }
+    }
+    return null;
+}
 function registerSubagentHooks(api) {
     // subagent_spawned: fires after a subagent run is successfully registered.
     // We increment the expected completion count so that onIdle knows to wait.
@@ -318,6 +365,32 @@ function registerSubagentHooks(api) {
             logger.log(`[XY-SUBAGENT] spawned, requesterSessionKey=${requesterSessionKey.slice(0, 30)}, expected=${count}`);
         }
     });
+    // ACP SPAWN TRACKING: openclaw 的 subagent_spawned hook 仅由内嵌 subagent
+    // 路径（subagent-spawn.ts）发射；acp-spawn.ts（runtime="acp"，如 Claude Code）
+    // 不发射 —— 实测 ACP run 仅在结束时经 run registry 触发 subagent_ended，
+    // 导致等待态从未建立、父 turn onIdle 直接发 final 结束对话。
+    // 因此在 after_tool_call 补记：sessions_spawn 成功且 childSessionKey 为 ACP
+    // 形态时递增等待计数。内嵌 subagent 的 childKey 形如 agent:<id>:subagent:<id>，
+    // 不命中此分支，仍由 subagent_spawned hook 负责，不会重复计数。
+    api.on("after_tool_call", async (event, ctx) => {
+        try {
+            if (event?.toolName !== "sessions_spawn" || event?.error)
+                return;
+            const childKey = extractAcceptedAcpChildSessionKey(event?.result);
+            if (!childKey)
+                return;
+            const sessionKey = ctx?.sessionKey;
+            if (!sessionKey)
+                return;
+            const count = markSubagentSpawned(sessionKey);
+            if (count > 0) {
+                logger.log(`[XY-SUBAGENT] ACP spawned, childSessionKey=${childKey.slice(0, 40)}, expected=${count}`);
+            }
+        }
+        catch (err) {
+            logger.error(`[XY-SUBAGENT] Error tracking ACP spawn:`, err);
+        }
+    });
     // subagent_ended: fires when a subagent run terminates (complete/error/killed).
     // This is the PRIMARY delivery tracking mechanism. When all expected
     // subagents have ended and parent has settled, we finalize the A2A session.

package/dist/src/dispatch/outbound.js

@@ -115,16 +115,18 @@ export const xyOutbound = {
                 chatId: typeof to === "string" ? to : "",
             };
         }
-        // ── Subagent completion text capture ─────────────────────────
+        // ── Subagent completion text capture + push 抑制 ─────────────
         // Subagent completions may arrive here when openclaw's announce
         // flow delivers through the channel outbound. We capture the text
         // for the final A2A response but do NOT track delivery count here.
         // Delivery tracking is done by the subagent_ended hook (index.ts).
         //
-        // IMPORTANT: We do NOT return early here. The OpenClaw core's announce
-        // flow needs sendText to complete normally (push delivery) to avoid
-        // triggering the direct-primary fallback retry loop. Text is captured
-        // for the A2A final response, but push delivery proceeds normally.
+        // 正常对话的 subagent announce 一律不发 push：结果由保活机制经
+        // A2A final 帧交付，push webhook 通知冗余。返回合成成功（与 cron
+        // 吞没路径同理），保证 openclaw durable-delivery 记账正常，避免
+        // 触发 direct-primary fallback 重试。
+        // cron 的 announce 不受此分支影响：cron sendText 无 target
+        // （DEFAULT_PUSH_MARKER），且 cron 会话不存在 wait state，push 照常。
         if (to && to !== DEFAULT_PUSH_MARKER) {
             const [targetSessionId, targetTaskId] = String(to).split("::");
             const waitState = getWaitState(targetSessionId, targetTaskId);
@@ -132,15 +134,21 @@ export const xyOutbound = {
             // 同样携带父会话 ALS 上下文（resolveTarget 据此增强 target），ALS guard
             // 会把 announce 误判为父 turn 自己的 sendText 而漏捕获。
             // 改用 parentSettled 区分：父 run 存活期间的 sendText 是父自己的 message
-            // 工具调用（不捕获）；父 settle 后命中 waitState 的 sendText 即为
-            // subagent 完成结果的 announce 投递（捕获）。
+            // 工具调用（不捕获、push 照常）；父 settle 后命中 waitState 的 sendText
+            // 即为 subagent 完成结果的 announce 投递（捕获 + 吞掉 push）。
             const isFromWaitState = waitState && waitState.parentSettled;
-            if (isFromWaitState && !waitState.finalizationClaimed) {
+            if (isFromWaitState) {
                 const log = logger.withContext(waitState.sessionId, waitState.taskId);
-                log.log(`[xyOutbound.sendText] Subagent completion text captured, len=${text?.length ?? 0}`);
-                addCompletionText(targetSessionId, targetTaskId, text);
-                // Fall through to normal push delivery — core needs sendText to
-                // complete normally to avoid retry/announce-failure loops.
+                if (!waitState.finalizationClaimed) {
+                    log.log(`[xyOutbound.sendText] Subagent completion text captured, len=${text?.length ?? 0}`);
+                    addCompletionText(targetSessionId, targetTaskId, text);
+                }
+                log.log(`[xyOutbound.sendText] Subagent announce — swallowing push (result delivered via A2A final frame)`);
+                return {
+                    channel: "xiaoyi-channel",
+                    messageId: `subagent-swallowed-${Date.now()}`,
+                    chatId: typeof to === "string" ? to : "",
+                };
             }
         }
         // ── End subagent text capture ───────────────────────────────

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ynhcj/xiaoyi-channel",
-  "version": "0.0.224-next",
+  "version": "0.0.226-next",
   "description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
   "type": "module",
   "main": "./dist/index.js",