@ynhcj/xiaoyi-channel 0.0.133-next → 0.0.134-next

package/dist/src/bot.js

@@ -197,11 +197,25 @@ export async function handleXYMessage(params) {
                 logger.error(`[SELF_EVOLUTION] Failed to append inline keyword nudge: ${String(selfEvolutionError)}`);
             }
         }
-        // 🔑 Steer消息加 /steer 前缀，触发core的 queueEmbeddedPiMessage
-        if (isUpdate && textForAgent) {
-            textForAgent = `/steer ${textForAgent}`;
-            logger.log(`[BOT] 🔄 Prepended /steer for steer injection`);
+        // 🔑 Steer消息: 跳过旧路径直接进入 streaming-signal 队列
+        // /steer 前缀由 dispatchSteerWhenReady 内部添加
+        if (isUpdate) {
+            logger.log(`[BOT] 🔄 Steer message — enqueuing to streaming-signal queue`);
+            await enqueueSteer({
+                sessionId: parsed.sessionId,
+                sessionKey: route.sessionKey,
+                steerText: textForAgent, // 原始文本，不带 /steer 前缀
+                cfg,
+                runtime,
+                parsed,
+                route,
+                deviceType,
+            });
+            logger.log(`[BOT] ✅ Steer queue completed for session: ${parsed.sessionId}`);
+            logger.log(`xy: dispatch complete (session=${parsed.sessionId})`);
+            return;
         }
+        // ── First message (non-steer) path below ──────────────────────
         // File download — only for real user messages, steer injections have no files
         let mediaPayload = {};
         if (!skipReg) {
@@ -250,14 +264,9 @@ export async function handleXYMessage(params) {
             ReplyToBody: undefined, // A2A protocol doesn't support reply/quote
             ...mediaPayload,
         });
-        // 🔑 Dynamic steer state: when isUpdate (second message), start as steered=true
-        // so the dispatcher skips all user-facing callbacks (deliver, onIdle, etc.)
-        // and onSettled skips cleanup.
-        const steerState = { steered: isUpdate };
         // 🔑 第一条消息创建 streaming 信号（provider.ts 的 wrapStreamFn 触发）
-        if (!isUpdate) {
-            createStreamingSignal(parsed.sessionId);
-        }
+        createStreamingSignal(parsed.sessionId);
+        const steerState = { steered: false };
         // 🔑 创建dispatcher
         logger.log(`[BOT-DISPATCHER] 🎯 Creating reply dispatcher`);
         logger.log(`[BOT-DISPATCHER]   - taskId: ${parsed.taskId}`);
@@ -335,19 +344,6 @@ export async function handleXYMessage(params) {
                 return dispatchPromise;
             },
         });
-        // 🔑 Steer 串行队列：等待 streaming 信号后 dispatch，多个 steer 按顺序处理
-        if (isUpdate) {
-            await enqueueSteer({
-                sessionId: parsed.sessionId,
-                sessionKey: route.sessionKey,
-                steerText: textForAgent,
-                cfg,
-                runtime,
-                parsed,
-                route,
-                deviceType,
-            });
-        }
         logger.log(`[BOT] ✅ Dispatcher completed for session: ${parsed.sessionId}`);
         logger.log(`xy: dispatch complete (session=${parsed.sessionId})`);
     }
@@ -403,7 +399,15 @@ function buildXYMediaPayload(mediaList) {
         MediaTypes: mediaTypes.length > 0 ? mediaTypes : undefined,
     };
 }
-const streamingSignals = new Map();
+// 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.__xyStreamingSignals)
+    _g.__xyStreamingSignals = new Map();
+if (!_g.__xySteerQueues)
+    _g.__xySteerQueues = new Map();
+const streamingSignals = _g.__xyStreamingSignals;
+const steerQueues = _g.__xySteerQueues;
 /**
  * 由 provider.ts 在 wrapStreamFn 调用时触发。
  * 这是模型 API 被调用的精确时刻，此时 isStreaming 一定为 true。
@@ -424,8 +428,6 @@ function createStreamingSignal(sessionId) {
     logger.log(`[STEER-QUEUE] 🟢 Streaming signal created for session ${sessionId}`);
     return signal;
 }
-/** Per-session 串行队列：保证同一 session 的 steer 消息按顺序处理 */
-const steerQueues = new Map();
 /**
  * 将 steer 消息放入 per-session 串行队列。
  * 等待第一条消息的 streaming 信号（deliver 首次触发），然后 dispatch。
@@ -463,7 +465,8 @@ async function dispatchSteerWhenReady(params) {
     // 3. 构建 dispatch 上下文并 dispatch /steer
     const core = getXYRuntime();
     const speaker = sessionId;
-    const messageBody = `${speaker}: ${steerText}`;
+    const steerCommand = `/steer ${steerText}`;
+    const messageBody = `${speaker}: ${steerCommand}`;
     const envelopeOptions = core.channel.reply.resolveEnvelopeFormatOptions(params.cfg);
     const body = core.channel.reply.formatAgentEnvelope({
         channel: "xiaoyi-channel",
@@ -474,8 +477,8 @@ async function dispatchSteerWhenReady(params) {
     });
     const ctxPayload = core.channel.reply.finalizeInboundContext({
         Body: body,
-        RawBody: steerText,
-        CommandBody: steerText,
+        RawBody: steerCommand,
+        CommandBody: steerCommand,
         From: sessionId,
         To: sessionId,
         SessionKey: params.route.sessionKey,

package/package.json

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