@ynhcj/xiaoyi-channel 0.0.214-beta → 0.0.216-beta

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";
@@ -242,18 +241,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 +279,26 @@ 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`);
+        }
         // Resolve envelope format options (following feishu pattern)
         const envelopeOptions = core.channel.reply.resolveEnvelopeFormatOptions(cfg);
         // Build message body with speaker prefix (following feishu pattern)
@@ -358,8 +339,9 @@ 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`);
         // Cleanup: 必须在 onIdle 内部执行（参见 reply-dispatcher.ts 中 onIdleComplete 的注释）
@@ -384,8 +366,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
@@ -492,85 +475,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/monitor.js

@@ -1,8 +1,7 @@
 import { resolveXYConfig } from "./config.js";
 import { getXYWebSocketManager, diagnoseAllManagers, cleanupOrphanConnections, removeXYWebSocketManager } from "./client.js";
 import { handleXYMessage } from "./bot.js";
-import { parseA2AMessage } from "./parser.js";
-import { hasActiveTask, getAllActiveTaskBindings } from "./task-manager.js";
+import { getAllActiveTaskBindings } from "./task-manager.js";
 import { sendA2AResponse } from "./formatter.js";
 import { handleTriggerEvent } from "./trigger-handler.js";
 import { handleSelfEvolutionEvent, handleSelfEvolutionStateGetEvent } from "./self-evolution-handler.js";
@@ -119,46 +118,13 @@ export async function monitorXYProvider(opts = {}) {
                     activeMessages.delete(messageKey);
                 }
             };
-            // 🔑 核心改造：检测steer模式
-            // clearContext / tasks/cancel 没有 params，跳过 parseA2AMessage 直接入队
-            const messageMethod = message.method;
-            if (messageMethod === "clearContext" || messageMethod === "clear_context"
-                || messageMethod === "tasks/cancel" || messageMethod === "tasks_cancel") {
-                void enqueue(sessionId, task).catch((err) => {
-                    logger.error(`XY gateway: queue processing failed: ${String(err)}`);
-                    activeMessages.delete(messageKey);
-                });
-            }
-            else {
-                try {
-                    const parsed = parseA2AMessage(message);
-                    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}`);
-                        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)}`);
-                    void enqueue(sessionId, task).catch((err) => {
-                        logger.error(`XY gateway: queue processing failed: ${String(err)}`);
-                        activeMessages.delete(messageKey);
-                    });
-                }
-            }
+            // All messages go through the per-session serial queue.
+            // Steer detection and injection is handled by OpenClaw's auto-reply pipeline
+            // (src/auto-reply/reply/agent-runner.ts), not by the channel itself.
+            void enqueue(sessionId, task).catch((err) => {
+                logger.error(`XY gateway: queue processing failed: ${String(err)}`);
+                activeMessages.delete(messageKey);
+            });
         };
         const connectedHandler = (serverId) => {
             if (!loggedServers.has(serverId)) {

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/package.json

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