@ynhcj/xiaoyi-channel 0.0.128-next → 0.0.129-next

package/dist/src/monitor.js

@@ -29,6 +29,27 @@ function createSessionQueue() {
         return next;
     };
 }
+/**
+ * Per-session serial queue for steer messages only.
+ * Steer messages must run concurrently with the main query (which may block for
+ * minutes inside the Pi agent loop), but must be serialized among themselves to
+ * prevent concurrent dispatchReplyFromConfig calls that can drop mid-stream
+ * steer messages under race conditions.
+ */
+function createSteerQueue() {
+    const queues = new Map();
+    return (sessionId, task) => {
+        const prev = queues.get(sessionId) ?? Promise.resolve();
+        const next = prev.then(task, task);
+        queues.set(sessionId, next);
+        void next.finally(() => {
+            if (queues.get(sessionId) === next) {
+                queues.delete(sessionId);
+            }
+        });
+        return next;
+    };
+}
 /**
  * Monitor XY channel WebSocket connections.
  * Keeps the connection alive until abortSignal is triggered.
@@ -65,6 +86,9 @@ export async function monitorXYProvider(opts = {}) {
     const activeMessages = new Set();
     // Create session queue for ordered message processing
     const enqueue = createSessionQueue();
+    // Steer-only serial queue: keeps steer messages concurrent with the main
+    // query but serialized among themselves to avoid race conditions.
+    const enqueueSteer = createSteerQueue();
     // Global gate that serializes dispatch initialization across sessions.
     // When a new session starts dispatching, it acquires this gate and holds it
     // until agent setup (agentTools + wrapStreamFn) is complete, then releases it.
@@ -118,11 +142,12 @@ export async function monitorXYProvider(opts = {}) {
                 const steerMode = cfg.messages?.queue?.mode === "steer";
                 const hasActiveRun = hasActiveTask(parsed.sessionId);
                 if (steerMode && hasActiveRun) {
-                    // Steer模式且有活跃任务：不入队列，直接并发执行
-                    logger.log(`[MONITOR-HANDLER] 🔄 STEER MODE: Executing concurrently for messageKey=${messageKey}`);
+                    // Steer模式且有活跃任务：通过 steer 专用队列串行执行，与主消息并发但
+                    // 避免多个 steer 同时进入 dispatchReplyFromConfig 导致中间消息丢失
+                    logger.log(`[MONITOR-HANDLER] 🔄 STEER MODE: Enqueuing steer for messageKey=${messageKey}`);
                     logger.log(`[MONITOR-HANDLER]   - sessionId: ${parsed.sessionId}`);
-                    void task().catch((err) => {
-                        logger.error(`XY gateway: concurrent steer task failed for ${messageKey}: ${String(err)}`);
+                    void enqueueSteer(parsed.sessionId, task).catch((err) => {
+                        logger.error(`XY gateway: steer queue processing failed for ${messageKey}: ${String(err)}`);
                         activeMessages.delete(messageKey);
                     });
                 }

package/dist/src/tools/session-manager.js

@@ -8,7 +8,7 @@ import { getCurrentTaskId, getCurrentMessageId } from "../task-manager.js";
  *  仅用于全局 Map 回退路径的清理，不影响 ALS 路径。
  *  工具已改为闭包捕获 ctx，此 TTL 仅作为防止 session 泄漏的最后防线。
  *  正常对话中 registerSession 会刷新 createdAt，所以长对话不受影响。 */
-const SESSION_TTL_MS = 60 * 60 * 1000; // 1 hour
+const SESSION_TTL_MS = 6 * 60 * 60 * 1000; // 6 hours
 // Use globalThis to ensure a single Map instance across all module copies.
 // The xy_channel plugin may be loaded by openclaw from different module resolution
 // paths (plugin entry vs tool registration), causing session-manager.ts to be

package/package.json

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