@ynhcj/xiaoyi-channel 0.0.213-beta → 0.0.213-next

package/dist/index.js

@@ -12,6 +12,7 @@ import { createBeforePromptBuildHandler } from "./src/skill-retriever/hooks.js";
 import { normalizeToolRetrieverConfig } from "./src/skill-retriever/config.js";
 import { registerCLIHook } from "./src/tools/hmos-cli.js";
 import { writeSkillUsage } from "./src/utils/skills-logger.js";
+import { logger } from "./src/utils/logger.js";
 /**
  * Parse a file path string to detect if it refers to a SKILL.md file within
  * a skills directory. Returns the skill name (parent directory) if so.
@@ -216,7 +217,10 @@ function registerFullHooks(api) {
         timeoutMs: pluginConfig.skillRetrieverTimeoutMs ?? 1000,
     });
     const beforePromptBuildHandler = createBeforePromptBuildHandler(skillRetrieverConfig);
-    api.on("before_prompt_build", beforePromptBuildHandler);
+    api.on("before_prompt_build", async (event, ctx) => {
+        logger.log(`[BEFORE_PROMPT_BUILD] hook fired, sessionKey=${ctx.sessionKey || "undefined"}, sessionId=${ctx.sessionId || "undefined"}`);
+        return beforePromptBuildHandler(event, ctx);
+    });
     registerSelfEvolutionToolResultNudge(api);
 }
 const pluginEntry = definePluginEntry({

package/dist/src/bot.js

@@ -7,7 +7,6 @@ import { downloadFilesFromParts } from "./file-download.js";
 import { resolveXYConfig } from "./config.js";
 import { sendStatusUpdate, sendClearContextResponse, sendTasksCancelResponse, sendA2AResponse } from "./formatter.js";
 import { appendSelfEvolutionKeywordNudge, shouldNudgeForSelfEvolutionKeyword, } from "./self-evolution-keyword.js";
-import { queueAgentHarnessMessage } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { runWithSessionContext } from "./tools/session-manager.js";
 import { configManager } from "./utils/config-manager.js";
 import { addPushId } from "./utils/pushid-manager.js";
@@ -16,6 +15,7 @@ import { selfEvolutionManager } from "./utils/self-evolution-manager.js";
 import { saveRuntimeInfo } from "./utils/runtime-manager.js";
 import { toolCallNudgeManager } from "./utils/tool-call-nudge-manager.js";
 import { setCsplSteerContext } from "./cspl/steer-context.js";
+import { getSteerQueue } from "./steer-queue.js";
 import { registerTaskId, decrementTaskIdRef, hasActiveTask, } from "./task-manager.js";
 import { logger } from "./utils/logger.js";
 /**
@@ -242,18 +242,20 @@ export async function handleXYMessage(params) {
                     log.error(`[BOT] Failed to patch session model override:`, patchErr);
                 }
             }
-            // 🔑 发送初始状态更新
-            log.log(`[BOT] Sending initial status update`);
-            void sendStatusUpdate({
-                config,
-                sessionId: parsed.sessionId,
-                taskId: parsed.taskId,
-                messageId: parsed.messageId,
-                text: "任务正在处理中，请稍候~",
-                state: "working",
-            }).catch((err) => {
-                log.error(`Failed to send initial status update:`, err);
-            });
+            // 🔑 发送初始状态更新（仅首条消息，steer 不重复发送）
+            if (!isUpdate) {
+                log.log(`[BOT] Sending initial status update`);
+                void sendStatusUpdate({
+                    config,
+                    sessionId: parsed.sessionId,
+                    taskId: parsed.taskId,
+                    messageId: parsed.messageId,
+                    text: "任务正在处理中，请稍候~",
+                    state: "working",
+                }).catch((err) => {
+                    log.error(`Failed to send initial status update:`, err);
+                });
+            }
         }
         // Extract text and files from parts
         const text = extractTextFromParts(parsed.parts);
@@ -278,46 +280,47 @@ export async function handleXYMessage(params) {
                 log.error(`[SELF_EVOLUTION] Failed to append inline keyword nudge: ${String(selfEvolutionError)}`);
             }
         }
-        // 🔑 Steer消息: 跳过旧路径直接进入 streaming-signal 队列
-        // /steer 前缀由 dispatchSteerWhenReady 内部添加
-        if (isUpdate) {
-            // 立即释放 init gate——steer 不走 withReplyDispatcher 的 run()
-            // 回调，onInitComplete 永远不会被触发。如果不释放，后续消息
-            // 会被 globalDispatchInitGate 永久阻塞。
-            params.onInitComplete?.();
-            // Steer 也支持文件 —— 提取并下载，附带到 mediaPayload
-            const steerFileParts = extractFileParts(parsed.parts);
-            const steerDownloadedFiles = await downloadFilesFromParts(steerFileParts);
-            const steerMediaPayload = buildXYMediaPayload(steerDownloadedFiles);
-            if (steerFileParts.length > 0) {
-                log.log(`[BOT] Steer message with ${steerFileParts.length} file(s), enqueuing to streaming-signal queue`);
-            }
-            else {
-                log.log(`[BOT] Steer message — enqueuing to streaming-signal queue`);
-            }
-            await enqueueSteer({
-                sessionId: parsed.sessionId,
-                sessionKey: route.sessionKey,
-                steerText: textForAgent, // 原始文本，不带 /steer 前缀
-                mediaPayload: steerMediaPayload,
-                cfg,
-                runtime,
-                parsed,
-                route,
-                deviceType,
-            });
-            log.log(`[BOT] Steer queue completed`);
-            return;
-        }
-        // ── First message (non-steer) path below ──────────────────────
-        // File download — only for real user messages, steer injections have no files
+        // ── Build message and dispatch via auto-reply pipeline ──────────
+        // OpenClaw's auto-reply pipeline (src/auto-reply/reply/agent-runner.ts)
+        // detects active runs and handles steer injection natively — the channel
+        // does not need its own steer detection or polling logic.
+        // File download
         let mediaPayload = {};
-        if (!skipReg) {
+        if (!skipReg || isUpdate) {
             const fileParts = extractFileParts(parsed.parts);
             const downloadedFiles = await downloadFilesFromParts(fileParts);
             log.log(`[BOT] Downloaded ${downloadedFiles.length} file(s)`);
             mediaPayload = buildXYMediaPayload(downloadedFiles);
         }
+        // 🔑 对于 steer 消息，将文件路径附加到消息文本中。
+        // auto-reply 管道的 steer 注入只携带 prompt 文本（followupRun.prompt），
+        // 不携带 mediaPayload，所以模型需要以文本形式看到附件路径。
+        if (isUpdate && mediaPayload.MediaPaths?.length) {
+            const fileHint = `\n【用户上传附件】：${JSON.stringify(mediaPayload.MediaPaths)}`;
+            textForAgent = `${textForAgent}${fileHint}`;
+            log.log(`[BOT] Steer: appended file paths to text`);
+        }
+        // 🔑 Provider-level steer injection: push steer text to the shared queue.
+        // provider.ts checks this queue on every model call (including tool-loop
+        // model calls in agent.continue()) and drains pending steer messages
+        // directly into context.messages before sending to the model.
+        // Key: parsed.sessionId (A2A conversationId) matches getCurrentSessionContext().sessionId.
+        if (isUpdate) {
+            const steerQueue = getSteerQueue();
+            const queueKey = parsed.sessionId;
+            const pending = steerQueue.get(queueKey) ?? [];
+            pending.push(textForAgent);
+            steerQueue.set(queueKey, pending);
+            log.log(`[BOT-STEER] Queued for provider injection, sessionId=${queueKey}, queueDepth=${pending.length}`);
+            // Bypass dispatchReplyFromConfig entirely — steer injection is handled
+            // at the provider level (provider.ts drains the queue on every model call).
+            // No need for /steer command dispatch or dispatcher creation.
+            if (!skipReg) {
+                decrementTaskIdRef(parsed.sessionId);
+            }
+            params.onInitComplete?.();
+            return;
+        }
         // Resolve envelope format options (following feishu pattern)
         const envelopeOptions = core.channel.reply.resolveEnvelopeFormatOptions(cfg);
         // Build message body with speaker prefix (following feishu pattern)
@@ -358,10 +361,11 @@ export async function handleXYMessage(params) {
             ReplyToBody: undefined, // A2A protocol doesn't support reply/quote
             ...mediaPayload,
         });
-        // 🔑 Streaming 信号已在上方创建（在文件下载之前）
-        const steerState = { steered: false };
+        // 🔑 For steer messages, pre-set steered=true so the dispatcher skips final
+        // response and cleanup — the first message's dispatcher handles those.
+        const steerState = { steered: isUpdate };
         // 🔑 创建dispatcher
-        log.log(`[BOT-DISPATCHER] Creating reply dispatcher`);
+        log.log(`[BOT-DISPATCHER] Creating reply dispatcher, isSteer=${isUpdate}, sessionKey=${route.sessionKey}`);
         // Cleanup: 必须在 onIdle 内部执行（参见 reply-dispatcher.ts 中 onIdleComplete 的注释）
         let cleaned = false;
         const cleanup = () => {
@@ -384,8 +388,9 @@ export async function handleXYMessage(params) {
         });
         // 🔑 注册 dispatcher 的 fallback taskId 更新函数，供 steer 路径调用
         dispatcherUpdaters.set(parsed.sessionId, updateFallbackTaskId);
-        // Steer injections don't need status intervals
-        if (!skipReg) {
+        // Steer messages don't need a status interval — the first message's
+        // dispatcher already has one running.
+        if (!isUpdate) {
             startStatusInterval();
         }
         // Build session context for AsyncLocalStorage
@@ -423,8 +428,9 @@ export async function handleXYMessage(params) {
                 // signal init complete to release the global dispatch gate
                 // for the next session.
                 const dispatchPromise = runWithSessionContext(sessionContext, async () => {
-                    log.log(`[ALS-PROOF] bot entered dispatch scope sessionId=${sessionContext.sessionId} taskId=${sessionContext.taskId} isSteer=false`);
-                    log.log(`[BOT-DISPATCH] dispatchReplyFromConfig starting, body.length=${ctxPayload.Body?.length ?? 0}`);
+                    const isSteerDispatch = isUpdate && !skipReg;
+                    log.log(`[ALS-PROOF] bot entered dispatch scope sessionId=${sessionContext.sessionId} taskId=${sessionContext.taskId} isSteer=${isSteerDispatch}`);
+                    log.log(`[BOT-DISPATCH] dispatchReplyFromConfig starting, body.length=${ctxPayload.Body?.length ?? 0}, isSteer=${isSteerDispatch}`);
                     try {
                         const result = await core.channel.reply.dispatchReplyFromConfig({
                             ctx: ctxPayload,
@@ -432,7 +438,13 @@ export async function handleXYMessage(params) {
                             dispatcher,
                             replyOptions,
                         });
-                        log.log(`[BOT-DISPATCH] dispatchReplyFromConfig returned, result=${JSON.stringify(result)}`);
+                        // 区分 steer 成功（undefined）和 steer 失败/正常 run（有结果）
+                        if (result === undefined) {
+                            log.log(`[BOT-STEER] dispatchReplyFromConfig returned undefined — steer injected via fast path OK, sessionKey=${route.sessionKey}`);
+                        }
+                        else {
+                            log.log(`[BOT-DISPATCH] dispatchReplyFromConfig returned, resultType=${typeof result}, isSteer=${isSteerDispatch}, steered=${steerState.steered}`);
+                        }
                         return result;
                     }
                     catch (dispatchErr) {
@@ -492,85 +504,11 @@ function buildXYMediaPayload(mediaList) {
     };
 }
 // ─────────────────────────────────────────────────────────────
-// Steer 串行队列
+// Dispatcher updaters (cross-chain taskId bridging)
 // ─────────────────────────────────────────────────────────────
 // Use globalThis to survive module deduplication — provider.ts may load a
 // different copy of bot.ts, so a plain module-level Map would be two objects.
 const _g = globalThis;
-if (!_g.__xySteerQueues)
-    _g.__xySteerQueues = new Map();
 if (!_g.__xyDispatcherUpdaters)
     _g.__xyDispatcherUpdaters = new Map();
-const steerQueues = _g.__xySteerQueues;
 const dispatcherUpdaters = _g.__xyDispatcherUpdaters;
-/**
- * 将 steer 消息放入 per-session 串行队列。
- * 通过指数退避轮询注入（queueAgentHarnessMessage），直到 Pi agent 接受消息或 run 结束。
- * 多个 steer 按到达顺序串行处理。
- */
-function enqueueSteer(params) {
-    const { sessionId } = params;
-    const log = logger.withContext(sessionId, params.parsed.taskId);
-    // 取出当前队列尾部（或 undefined），然后链上新的 Promise
-    const prev = steerQueues.get(sessionId);
-    const next = (prev ?? Promise.resolve()).then(() => dispatchSteerWhenReady(params));
-    steerQueues.set(sessionId, next);
-    // 链条结束后清理
-    next.catch((err) => {
-        log.error(`[STEER-QUEUE] Steer chain failed: ${String(err)}`);
-    }).finally(() => {
-        if (steerQueues.get(sessionId) === next) {
-            steerQueues.delete(sessionId);
-        }
-    });
-    return next;
-}
-/**
- * Poll the active embedded run with exponential backoff until the steer message
- * is accepted or the run completes.
- *
- * Replaces the previous signal-based approach (notifyModelStreaming) which fired
- * from wrapStreamFn too early — before the Pi agent had set state.isStreaming=true.
- * queueAgentHarnessMessage internally checks isStreaming(), so we retry until the
- * Pi agent is ready to accept messages.
- */
-async function dispatchSteerWhenReady(params) {
-    const { sessionId, steerText } = params;
-    const log = logger.withContext(sessionId, params.parsed.taskId);
-    const mediaPaths = params.mediaPayload?.MediaPaths;
-    const fileHint = mediaPaths && mediaPaths.length > 0
-        ? `\n【用户上传附件】：${JSON.stringify(mediaPaths)}`
-        : "";
-    const steerMessage = `${steerText}${fileHint}`;
-    log.log(`[STEER-QUEUE] Injecting steer message directly into active run`);
-    // Exponential backoff polling until:
-    //   1. Injection succeeds (queueAgentHarnessMessage returns true)
-    //   2. The original run has completed (hasActiveTask returns false)
-    //   3. Maximum total wait time exceeded
-    const MAX_WAIT_MS = 30_000;
-    const MAX_BACKOFF_MS = 4_000;
-    const BASE_DELAY_MS = 500;
-    const startedAt = Date.now();
-    let attempt = 0;
-    while (Date.now() - startedAt < MAX_WAIT_MS) {
-        // Termination: first message's run has already finished
-        if (!hasActiveTask(sessionId)) {
-            log.log(`[STEER-QUEUE] First message completed, skip steer`);
-            return;
-        }
-        const injected = queueAgentHarnessMessage(sessionId, steerMessage, {
-            steeringMode: "all",
-        });
-        if (injected) {
-            log.log(`[STEER-QUEUE] Steer injected successfully on attempt ${attempt}`);
-            return;
-        }
-        // Exponential backoff: min(BASE_DELAY_MS * 2^attempt, MAX_BACKOFF_MS)
-        const delay = Math.min(BASE_DELAY_MS * Math.pow(2, attempt), MAX_BACKOFF_MS);
-        log.log(`[STEER-QUEUE] Attempt ${attempt}: run not accepting, retrying in ${delay}ms`);
-        await new Promise(r => setTimeout(r, delay));
-        attempt++;
-    }
-    // Max wait exceeded — model may still be in provider retry loop or unresponsive
-    log.log(`[STEER-QUEUE] Steer injection failed after ${MAX_WAIT_MS}ms timeout`);
-}

