@ynhcj/xiaoyi-channel 0.0.188-next → 0.0.189-next

package/dist/src/bot.js

@@ -16,7 +16,7 @@ import { saveRuntimeInfo } from "./utils/runtime-manager.js";
 import { toolCallNudgeManager } from "./utils/tool-call-nudge-manager.js";
 import { setCsplSteerContext } from "./cspl/steer-context.js";
 import { registerTaskId, decrementTaskIdRef, hasActiveTask, } from "./task-manager.js";
-import { registerSessionKeyMapping, getWaitState, markParentSettled, } from "./subagent-wait-state.js";
+import { registerSessionKeyMapping, getWaitState, hasWaitState, markParentSettled, } from "./subagent-wait-state.js";
 import { logger } from "./utils/logger.js";
 /**
  * Handle an incoming A2A message.
@@ -375,10 +375,14 @@ export async function handleXYMessage(params) {
         const cleanup = () => {
             if (cleaned)
                 return;
-            const pendingWait = getWaitState(parsed.sessionId, parsed.taskId);
+            // Check for pending subagent wait on this session (any taskId).
+            // Steer dispatches have a different taskId, so we check both
+            // exact match and session-wide presence.
+            const pendingWait = getWaitState(parsed.sessionId, parsed.taskId) ??
+                (hasWaitState(parsed.sessionId) ? { deliveredCompletions: 0, expectedCompletions: 1 } : null);
             if (pendingWait && pendingWait.deliveredCompletions < pendingWait.expectedCompletions) {
                 // Subagent wait active — skip cleanup, session stays alive
-                log.log(`[BOT] Cleanup suppressed — subagent wait active ${pendingWait.deliveredCompletions}/${pendingWait.expectedCompletions}`);
+                log.log(`[BOT] Cleanup suppressed — subagent wait active on session, taskId=${parsed.taskId}`);
                 return;
             }
             cleaned = true;

package/dist/src/outbound.js

@@ -140,31 +140,49 @@ export const xyOutbound = {
         // Resolve configuration
         const config = resolveXYConfig(cfg);
         // ── Subagent completion interception ─────────────────────────
-        // Isolation guards:
-        //   1. ALS context is null (subagent completions arrive outside any agent turn)
-        //   2. A wait state exists for the target sessionId
-        //   3. The taskId matches (enhanced by resolveTarget from wait state)
-        const alsCtx = getCurrentSessionContext();
-        if (!alsCtx && to && to !== DEFAULT_PUSH_MARKER) {
+        // Detect subagent completions by checking if the resolved target
+        // matches a wait state's sessionId + taskId. This works regardless
+        // of ALS context because:
+        //   - Normal agent turns: ALS enhances target with CURRENT taskId,
+        //     which differs from wait state's taskId (no match → skip)
+        //   - Subagent completions: ALS is null, resolveTarget enhanced
+        //     from wait state's taskId (match → intercept)
+        //   - Cron: to=DEFAULT_PUSH_MARKER (no match)
+        //   - Message tool: ALS enhances with current taskId (no match
+        //     unless the agent happens to be on the same yielded task)
+        if (to && to !== DEFAULT_PUSH_MARKER) {
             const [targetSessionId, targetTaskId] = String(to).split("::");
             const waitState = getWaitState(targetSessionId, targetTaskId);
-            if (waitState && !waitState.finalizationClaimed) {
+            const alsCtx = getCurrentSessionContext();
+            // Only intercept when ALS is null OR the target taskId matches
+            // the wait state (not the current ALS taskId). This ensures
+            // we don't intercept normal agent turn deliveries.
+            const isFromWaitState = waitState &&
+                (!alsCtx || alsCtx.taskId !== targetTaskId);
+            if (isFromWaitState && !waitState.finalizationClaimed) {
+                const log = logger.withContext(waitState.sessionId, waitState.taskId);
+                log.log(`[xyOutbound.sendText] Subagent completion detected, als=${!!alsCtx}, delivered=${waitState.deliveredCompletions}/${waitState.expectedCompletions}`);
                 const delivered = markCompletionDelivered(targetSessionId, targetTaskId, text);
                 if (delivered) {
                     const { state, isComplete, shouldFinalize } = delivered;
-                    const log = logger.withContext(state.sessionId, state.taskId);
                     if (shouldFinalize) {
-                        // All completions arrived and parent already settled → send final
-                        log.log(`[xyOutbound.sendText] All subagent results arrived after parent settled, finalizing`);
+                        // All completions arrived and parent already settled → finalize
+                        log.log(`[xyOutbound.sendText] Finalizing subagent results`);
                         await deliverSubagentFinalResult({ config, state, reason: "all-subagent-results-delivered-after-parent-settled", text: text });
+                        // Subagent completion delivered via A2A, skip push
+                        return {
+                            channel: "xiaoyi-channel",
+                            messageId: state.artifactId,
+                            chatId: to,
+                        };
                     }
-                    else if (isComplete) {
-                        // All completions arrived but parent hasn't settled yet → defer
+                    if (isComplete) {
+                        // All completions arrived but parent hasn't settled yet → defer to onSettled
                         log.log(`[xyOutbound.sendText] All subagent results arrived before parent settled, deferring finalization`);
                     }
                     else {
-                        // Still waiting for more completions → send progress update
-                        log.log(`[xyOutbound.sendText] Subagent completion ${state.deliveredCompletions}/${state.expectedCompletions}`);
+                        // Still waiting for more completions → send progress via A2A, skip push
+                        log.log(`[xyOutbound.sendText] Subagent progress ${state.deliveredCompletions}/${state.expectedCompletions}`);
                         try {
                             await sendStatusUpdate({
                                 config,
@@ -181,7 +199,12 @@ export const xyOutbound = {
                         }
                     }
                 }
-                // Continue with push delivery (subagent result also delivered as push)
+                // Skip push delivery for subagent completions — only send via A2A
+                return {
+                    channel: "xiaoyi-channel",
+                    messageId: waitState.artifactId,
+                    chatId: to,
+                };
             }
         }
         // ── End subagent interception ───────────────────────────────

package/dist/src/reply-dispatcher.js

@@ -463,7 +463,12 @@ export function createXYReplyDispatcher(params) {
                         else {
                             // 新文本不以已累积内容为前缀（如工具调用后模型重新开始生成），
                             // 更新 accumulatedText 为当前文本，后续基于此新前缀做去重
+                            const wasFirstRound = accumulatedText.length === 0;
                             accumulatedText = "";
+                            // 新一轮输出前加换行分隔（第一轮除外）
+                            if (sendText.length > 0 && !wasFirstRound) {
+                                sendText = "\n" + sendText;
+                            }
                         }
                         accumulatedText += sendText;
                         hasSentResponse = true;

package/package.json

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