@ynhcj/xiaoyi-channel 0.0.136-next → 0.0.137-next

package/dist/src/bot.js

@@ -204,11 +204,19 @@ export async function handleXYMessage(params) {
             // 回调，onInitComplete 永远不会被触发。如果不释放，后续消息
             // 会被 globalDispatchInitGate 永久阻塞。
             params.onInitComplete?.();
+            // Steer 也支持文件 —— 提取并下载，附带到 mediaPayload
+            const steerFileParts = extractFileParts(parsed.parts);
+            const steerDownloadedFiles = await downloadFilesFromParts(steerFileParts);
+            const steerMediaPayload = buildXYMediaPayload(steerDownloadedFiles);
+            if (steerFileParts.length > 0) {
+                logger.log(`[BOT] 📎 Steer message with files: ${steerFileParts.length} file(s)`);
+            }
             logger.log(`[BOT] 🔄 Steer message — enqueuing to streaming-signal queue`);
             await enqueueSteer({
                 sessionId: parsed.sessionId,
                 sessionKey: route.sessionKey,
                 steerText: textForAgent, // 原始文本，不带 /steer 前缀
+                mediaPayload: steerMediaPayload,
                 cfg,
                 runtime,
                 parsed,
@@ -309,6 +317,7 @@ export async function handleXYMessage(params) {
                     logger.log(`[BOT] ✅ Steered dispatch settled (skipping cleanup)`);
                     return;
                 }
+                streamingSignals.delete(parsed.sessionId);
                 decrementTaskIdRef(parsed.sessionId);
                 unregisterSession(route.sessionKey);
                 logger.log(`[BOT] ✅ Cleanup completed`);
@@ -421,7 +430,8 @@ const steerQueues = _g.__xySteerQueues;
 export function notifyModelStreaming(sessionId) {
     const signal = streamingSignals.get(sessionId);
     if (signal) {
-        streamingSignals.delete(sessionId);
+        // 不删除 signal——后续 steer 需要靠它判断模型已在 streaming。
+        // 清理由第一条消息的 onSettled 兜底。
         signal.notify();
         logger.log(`[STEER-QUEUE] 📡 Model streaming signal fired for session=${sessionId}`);
     }
@@ -446,7 +456,9 @@ function enqueueSteer(params) {
     const next = (prev ?? Promise.resolve()).then(() => dispatchSteerWhenReady(params));
     steerQueues.set(sessionId, next);
     // 链条结束后清理
-    next.catch(() => { }).finally(() => {
+    next.catch((err) => {
+        logger.error(`[STEER-QUEUE] ❌ Steer chain failed: ${String(err)}`);
+    }).finally(() => {
         if (steerQueues.get(sessionId) === next) {
             steerQueues.delete(sessionId);
         }
@@ -475,11 +487,13 @@ async function dispatchSteerWhenReady(params) {
     if (signal) {
         logger.log(`[STEER-QUEUE] ⏳ Waiting for streaming signal, session=${sessionId}`);
         await signal.promise;
-        streamingSignals.delete(sessionId);
         logger.log(`[STEER-QUEUE] ✅ Streaming signal received, session=${sessionId}`);
     }
     else {
-        logger.log(`[STEER-QUEUE] ⚠️ Signal never appeared, proceeding without wait`);
+        // 轮询超时且 hasActiveTask 仍为 true——说明第一条消息可能卡在异常路径，
+        // 没有创建 signal。此时 dispatch 会与第一条消息的模型调用并发冲突，放弃。
+        logger.log(`[STEER-QUEUE] ⚠️ Signal never appeared after polling, skip steer to avoid collision`);
+        return;
     }
     // 2. 第一条消息已结束 → 放弃
     if (!hasActiveTask(sessionId)) {
@@ -489,7 +503,12 @@ async function dispatchSteerWhenReady(params) {
     // 3. 构建 dispatch 上下文并 dispatch /steer
     const core = getXYRuntime();
     const speaker = sessionId;
-    const steerCommand = `/steer ${steerText}`;
+    // 如果有文件附件，把路径拼到 steer 文本末尾，让模型通过工具读取
+    const mediaPaths = params.mediaPayload?.MediaPaths;
+    const fileHint = mediaPaths && mediaPaths.length > 0
+        ? `\n【用户上传附件】：${JSON.stringify(mediaPaths)}`
+        : "";
+    const steerCommand = `/steer ${steerText}${fileHint}`;
     const messageBody = `${speaker}: ${steerCommand}`;
     const envelopeOptions = core.channel.reply.resolveEnvelopeFormatOptions(params.cfg);
     const body = core.channel.reply.formatAgentEnvelope({
@@ -520,6 +539,7 @@ async function dispatchSteerWhenReady(params) {
         OriginatingChannel: "xiaoyi-channel",
         OriginatingTo: sessionId,
         ReplyToBody: undefined,
+        ...params.mediaPayload,
     });
     const steerState = { steered: true };
     const { dispatcher, replyOptions } = createXYReplyDispatcher({

package/dist/src/provider.js

@@ -46,6 +46,11 @@ function getFirstUserText(messages) {
 }
 /** Regex to match `[cron:<uuid> <title>]` anywhere in text. */
 const CRON_TAG_RE = /\[cron:[^\s\]]+\s+([^\]]+)\]/;
+/** Extract the cron job UUID from the first user message, e.g. `[cron:abc123 ...]` → `abc123`. */
+function extractCronUuid(messages) {
+    const match = getFirstUserText(messages).match(/\[cron:([^\s\]]+)/i);
+    return match ? match[1] : undefined;
+}
 /** Check if the request is triggered by a cron job by inspecting the first user message. */
 function isCronTriggered(messages) {
     return /\[cron:/i.test(getFirstUserText(messages));
@@ -527,12 +532,29 @@ export const xiaoyiProvider = {
                     const traceId = ctx.extraParams[HEADER_TRACE_ID];
                     const sessionId = ctx.extraParams[HEADER_SESSION_ID];
                     const interactionId = ctx.extraParams[HEADER_INTERACTION_ID];
-                    if (typeof traceId === "string")
-                        dynamicHeaders[HEADER_TRACE_ID] = traceId;
-                    if (typeof sessionId === "string")
-                        dynamicHeaders[HEADER_SESSION_ID] = sessionId;
-                    if (typeof interactionId === "string")
-                        dynamicHeaders[HEADER_INTERACTION_ID] = interactionId;
+                    const isCronCached = isCronTriggered(context.messages);
+                    if (isCronCached) {
+                        // Cron: generate fresh sessionId from cron UUID so each invocation
+                        // is independently tracked, regardless of stale activeSessions state.
+                        const cronUuid = extractCronUuid(context.messages) ?? "cron";
+                        const cronSessionId = `cron_${cronUuid}_${Date.now()}`;
+                        dynamicHeaders[HEADER_TRACE_ID] = cronSessionId;
+                        dynamicHeaders[HEADER_SESSION_ID] = cronUuid;
+                        dynamicHeaders[HEADER_INTERACTION_ID] = cronSessionId;
+                        const cronTitle = extractCronTitle(context.messages);
+                        if (cronTitle)
+                            dynamicHeaders["x-cron-title"] = encodeURIComponent(cronTitle);
+                        if (context.messages?.length === 1)
+                            dynamicHeaders["x-cron-flag"] = "begin";
+                    }
+                    else {
+                        if (typeof traceId === "string")
+                            dynamicHeaders[HEADER_TRACE_ID] = traceId;
+                        if (typeof sessionId === "string")
+                            dynamicHeaders[HEADER_SESSION_ID] = sessionId;
+                        if (typeof interactionId === "string")
+                            dynamicHeaders[HEADER_INTERACTION_ID] = interactionId;
+                    }
                 }
             }
             // 记录输入

package/package.json

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