@ynhcj/xiaoyi-channel 0.0.209-next → 0.0.210-next

package/dist/index.js

@@ -12,19 +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";
 import { logger } from "./src/utils/logger.js";
-import fs from "node:fs";
-import path from "node:path";
-// Diagnostic: write marker file to confirm hook fires
-function touchHookMarker(label) {
-    try {
-        const dir = "/tmp/xy-steer-diag";
-        fs.mkdirSync(dir, { recursive: true });
-        fs.writeFileSync(path.join(dir, `${Date.now()}_${label}.txt`), `${new Date().toISOString()} ${label}\n`);
-    }
-    catch { }
-}
 /**
  * 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.
@@ -228,43 +216,10 @@ function registerFullHooks(api) {
         envFilePath: "~/.openclaw/.xiaoyienv",
         timeoutMs: pluginConfig.skillRetrieverTimeoutMs ?? 1000,
     });
-    const baseBeforePromptBuildHandler = createBeforePromptBuildHandler(skillRetrieverConfig);
-    // STEER INJECTION: merged into the before_prompt_build handler so it runs
-    // in the same hook registration call that we know already works (skill-retriever).
-    // This avoids any issues with separate api.on() registrations not being
-    // picked up by the global hook runner.
-    touchHookMarker("register_hook");
+    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"}`);
-        // Run skill-retriever first
-        const baseResult = await baseBeforePromptBuildHandler(event, ctx);
-        // Check for pending steer messages queued by bot.ts.
-        const sessionKey = ctx.sessionKey;
-        const queue = getSteerQueue();
-        const pending = sessionKey ? queue.get(sessionKey) : undefined;
-        const allKeys = Array.from(queue.keys());
-        // Diagnostic: write state to marker file for each hook fire
-        touchHookMarker(`hook_sessionKey=${sessionKey || "undefined"}_` +
-            `pendingLen=${pending?.length ?? 0}_` +
-            `queueSize=${queue.size}_` +
-            `queueKeys=${allKeys.join(",") || "empty"}`);
-        if (!sessionKey || !pending || pending.length === 0)
-            return baseResult;
-        // Drain pending steer messages
-        queue.delete(sessionKey);
-        const steerText = pending.splice(0).join("\n\n");
-        const steerAppend = `\n用户追加诉求：${steerText}`;
-        logger.log(`[STEER-HOOK] Injecting steer: sessionKey=${sessionKey} textLen=${steerText.length}`);
-        touchHookMarker(`steer_ok_${sessionKey}`);
-        // Merge steer appendContext with skill-retriever's result
-        const merged = { ...(baseResult ?? {}) };
-        if (merged.appendContext) {
-            merged.appendContext = `${merged.appendContext}\n\n${steerAppend}`;
-        }
-        else {
-            merged.appendContext = steerAppend;
-        }
-        return merged;
+        return beforePromptBuildHandler(event, ctx);
     });
     registerSelfEvolutionToolResultNudge(api);
 }

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";
 /**
@@ -315,12 +314,17 @@ export async function handleXYMessage(params) {
             envelope: envelopeOptions,
             body: messageBody,
         });
+        // 🔑 Steer messages use /steer prefix to trigger the native slash command
+        // fast path in get-reply, which calls handleSteerCommand → queueEmbedded-
+        // AgentMessageWithOutcomeAsync without going through admitReplyTurn or
+        // the isStreaming guard in runReplyAgent.
+        const steerCommandBody = isUpdate ? `/steer ${textForAgent}` : textForAgent;
         // ✅ Finalize inbound context (following feishu pattern)
         // Use route.accountId and route.sessionKey instead of parsed fields
         const ctxPayload = core.channel.reply.finalizeInboundContext({
             Body: body,
-            RawBody: textForAgent,
-            CommandBody: textForAgent,
+            RawBody: steerCommandBody,
+            CommandBody: steerCommandBody,
             From: parsed.sessionId,
             To: parsed.sessionId, // ✅ Simplified: use sessionId as target (context is managed by SessionKey)
             SessionKey: route.sessionKey, // ✅ Use route.sessionKey
@@ -340,41 +344,6 @@ 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();
-            // Use route.sessionKey as the queue key. The hook looks up by
-            // ctx.sessionKey which is the same value (agent:main:direct:<peerId>).
-            // Do NOT use parsed.sessionId because ctx.sessionId in the hook
-            // context is OpenClaw's internal random UUID, not the A2A sessionId.
-            const queueKey = route.sessionKey;
-            const pending = steerQueue.get(queueKey) ?? [];
-            pending.push(textForAgent);
-            steerQueue.set(queueKey, pending);
-            log.log(`[BOT] Steer bypass: queued for agent_turn_prepare hook, queueKey=${queueKey}, 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/package.json

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