@ynhcj/xiaoyi-channel 0.0.174-next → 0.0.175-next

package/dist/src/bot.js

@@ -343,6 +343,17 @@ export async function handleXYMessage(params) {
         const steerState = { steered: false };
         // 🔑 创建dispatcher
         log.log(`[BOT-DISPATCHER] Creating reply dispatcher`);
+        // Cleanup: 必须在 onIdle 内部执行（参见 reply-dispatcher.ts 中 onIdleComplete 的注释）
+        let cleaned = false;
+        const cleanup = () => {
+            if (cleaned)
+                return;
+            cleaned = true;
+            log.log(`[BOT] Cleanup started`);
+            streamingSignals.delete(parsed.sessionId);
+            decrementTaskIdRef(parsed.sessionId);
+            log.log(`[BOT] Cleanup completed`);
+        };
         const { dispatcher, replyOptions, markDispatchIdle, startStatusInterval } = createXYReplyDispatcher({
             cfg,
             runtime,
@@ -351,6 +362,7 @@ export async function handleXYMessage(params) {
             messageId: parsed.messageId,
             accountId: route.accountId,
             steerState,
+            onIdleComplete: cleanup,
         });
         // Steer injections don't need status intervals
         if (!skipReg) {
@@ -375,14 +387,14 @@ export async function handleXYMessage(params) {
             dispatcher,
             onSettled: () => {
                 log.log(`[BOT] onSettled, steered=${steerState.steered}`);
-                // 🔑 When steered, skip heavy cleanup — the first message's dispatcher is still running
+                // 🔑 When steered, skip cleanup — the first message's dispatcher is still running
                 if (steerState.steered) {
                     log.log(`[BOT] Steered dispatch settled, skipping cleanup`);
                     return;
                 }
-                streamingSignals.delete(parsed.sessionId);
-                decrementTaskIdRef(parsed.sessionId);
-                log.log(`[BOT] Cleanup completed`);
+                // Fallback cleanup: 正常流程下 onIdleComplete 已经执行过，cleaned=true 会跳过。
+                // 仅在 onIdle 未正常完成时（如异常），这里做兜底清理。
+                cleanup();
             },
             run: () => {
                 // 🔐 Use AsyncLocalStorage to provide session context to tools.

package/dist/src/reply-dispatcher.d.ts

@@ -9,6 +9,9 @@ export interface CreateXYReplyDispatcherParams {
     steerState: {
         steered: boolean;
     };
+    /** Called at end of onIdle, after final frame is sent. openclaw's waitForIdle() does
+     *  not await the async onIdle, so cleanup must happen inside onIdle itself. */
+    onIdleComplete?: () => void | Promise<void>;
 }
 /**
  * 清理 /tmp/xy_channel 目录中超过 24 小时的旧文件

package/dist/src/reply-dispatcher.js

@@ -96,7 +96,7 @@ export async function cleanupStaleTempFiles(tempDir = "/tmp/xy_channel") {
  * Runtime is expected to be validated before calling this function.
  */
 export function createXYReplyDispatcher(params) {
-    const { cfg, runtime, sessionId, taskId, messageId, accountId, steerState } = params;
+    const { cfg, runtime, sessionId, taskId, messageId, accountId, steerState, onIdleComplete } = params;
     // 初始taskId和messageId（作为fallback）
     const initialTaskId = taskId;
     const initialMessageId = messageId;
@@ -325,6 +325,10 @@ export function createXYReplyDispatcher(params) {
                 }
             }
             stopStatusInterval();
+            // 🔑 清理必须在 onIdle 内部完成，因为 openclaw 的 waitForIdle() 不会
+            // await onIdle 返回的 Promise（源码中为 void options.onIdle?.()），
+            // 导致 onSettled 在 onIdle 的 async 工作完成之前就执行。
+            await onIdleComplete?.();
         },
         onCleanup: () => {
             scopedLog().log(`[ON-CLEANUP] Reply cleanup, steered=${steerState.steered}`);

package/package.json

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