package/dist/src/cspl/call_api.js

@@ -3,6 +3,7 @@
  */
 import https from 'https';
 import { URL } from 'url';
+import { logger } from '../utils/logger.js';
 import { getConfig } from './config.js';
 import { DEFAULT_HTTPS_PORT, DEFAULT_HTTP_PORT, HTTP_STATUS_BAD_REQUEST, API_URL_SUFFIX } from './constants.js';
 function buildHeadersForCelia(config, sessionId) {
@@ -69,6 +70,7 @@ function handleResponse(res, resolve, reject) {
         data += chunk;
     });
     res.on('end', () => {
+        logger.log(`[SENTINEL HOOK] callApi response body: ${data}`);
         try {
             const result = parseResponseData(data);
             resolve(result);
@@ -85,6 +87,8 @@ export async function callApi(payload, api, sessionId) {
     const payloadWithUid = { ...payload, uid: config.uid };
     const httpBody = JSON.stringify(payloadWithUid);
     const apiUrl = `${config.api.url}${API_URL_SUFFIX}`;
+    logger.log(`[SENTINEL HOOK] callApi URL: ${apiUrl}`);
+    logger.log(`[SENTINEL HOOK] callApi request body: ${httpBody}`);
     return new Promise((resolve, reject) => {
         const options = buildRequestOptions(apiUrl, headersForCelia, config.api.timeout);
         const req = https.request(options, (res) => {

package/dist/src/monitor.js

@@ -119,8 +119,11 @@ export async function monitorXYProvider(opts = {}) {
                     activeMessages.delete(messageKey);
                 }
             };
-            // 🔑 核心改造：检测steer模式
-            // clearContext / tasks/cancel 没有 params，跳过 parseA2AMessage 直接入队
+            // Steer detection: when queue mode is "steer" and the session has an active
+            // run, process the message concurrently (skip the per-session serial queue).
+            // This prevents the steer message from waiting behind the first message's
+            // completion. The actual steer injection is handled by OpenClaw's auto-reply
+            // pipeline (agent-runner.ts), not by the channel itself.
             const messageMethod = message.method;
             if (messageMethod === "clearContext" || messageMethod === "clear_context"
                 || messageMethod === "tasks/cancel" || messageMethod === "tasks_cancel") {
@@ -135,24 +138,20 @@ export async function monitorXYProvider(opts = {}) {
                     const steerMode = cfg.messages?.queue?.mode === "steer";
                     const hasActiveRun = hasActiveTask(parsed.sessionId);
                     if (steerMode && hasActiveRun) {
-                        // Steer模式且有活跃任务：不入队列，直接并发执行
-                        logger.log(`[MONITOR-HANDLER] STEER MODE: Executing concurrently for messageKey=${messageKey}`);
+                        logger.log(`[MONITOR] STEER MODE: executing concurrently, sessionId=${parsed.sessionId}, messageKey=${messageKey}`);
                         void task().catch((err) => {
                             logger.error(`XY gateway: concurrent steer task failed for ${messageKey}: ${String(err)}`);
                             activeMessages.delete(messageKey);
                         });
                     }
                     else {
-                        // 正常模式：入队列串行执行
                         void enqueue(sessionId, task).catch((err) => {
                             logger.error(`XY gateway: queue processing failed: ${String(err)}`);
                             activeMessages.delete(messageKey);
                         });
                     }
                 }
-                catch (parseErr) {
-                    // 解析失败，回退到正常队列模式
-                    logger.error(`[MONITOR-HANDLER] Failed to parse message for steer detection: ${String(parseErr)}`);
+                catch {
                     void enqueue(sessionId, task).catch((err) => {
                         logger.error(`XY gateway: queue processing failed: ${String(err)}`);
                         activeMessages.delete(messageKey);

package/dist/src/provider.js

@@ -11,6 +11,7 @@ import { createHash } from "crypto";
 import { logger } from "./utils/logger.js";
 import { getCurrentSessionContext, setCurrentCronJobId } from "./tools/session-manager.js";
 import { selfEvolutionManager } from "./utils/self-evolution-manager.js";
+import { getSteerQueue } from "./steer-queue.js";
 // ── Retry config ──────────────────────────────────────────────
 const RETRY_DELAYS_MS = [10_000, 20_000, 40_000, 60_000, 60_000];
 const MAX_RETRY_ATTEMPTS = 5;
@@ -592,6 +593,26 @@ export const xiaoyiProvider = {
             }
             // deviceType: prefer text-extracted value, ALS as fallback.
             const sessionCtx = getCurrentSessionContext();
+            // 🔑 Provider-level steer injection: drain pending steer messages from the
+            // shared queue and inject them as user messages before each model call.
+            // This runs on EVERY model call including tool-loop model calls, so steer
+            // messages injected mid-turn take effect immediately (unlike the hook-based
+            // approach which only fires at turn boundaries).
+            if (sessionCtx?.sessionId && context.messages) {
+                const steerQueue = getSteerQueue();
+                const pending = steerQueue.get(sessionCtx.sessionId);
+                if (pending && pending.length > 0) {
+                    steerQueue.delete(sessionCtx.sessionId); // drain before injection
+                    const steerText = pending.splice(0).join("\n\n");
+                    const steerMessage = {
+                        role: "user",
+                        content: [{ type: "text", text: `用户追加诉求：${steerText}` }],
+                        timestamp: Date.now(),
+                    };
+                    context.messages.push(steerMessage);
+                    logger.log(`[PROVIDER-STEER] Injected steer into context.messages, sessionId=${sessionCtx.sessionId}, textLen=${steerText.length}, msgCount=${context.messages.length}`);
+                }
+            }
             const deviceType = extractedDeviceType
                 ?? sessionCtx?.deviceType;
             // app_ver and sdk_api_version from session context (ALS)

package/dist/src/reply-dispatcher.js

@@ -230,6 +230,7 @@ export function createXYReplyDispatcher(params) {
             if (steerState.steered && !hasSentResponse) {
                 scopedLog().log(`[ON-IDLE] Steered dispatch, no response generated, skipping`);
                 stopStatusInterval();
+                await onIdleComplete?.();
                 return;
             }
             // 🔑 用 try/finally 确保 cleanup 在 onIdle 的 async 工作全部完成后才执行。

package/dist/src/skill-retriever/hooks.js

@@ -1,10 +1,10 @@
 import { searchTools, formatToolsForContext, extractUserQuery } from "./tool-search.js";
 import { logger } from "../utils/logger.js";
-const TOOL_RETRIEVER_HEADER = `[系统消息，非用户发言]
-
+const TOOL_RETRIEVER_HEADER = `<system-reminder>
 `;
 const TOOL_RETRIEVER_FOOTER = `
-以上是检索到的、与当前用户请求相关但用户尚未安装的skill，请按照TOOLS.md中find-skills中的[隐式推荐触发规则]来判断是否要给用户推荐。
+以上是与用户请求相关但尚未安装的skill，请按照TOOLS.md中find-skills中的[隐式推荐触发规则]来判断是否要安装并使用。
+</system-reminder>
 `;
 const PLUGIN_LOG_PREFIX = "[skill-retriever]";
 const SKIP_KEYWORDS = ["安装", "装一下", "下载", "查询", "查找", "install", "卸载", "删除", "重载", "定时任务", "重装", "进化"];

package/dist/src/steer-queue.d.ts

@@ -0,0 +1 @@
+export declare function getSteerQueue(): Map<string, string[]>;

package/dist/src/steer-queue.js

@@ -0,0 +1,9 @@
+// Shared steer injection queue — bot.ts writes, provider.ts reads.
+// Uses globalThis to survive module deduplication.
+const _g = globalThis;
+if (!_g.__xySteerInjectionQueue) {
+    _g.__xySteerInjectionQueue = new Map();
+}
+export function getSteerQueue() {
+    return _g.__xySteerInjectionQueue;
+}

package/dist/src/task-manager.d.ts

@@ -3,6 +3,8 @@ interface TaskIdBinding {
     currentTaskId: string;
     currentMessageId: string;
     updatedAt: number;
+    /** 引用计数：每次 registerTaskId +1，每次 decrementTaskIdRef -1，归零时删除 */
+    refCount: number;
 }
 /**
  * 注册或更新session的活跃taskId。

package/dist/src/task-manager.js

@@ -19,10 +19,11 @@ const activeTaskIds = _g.__xyActiveTaskIds;
 export function registerTaskId(sessionId, taskId, messageId) {
     const existing = activeTaskIds.get(sessionId);
     if (existing) {
-        logger.log(`[TASK_MANAGER] Updating taskId: ${existing.currentTaskId} → ${taskId}`);
+        logger.log(`[TASK_MANAGER] Updating taskId: ${existing.currentTaskId} → ${taskId}, refCount: ${existing.refCount} → ${existing.refCount + 1}`);
         existing.currentTaskId = taskId;
         existing.currentMessageId = messageId;
         existing.updatedAt = Date.now();
+        existing.refCount++;
         return true; // isUpdate
     }
     else {
@@ -31,8 +32,9 @@ export function registerTaskId(sessionId, taskId, messageId) {
             currentTaskId: taskId,
             currentMessageId: messageId,
             updatedAt: Date.now(),
+            refCount: 1,
         });
-        logger.log(`[TASK_MANAGER] Registered new taskId: ${taskId}`);
+        logger.log(`[TASK_MANAGER] Registered new taskId: ${taskId}, refCount: 1`);
         return false;
     }
 }
@@ -40,8 +42,17 @@ export function registerTaskId(sessionId, taskId, messageId) {
  * 移除session的活跃taskId（消息处理完成时调用）。
  */
 export function decrementTaskIdRef(sessionId) {
-    logger.log(`[TASK_MANAGER] Removing taskId`);
-    activeTaskIds.delete(sessionId);
+    const binding = activeTaskIds.get(sessionId);
+    if (!binding) {
+        logger.log(`[TASK_MANAGER] decrementTaskIdRef: no binding for ${sessionId}`);
+        return;
+    }
+    binding.refCount--;
+    logger.log(`[TASK_MANAGER] decrementTaskIdRef: taskId=${binding.currentTaskId}, refCount: ${binding.refCount + 1} → ${binding.refCount}`);
+    if (binding.refCount <= 0) {
+        activeTaskIds.delete(sessionId);
+        logger.log(`[TASK_MANAGER] Removed taskId binding (refCount reached 0)`);
+    }
 }
 /**
  * 获取session的当前活跃taskId。

package/package.json

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