@ynhcj/xiaoyi-channel 0.0.203-next → 0.0.204-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 { getSteerQueue } from "./src/steer-queue.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.
@@ -218,6 +219,30 @@ function registerFullHooks(api) {
     const beforePromptBuildHandler = createBeforePromptBuildHandler(skillRetrieverConfig);
     api.on("before_prompt_build", beforePromptBuildHandler);
     registerSelfEvolutionToolResultNudge(api);
+    // STEER INJECTION HOOK: reads pending steer messages queued by bot.ts
+    // and injects them as appendContext on the next agent turn.
+    // This bypasses dispatchReplyFromConfig's admitReplyTurn blocking.
+    //
+    // appendContext places the steer after the current prompt context (which
+    // includes the original user query + tool results), so the model sees:
+    //   [original context]\n\n用户追加诉求：<steer text>
+    //
+    // Key is deleted BEFORE splice to avoid a race: if bot.ts pushes a new
+    // message between splice and delete, it would be lost when delete removes
+    // the (now-repopulated) entry. With delete-first, bot.ts always creates a
+    // fresh entry for new messages.
+    api.on("agent_turn_prepare", async (_event, ctx) => {
+        const sessionKey = ctx.sessionKey;
+        if (!sessionKey)
+            return;
+        const queue = getSteerQueue();
+        const pending = queue.get(sessionKey);
+        if (!pending || pending.length === 0)
+            return;
+        queue.delete(sessionKey); // delete first to prevent race
+        const text = pending.splice(0).join("\n\n");
+        return { appendContext: `\n用户追加诉求：${text}` };
+    });
 }
 const pluginEntry = definePluginEntry({
     id: "xiaoyi-channel",

package/dist/src/bot.js

@@ -15,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";
 /**
@@ -339,6 +340,36 @@ export async function handleXYMessage(params) {
             ReplyToBody: undefined, // A2A protocol doesn't support reply/quote
             ...mediaPayload,
         });
+        // 🔑 Steer bypass: queue the message for agent_turn_prepare hook injection
+        // instead of going through dispatchReplyFromConfig which blocks on admitReplyTurn
+        // waiting for the active reply operation to complete.
+        //
+        // This covers BOTH:
+        //   1. Normal A2A steer (isUpdate && !skipReg) — user sends a message during
+        //      an active agent run
+        //   2. CSPL/self-evolution steer (isUpdate && skipReg) — hook-triggered
+        //      injection via tryInjectSteer. Without the bypass, CSPL steer would
+        //      deadlock: it runs inside the agent turn, so admitReplyTurn's
+        //      waitForIdle waits for the reply operation to finish, but the
+        //      operation is owned by the very same agent turn.
+        //
+        // The hook fires before every agent prompt build, so the steer text reaches
+        // the model on the next turn without blocking.
+        if (isUpdate) {
+            const steerQueue = getSteerQueue();
+            const pending = steerQueue.get(route.sessionKey) ?? [];
+            pending.push(textForAgent);
+            steerQueue.set(route.sessionKey, pending);
+            log.log(`[BOT] Steer bypass: queued for agent_turn_prepare hook, sessionKey=${route.sessionKey}, queueDepth=${pending.length}, skipReg=${skipReg}`);
+            // Only decrement refCount when registerTaskId was called (non-skipReg).
+            // skipReg callers (CSPL/self-evolution) don't increment refCount.
+            if (!skipReg) {
+                decrementTaskIdRef(parsed.sessionId);
+            }
+            // Release the global dispatch init gate — steer doesn't need it.
+            params.onInitComplete?.();
+            return;
+        }
         // 🔑 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 };

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, index.ts agent_turn_prepare hook reads.
+// Uses globalThis to survive module deduplication (same pattern as dispatcherUpdaters).
+const _g = globalThis;
+if (!_g.__xySteerInjectionQueue) {
+    _g.__xySteerInjectionQueue = new Map();
+}
+export function getSteerQueue() {
+    return _g.__xySteerInjectionQueue;
+}

package/package.json

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