@ynhcj/xiaoyi-channel 0.0.211-next → 0.0.212-next

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";
 /**
@@ -299,6 +300,19 @@ export async function handleXYMessage(params) {
             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}`);
+        }
         // Resolve envelope format options (following feishu pattern)
         const envelopeOptions = core.channel.reply.resolveEnvelopeFormatOptions(cfg);
         // Build message body with speaker prefix (following feishu pattern)

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/steer-queue.js

@@ -1,5 +1,5 @@
-// Shared steer injection queue — bot.ts writes, index.ts agent_turn_prepare hook reads.
-// Uses globalThis to survive module deduplication (same pattern as dispatcherUpdaters).
+// 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();

package/package.json

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