@ynhcj/xiaoyi-channel 0.0.141-next → 0.0.142-next

package/dist/src/bot.js

@@ -35,7 +35,8 @@ export async function handleXYMessage(params) {
             if (!sessionId) {
                 throw new Error("clearContext request missing sessionId in params");
             }
-            logger.log(`[BOT] Clear context request`);
+            const log = logger.withContext(sessionId, "");
+            log.log(`[BOT] Clear context request`);
             const config = resolveXYConfig(cfg);
             await sendClearContextResponse({
                 config,
@@ -51,7 +52,8 @@ export async function handleXYMessage(params) {
             if (!sessionId) {
                 throw new Error("tasks/cancel request missing sessionId in params");
             }
-            logger.log(`[BOT] Tasks cancel request, taskId=${taskId}`);
+            const log = logger.withContext(sessionId, taskId);
+            log.log(`[BOT] Tasks cancel request`);
             const config = resolveXYConfig(cfg);
             await sendTasksCancelResponse({
                 config,
@@ -63,19 +65,21 @@ export async function handleXYMessage(params) {
         }
         // Parse the A2A message (for regular messages)
         const parsed = parseA2AMessage(message);
+        // Scoped logger for this session — avoids concurrent session log mixing
+        const log = logger.withContext(parsed.sessionId, parsed.taskId);
         // ========== 检测 Trigger 消息 ==========
         // 如果消息中包含 Trigger 事件数据，直接返回 pushData 内容，不走正常流程
         const triggerData = extractTriggerData(parsed.parts);
         if (triggerData) {
-            logger.log(`[BOT] Detected Trigger message, pushDataId=${triggerData.pushDataId}`);
+            log.log(`[BOT] Detected Trigger message, pushDataId=${triggerData.pushDataId}`);
             try {
                 // 读取 pushData
                 const pushDataItem = await getPushDataById(triggerData.pushDataId);
                 if (!pushDataItem) {
-                    logger.error(`[BOT] ❌ pushData not found for ID: ${triggerData.pushDataId}`);
+                    log.error(`[BOT] pushData not found for ID: ${triggerData.pushDataId}`);
                     return;
                 }
-                logger.log(`[BOT] Found pushData, sending direct response, pushDataId=${pushDataItem.pushDataId}`);
+                log.log(`[BOT] Found pushData, sending direct response, pushDataId=${pushDataItem.pushDataId}`);
                 const config = resolveXYConfig(cfg);
                 // 直接发送响应（final=true，不走 openclaw 流程）
                 await sendA2AResponse({
@@ -87,11 +91,11 @@ export async function handleXYMessage(params) {
                     append: false,
                     final: true,
                 });
-                logger.log(`[BOT] Trigger response sent successfully`);
+                log.log(`[BOT] Trigger response sent successfully`);
                 return; // 提前返回，不继续处理
             }
             catch (err) {
-                logger.error(`[BOT] ❌ Failed to handle Trigger message:`, err);
+                log.error(`[BOT] Failed to handle Trigger message:`, err);
                 return;
             }
         }
@@ -100,7 +104,7 @@ export async function handleXYMessage(params) {
         const isUpdate = hasActiveTask(parsed.sessionId);
         const skipReg = params.skipRegistration === true;
         if (isUpdate) {
-            logger.log(`[BOT] STEER MODE - Second message detected, new taskId=${parsed.taskId}`);
+            log.log(`[BOT] STEER MODE - Second message detected, new taskId=${parsed.taskId}`);
         }
         // Steer injections skip taskId registration to avoid overwriting the active taskId
         if (!skipReg) {
@@ -108,28 +112,28 @@ export async function handleXYMessage(params) {
             // Extract and update push_id if present
             const pushId = extractPushId(parsed.parts);
             if (pushId) {
-                logger.log(`[BOT] Extracted push_id from user message`);
+                log.log(`[BOT] Extracted push_id from user message`);
                 configManager.updatePushId(parsed.sessionId, pushId);
                 // 持久化 pushId 到本地文件（异步，不阻塞主流程）
                 addPushId(pushId).catch((err) => {
-                    logger.error(`[BOT] Failed to persist pushId:`, err);
+                    log.error(`[BOT] Failed to persist pushId:`, err);
                 });
             }
             else {
-                logger.log(`[BOT] No push_id found in message, using config default`);
+                log.log(`[BOT] No push_id found in message, using config default`);
             }
             // 保存 runtime 信息到 .xiaoyiruntime 文件（异步，不阻塞主流程）
             saveRuntimeInfo(webSocketSessionId || parsed.sessionId, // SESSION_ID (WebSocket 层级，如果没有则 fallback)
             parsed.sessionId, // CONVERSATION_ID (param 里的 sessionId)
             parsed.taskId // TASK_ID (param.id)
             ).catch((err) => {
-                logger.error(`[BOT] Failed to save runtime info:`, err);
+                log.error(`[BOT] Failed to save runtime info:`, err);
             });
         }
         // Extract deviceType if present (always parse — used in ctxPayload.MessageSid)
         const deviceType = extractDeviceType(parsed.parts);
         if (deviceType) {
-            logger.log(`[BOT] Extracted deviceType: ${deviceType}`);
+            log.log(`[BOT] Extracted deviceType: ${deviceType}`);
         }
         // Resolve configuration (needed for status updates)
         const config = resolveXYConfig(cfg);
@@ -145,7 +149,7 @@ export async function handleXYMessage(params) {
                 id: parsed.sessionId, // ✅ Use sessionId to share context within the same conversation session
             },
         });
-        logger.log(`[BOT] Resolved route, sessionKey=${route.sessionKey}`);
+        log.log(`[BOT] Resolved route, sessionKey=${route.sessionKey}`);
         // Steer injections skip session registration to avoid refCount leaks
         if (!skipReg) {
             registerSession(route.sessionKey, {
@@ -157,7 +161,7 @@ export async function handleXYMessage(params) {
                 deviceType,
             });
             // 🔑 发送初始状态更新
-            logger.log(`[BOT] Sending initial status update`);
+            log.log(`[BOT] Sending initial status update`);
             void sendStatusUpdate({
                 config,
                 sessionId: parsed.sessionId,
@@ -166,7 +170,7 @@ export async function handleXYMessage(params) {
                 text: "任务正在处理中，请稍候~",
                 state: "working",
             }).catch((err) => {
-                logger.error(`Failed to send initial status update:`, err);
+                log.error(`Failed to send initial status update:`, err);
             });
         }
         // Extract text and files from parts
@@ -178,18 +182,18 @@ export async function handleXYMessage(params) {
                 const selfEvolutionEnabled = await selfEvolutionManager.isEnabled();
                 if (selfEvolutionEnabled && shouldNudgeForSelfEvolutionKeyword(textForAgent)) {
                     const shouldNudge = toolCallNudgeManager.tryMarkKeywordNudge(route.sessionKey);
-                    logger.log(`[SELF_EVOLUTION] Keyword check hit during inbound build: sessionKey=${route.sessionKey}, shouldNudge=${shouldNudge}`);
+                    log.log(`[SELF_EVOLUTION] Keyword check hit during inbound build: sessionKey=${route.sessionKey}, shouldNudge=${shouldNudge}`);
                     if (shouldNudge) {
                         const augmented = appendSelfEvolutionKeywordNudge(textForAgent);
                         textForAgent = augmented.text;
                         if (augmented.appended) {
-                            logger.log(`[SELF_EVOLUTION] Keyword-triggered inline nudge appended: sessionKey=${route.sessionKey}`);
+                            log.log(`[SELF_EVOLUTION] Keyword-triggered inline nudge appended: sessionKey=${route.sessionKey}`);
                         }
                     }
                 }
             }
             catch (selfEvolutionError) {
-                logger.error(`[SELF_EVOLUTION] Failed to append inline keyword nudge: ${String(selfEvolutionError)}`);
+                log.error(`[SELF_EVOLUTION] Failed to append inline keyword nudge: ${String(selfEvolutionError)}`);
             }
         }
         // 🔑 Steer消息: 跳过旧路径直接进入 streaming-signal 队列
@@ -204,10 +208,10 @@ export async function handleXYMessage(params) {
             const steerDownloadedFiles = await downloadFilesFromParts(steerFileParts);
             const steerMediaPayload = buildXYMediaPayload(steerDownloadedFiles);
             if (steerFileParts.length > 0) {
-                logger.log(`[BOT] Steer message with ${steerFileParts.length} file(s), enqueuing to streaming-signal queue`);
+                log.log(`[BOT] Steer message with ${steerFileParts.length} file(s), enqueuing to streaming-signal queue`);
             }
             else {
-                logger.log(`[BOT] Steer message — enqueuing to streaming-signal queue`);
+                log.log(`[BOT] Steer message — enqueuing to streaming-signal queue`);
             }
             await enqueueSteer({
                 sessionId: parsed.sessionId,
@@ -220,7 +224,7 @@ export async function handleXYMessage(params) {
                 route,
                 deviceType,
             });
-            logger.log(`[BOT] Steer queue completed`);
+            log.log(`[BOT] Steer queue completed`);
             return;
         }
         // ── First message (non-steer) path below ──────────────────────
@@ -232,7 +236,7 @@ export async function handleXYMessage(params) {
         if (!skipReg) {
             const fileParts = extractFileParts(parsed.parts);
             const downloadedFiles = await downloadFilesFromParts(fileParts);
-            logger.log(`[BOT] Downloaded ${downloadedFiles.length} file(s)`);
+            log.log(`[BOT] Downloaded ${downloadedFiles.length} file(s)`);
             mediaPayload = buildXYMediaPayload(downloadedFiles);
         }
         // Resolve envelope format options (following feishu pattern)
@@ -278,7 +282,7 @@ export async function handleXYMessage(params) {
         // 🔑 Streaming 信号已在上方创建（在文件下载之前）
         const steerState = { steered: false };
         // 🔑 创建dispatcher
-        logger.log(`[BOT-DISPATCHER] Creating reply dispatcher`);
+        log.log(`[BOT-DISPATCHER] Creating reply dispatcher`);
         const { dispatcher, replyOptions, markDispatchIdle, startStatusInterval } = createXYReplyDispatcher({
             cfg,
             runtime,
@@ -301,20 +305,20 @@ export async function handleXYMessage(params) {
             agentId: route.accountId,
             deviceType,
         };
-        logger.log(`[BOT-DISPATCH] withReplyDispatcher starting, sessionKey=${route.sessionKey}`);
+        log.log(`[BOT-DISPATCH] withReplyDispatcher starting, sessionKey=${route.sessionKey}`);
         await core.channel.reply.withReplyDispatcher({
             dispatcher,
             onSettled: () => {
-                logger.log(`[BOT] onSettled, steered=${steerState.steered}`);
+                log.log(`[BOT] onSettled, steered=${steerState.steered}`);
                 // 🔑 When steered, skip heavy cleanup — the first message's dispatcher is still running
                 if (steerState.steered) {
-                    logger.log(`[BOT] Steered dispatch settled, skipping cleanup`);
+                    log.log(`[BOT] Steered dispatch settled, skipping cleanup`);
                     return;
                 }
                 streamingSignals.delete(parsed.sessionId);
                 decrementTaskIdRef(parsed.sessionId);
                 unregisterSession(route.sessionKey);
-                logger.log(`[BOT] Cleanup completed`);
+                log.log(`[BOT] Cleanup completed`);
             },
             run: () => {
                 // 🔐 Use AsyncLocalStorage to provide session context to tools.
@@ -323,7 +327,7 @@ export async function handleXYMessage(params) {
                 // signal init complete to release the global dispatch gate
                 // for the next session.
                 const dispatchPromise = runWithSessionContext(sessionContext, async () => {
-                    logger.log(`[BOT-DISPATCH] dispatchReplyFromConfig starting, body.length=${ctxPayload.Body?.length ?? 0}`);
+                    log.log(`[BOT-DISPATCH] dispatchReplyFromConfig starting, body.length=${ctxPayload.Body?.length ?? 0}`);
                     try {
                         const result = await core.channel.reply.dispatchReplyFromConfig({
                             ctx: ctxPayload,
@@ -331,11 +335,11 @@ export async function handleXYMessage(params) {
                             dispatcher,
                             replyOptions,
                         });
-                        logger.log(`[BOT-DISPATCH] dispatchReplyFromConfig returned, result=${JSON.stringify(result)}`);
+                        log.log(`[BOT-DISPATCH] dispatchReplyFromConfig returned, result=${JSON.stringify(result)}`);
                         return result;
                     }
                     catch (dispatchErr) {
-                        logger.error(`[BOT-DISPATCH] dispatchReplyFromConfig threw: ${dispatchErr instanceof Error ? `${dispatchErr.name}: ${dispatchErr.message}` : String(dispatchErr)}`, dispatchErr instanceof Error ? dispatchErr.stack?.slice(0, 500) : undefined);
+                        log.error(`[BOT-DISPATCH] dispatchReplyFromConfig threw: ${dispatchErr instanceof Error ? `${dispatchErr.name}: ${dispatchErr.message}` : String(dispatchErr)}`, dispatchErr instanceof Error ? dispatchErr.stack?.slice(0, 500) : undefined);
                         throw dispatchErr;
                     }
                 });
@@ -344,19 +348,23 @@ export async function handleXYMessage(params) {
                 return dispatchPromise;
             },
         });
-        logger.log(`[BOT] Dispatcher completed`);
+        log.log(`[BOT] Dispatcher completed`);
     }
     catch (err) {
         // ✅ Only log error, don't re-throw to prevent gateway restart
-        logger.error("Failed to handle XY message:", err);
+        // Note: if error occurs before parseA2AMessage, `log` may not be defined yet
+        const errSessionId = message.params?.sessionId || "";
+        const errTaskId = message.params?.id || message.id || "";
+        const errLog = logger.withContext(errSessionId, errTaskId);
+        errLog.error("Failed to handle XY message:", err);
         runtime.error?.(`xy: Failed to handle message: ${String(err)}`);
-        logger.log(`[BOT] Error occurred, attempting cleanup`);
+        errLog.log(`[BOT] Error occurred, attempting cleanup`);
         // 🔑 错误时也要清理taskId和session
         try {
             const params = message.params;
             const sessionId = params?.sessionId;
             if (sessionId) {
-                logger.log(`[BOT] Cleaning up after error`);
+                errLog.log(`[BOT] Cleaning up after error`);
                 // 清理 taskId
                 decrementTaskIdRef(sessionId);
                 // 清理 session
@@ -371,11 +379,11 @@ export async function handleXYMessage(params) {
                     },
                 });
                 unregisterSession(route.sessionKey);
-                logger.log(`[BOT] Cleanup completed after error`);
+                errLog.log(`[BOT] Cleanup completed after error`);
             }
         }
         catch (cleanupErr) {
-            logger.log(`[BOT] Cleanup failed:`, cleanupErr);
+            errLog.log(`[BOT] Cleanup failed:`, cleanupErr);
             // Ignore cleanup errors
         }
         // ❌ Don't re-throw: message processing error should not affect gateway stability
@@ -412,20 +420,22 @@ const steerQueues = _g.__xySteerQueues;
  * 这是模型 API 被调用的精确时刻，此时 isStreaming 一定为 true。
  */
 export function notifyModelStreaming(sessionId) {
+    const log = logger.withContext(sessionId, "");
     const signal = streamingSignals.get(sessionId);
     if (signal) {
         // 不删除 signal——后续 steer 需要靠它判断模型已在 streaming。
         // 清理由第一条消息的 onSettled 兜底。
         signal.notify();
-        logger.log(`[STEER-QUEUE] Model streaming signal fired`);
+        log.log(`[STEER-QUEUE] Model streaming signal fired`);
     }
 }
 function createStreamingSignal(sessionId) {
+    const log = logger.withContext(sessionId, "");
     let resolve;
     const promise = new Promise(r => { resolve = r; });
     const signal = { promise, notify: resolve };
     streamingSignals.set(sessionId, signal);
-    logger.log(`[STEER-QUEUE] Streaming signal created`);
+    log.log(`[STEER-QUEUE] Streaming signal created`);
     return signal;
 }
 /**
@@ -435,13 +445,14 @@ function createStreamingSignal(sessionId) {
  */
 function enqueueSteer(params) {
     const { sessionId } = params;
+    const log = logger.withContext(sessionId, params.parsed.taskId);
     // 取出当前队列尾部（或 undefined），然后链上新的 Promise
     const prev = steerQueues.get(sessionId);
     const next = (prev ?? Promise.resolve()).then(() => dispatchSteerWhenReady(params));
     steerQueues.set(sessionId, next);
     // 链条结束后清理
     next.catch((err) => {
-        logger.error(`[STEER-QUEUE] Steer chain failed: ${String(err)}`);
+        log.error(`[STEER-QUEUE] Steer chain failed: ${String(err)}`);
     }).finally(() => {
         if (steerQueues.get(sessionId) === next) {
             steerQueues.delete(sessionId);
@@ -451,37 +462,38 @@ function enqueueSteer(params) {
 }
 async function dispatchSteerWhenReady(params) {
     const { sessionId, sessionKey, steerText } = params;
+    const log = logger.withContext(sessionId, params.parsed.taskId);
     // 1. 等待第一条消息开始 streaming
     //    signal 可能尚未创建（第一条消息还在文件下载等耗时操作中），
     //    轮询等待直到 signal 出现，最長等待 ~5 秒。
     let signal = streamingSignals.get(sessionId);
     if (!signal) {
-        logger.log(`[STEER-QUEUE] Signal not yet created, polling`);
+        log.log(`[STEER-QUEUE] Signal not yet created, polling`);
         for (let i = 0; i < 50; i++) {
             await new Promise(r => setTimeout(r, 100));
             signal = streamingSignals.get(sessionId);
             if (signal)
                 break;
             if (!hasActiveTask(sessionId)) {
-                logger.log(`[STEER-QUEUE] First message completed while waiting, skip steer`);
+                log.log(`[STEER-QUEUE] First message completed while waiting, skip steer`);
                 return;
             }
         }
     }
     if (signal) {
-        logger.log(`[STEER-QUEUE] Waiting for streaming signal`);
+        log.log(`[STEER-QUEUE] Waiting for streaming signal`);
         await signal.promise;
-        logger.log(`[STEER-QUEUE] Streaming signal received`);
+        log.log(`[STEER-QUEUE] Streaming signal received`);
     }
     else {
         // 轮询超时且 hasActiveTask 仍为 true——说明第一条消息可能卡在异常路径，
         // 没有创建 signal。此时 dispatch 会与第一条消息的模型调用并发冲突，放弃。
-        logger.log(`[STEER-QUEUE] Signal never appeared after polling, skip steer to avoid collision`);
+        log.log(`[STEER-QUEUE] Signal never appeared after polling, skip steer to avoid collision`);
         return;
     }
     // 2. 第一条消息已结束 → 放弃
     if (!hasActiveTask(sessionId)) {
-        logger.log(`[STEER-QUEUE] First message completed, skip steer`);
+        log.log(`[STEER-QUEUE] First message completed, skip steer`);
         return;
     }
     // 3. 构建 dispatch 上下文并 dispatch /steer
@@ -543,11 +555,11 @@ async function dispatchSteerWhenReady(params) {
         agentId: params.route.accountId,
         deviceType: params.deviceType,
     };
-    logger.log(`[STEER-QUEUE] Dispatching steer`);
+    log.log(`[STEER-QUEUE] Dispatching steer`);
     await core.channel.reply.withReplyDispatcher({
         dispatcher,
         onSettled: () => {
-            logger.log(`[STEER-QUEUE] Steer dispatch settled`);
+            log.log(`[STEER-QUEUE] Steer dispatch settled`);
         },
         run: () => {
             return runWithSessionContext(sessionContext, async () => {
@@ -557,10 +569,10 @@ async function dispatchSteerWhenReady(params) {
                     dispatcher,
                     replyOptions,
                 });
-                logger.log(`[STEER-QUEUE] dispatch result: ${JSON.stringify(result)}`);
+                log.log(`[STEER-QUEUE] dispatch result: ${JSON.stringify(result)}`);
                 return result;
             });
         },
     });
-    logger.log(`[STEER-QUEUE] Steer dispatch completed`);
+    log.log(`[STEER-QUEUE] Steer dispatch completed`);
 }

package/dist/src/reply-dispatcher.js

@@ -46,23 +46,19 @@ export async function cleanupStaleTempFiles(tempDir = "/tmp/xy_channel") {
  */
 export function createXYReplyDispatcher(params) {
     const { cfg, runtime, sessionId, taskId, messageId, accountId, steerState } = params;
-    // Create a scoped logger that always uses this session's sessionId
-    // and dynamically resolves the latest taskId
-    const scopedLog = () => logger.withContext(sessionId, getActiveTaskId());
-    scopedLog().log(`[DISPATCHER-CREATE] Creating dispatcher`);
     // 初始taskId和messageId（作为fallback）
     const initialTaskId = taskId;
     const initialMessageId = messageId;
-    /**
-     * 🔑 核心改造：动态获取当前活跃的taskId和messageId
-     * 每次需要taskId时，都从TaskManager获取最新值
-     */
     const getActiveTaskId = () => {
         return getCurrentTaskId(sessionId) ?? initialTaskId;
     };
     const getActiveMessageId = () => {
         return getCurrentMessageId(sessionId) ?? initialMessageId;
     };
+    // Create a scoped logger that always uses this session's sessionId
+    // and dynamically resolves the latest taskId
+    const scopedLog = () => logger.withContext(sessionId, getActiveTaskId());
+    scopedLog().log(`[DISPATCHER-CREATE] Creating dispatcher`);
     const core = getXYRuntime();
     const config = resolveXYConfig(cfg);
     // Simplified prefix context for single-account Xiaoyi channel

package/package.json

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