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

package/dist/index.js

@@ -12,7 +12,6 @@ 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.
@@ -217,10 +216,7 @@ function registerFullHooks(api) {
         timeoutMs: pluginConfig.skillRetrieverTimeoutMs ?? 1000,
     });
     const beforePromptBuildHandler = createBeforePromptBuildHandler(skillRetrieverConfig);
-    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);
-    });
+    api.on("before_prompt_build", beforePromptBuildHandler);
     registerSelfEvolutionToolResultNudge(api);
 }
 const pluginEntry = definePluginEntry({

package/dist/src/bot.js

@@ -15,7 +15,6 @@ 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";
 /**
@@ -292,35 +291,6 @@ export async function handleXYMessage(params) {
             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)
@@ -365,7 +335,7 @@ export async function handleXYMessage(params) {
         // response and cleanup — the first message's dispatcher handles those.
         const steerState = { steered: isUpdate };
         // 🔑 创建dispatcher
-        log.log(`[BOT-DISPATCHER] Creating reply dispatcher, isSteer=${isUpdate}, sessionKey=${route.sessionKey}`);
+        log.log(`[BOT-DISPATCHER] Creating reply dispatcher`);
         // Cleanup: 必须在 onIdle 内部执行（参见 reply-dispatcher.ts 中 onIdleComplete 的注释）
         let cleaned = false;
         const cleanup = () => {
@@ -428,9 +398,8 @@ export async function handleXYMessage(params) {
                 // signal init complete to release the global dispatch gate
                 // for the next session.
                 const dispatchPromise = runWithSessionContext(sessionContext, async () => {
-                    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}`);
+                    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}`);
                     try {
                         const result = await core.channel.reply.dispatchReplyFromConfig({
                             ctx: ctxPayload,
@@ -438,13 +407,7 @@ export async function handleXYMessage(params) {
                             dispatcher,
                             replyOptions,
                         });
-                        // 区分 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}`);
-                        }
+                        log.log(`[BOT-DISPATCH] dispatchReplyFromConfig returned, result=${JSON.stringify(result)}`);
                         return result;
                     }
                     catch (dispatchErr) {

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,45 +118,13 @@ export async function monitorXYProvider(opts = {}) {
                     activeMessages.delete(messageKey);
                 }
             };
-            // 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") {
-                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) {
-                        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 {
-                    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/provider.js

@@ -11,7 +11,6 @@ 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;
@@ -593,26 +592,6 @@ 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,7 +230,6 @@ 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/task-manager.d.ts

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

package/dist/src/task-manager.js

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

package/package.json

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

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

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

package/dist/src/steer-queue.js

@@ -1,9 +0,0 @@
-// 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;
-}