@ynhcj/xiaoyi-channel 0.0.143-beta → 0.0.145-beta

package/dist/src/bot.js

@@ -270,7 +270,7 @@ export async function handleXYMessage(params) {
             SenderId: parsed.sessionId,
             Provider: "xiaoyi-channel",
             Surface: "xiaoyi-channel",
-            MessageSid: `${parsed.taskId}_${deviceType}`,
+            MessageSid: `xiaoyi_${parsed.taskId}_${deviceType}`,
             Timestamp: Date.now(),
             WasMentioned: false,
             CommandAuthorized: true,
@@ -503,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({
@@ -527,7 +532,7 @@ async function dispatchSteerWhenReady(params) {
         SenderId: sessionId,
         Provider: "xiaoyi-channel",
         Surface: "xiaoyi-channel",
-        MessageSid: `${params.parsed.taskId}_${params.deviceType}`,
+        MessageSid: `xiaoyi_${params.parsed.taskId}_${params.deviceType}`,
         Timestamp: Date.now(),
         WasMentioned: false,
         CommandAuthorized: true,

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));
@@ -392,7 +397,9 @@ function trimUserMetadata(text) {
 }
 /**
  * Extract A2A taskId and deviceType from Conversation info JSON.
- * bot.ts stores them as MessageSid = "taskId_deviceType".
+ * bot.ts stores them as MessageSid = "xiaoyi_taskId_deviceType".
+ * The "xiaoyi_" prefix ensures extraction only happens for messages
+ * routed through xiaoyi-channel, not other channels sharing the provider.
  */
 function extractA2AFromConversationInfo(text) {
     const match = text.match(/Conversation info \(untrusted metadata\):\n```json\n([\s\S]*?)\n```/);
@@ -402,9 +409,9 @@ function extractA2AFromConversationInfo(text) {
     if (!msgIdMatch)
         return null;
     const parts = msgIdMatch[1].split("_");
-    if (parts.length < 2)
+    if (parts.length < 3 || parts[0] !== "xiaoyi")
         return null;
-    return { taskId: parts[0], deviceType: parts[1] };
+    return { taskId: parts[1], deviceType: parts[2] };
 }
 export const xiaoyiProvider = {
     id: "xiaoyiprovider",
@@ -527,12 +534,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.143-beta",
+  "version": "0.0.145-beta",
   "description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
   "type": "module",
   "main": "./dist/index.js",