@ynhcj/xiaoyi-channel 0.0.112-next → 0.0.113-next

package/dist/src/bot.js

@@ -209,10 +209,6 @@ export async function handleXYMessage(params) {
         const envelopeOptions = core.channel.reply.resolveEnvelopeFormatOptions(cfg);
         // Build message body with speaker prefix (following feishu pattern)
         let messageBody = textForAgent;
-        // Embed A2A taskId marker before the user query so the provider can
-        // extract it from messages without relying on AsyncLocalStorage.
-        // The provider strips this marker before sending to the model.
-        messageBody = `xiaoyiA2A info[taskId:${parsed.taskId},deviceType:${deviceType}] ${messageBody}`;
         // Add speaker prefix for clarity
         const speaker = parsed.sessionId;
         messageBody = `${speaker}: ${messageBody}`;
@@ -240,7 +236,7 @@ export async function handleXYMessage(params) {
             SenderId: parsed.sessionId,
             Provider: "xiaoyi-channel",
             Surface: "xiaoyi-channel",
-            MessageSid: parsed.messageId,
+            MessageSid: `${parsed.taskId}_${deviceType}`,
             Timestamp: Date.now(),
             WasMentioned: false,
             CommandAuthorized: true,

package/dist/src/provider.js

@@ -388,6 +388,22 @@ function trimUserMetadata(text) {
     text = text.replace(/\n*Sender \(untrusted metadata\):\n```json\n[\s\S]*?\n```\n*/, "\n");
     return text.replace(/\n{3,}/g, "\n\n");
 }
+/**
+ * Extract A2A taskId and deviceType from Conversation info JSON.
+ * bot.ts stores them as MessageSid = "taskId_deviceType".
+ */
+function extractA2AFromConversationInfo(text) {
+    const match = text.match(/Conversation info \(untrusted metadata\):\n```json\n([\s\S]*?)\n```/);
+    if (!match)
+        return null;
+    const msgIdMatch = match[1].match(/"message_id"\s*:\s*"([^"]+)"/);
+    if (!msgIdMatch)
+        return null;
+    const parts = msgIdMatch[1].split("_");
+    if (parts.length < 2)
+        return null;
+    return { taskId: parts[0], deviceType: parts[1] };
+}
 export const xiaoyiProvider = {
     id: "xiaoyiprovider",
     label: "Xiaoyi Provider",
@@ -442,53 +458,30 @@ export const xiaoyiProvider = {
         const underlying = ctx.streamFn;
         if (!underlying)
             return underlying;
-        // ── Regex to extract A2A taskId/deviceType from user messages ──
-        // bot.ts embeds: xiaoyiA2A info[taskId:<id>,deviceType:<type>]
-        const A2A_MARKER_RE = /xiaoyiA2A info\[taskId:([^\],]+)(?:,deviceType:([^\]]+))?\]\s*/;
         return async (model, context, options) => {
             const dynamicHeaders = {};
-            // ── Extract A2A taskId/deviceType from user messages ──
-            // Scan from last user message backwards; strip the marker from all.
-            let resolvedTaskId = null;
-            let resolvedDeviceType = null;
+            // ── Extract A2A taskId/deviceType from Conversation info ──
+            // bot.ts stores taskId_deviceType as MessageSid, which the framework
+            // renders as message_id in the Conversation info JSON block.
+            let extractedTaskId = null;
+            let extractedDeviceType = null;
             if (context.messages) {
-                console.log(`[xiaoyiprovider] user messages BEFORE strip (count=${context.messages.filter(m => m.role === "user").length}):`);
-                for (const msg of context.messages) {
-                    if (msg.role !== "user")
-                        continue;
-                    const preview = typeof msg.content === "string"
-                        ? msg.content.slice(0, 200)
-                        : JSON.stringify(msg.content).slice(0, 200);
-                    console.log(`[xiaoyiprovider]   user: ${preview}`);
-                }
                 for (let i = context.messages.length - 1; i >= 0; i--) {
                     const msg = context.messages[i];
-                    if (msg.role !== "user" || !msg.content)
+                    if (msg.role !== "user")
                         continue;
-                    const extract = (text) => {
-                        const match = text.match(A2A_MARKER_RE);
-                        if (match) {
-                            if (!resolvedTaskId)
-                                resolvedTaskId = match[1] ?? null;
-                            if (!resolvedDeviceType)
-                                resolvedDeviceType = match[2] ?? null;
-                            return text.replace(A2A_MARKER_RE, "");
-                        }
-                        return null;
-                    };
-                    if (typeof msg.content === "string") {
-                        const stripped = extract(msg.content);
-                        if (stripped !== null)
-                            msg.content = stripped;
-                    }
-                    else if (Array.isArray(msg.content)) {
-                        for (const block of msg.content) {
-                            if (block.type === "text" && typeof block.text === "string") {
-                                const stripped = extract(block.text);
-                                if (stripped !== null)
-                                    block.text = stripped;
-                            }
-                        }
+                    const text = typeof msg.content === "string"
+                        ? msg.content
+                        : Array.isArray(msg.content)
+                            ? msg.content.find((b) => b.type === "text")?.text ?? ""
+                            : "";
+                    if (!text)
+                        continue;
+                    const extracted = extractA2AFromConversationInfo(text);
+                    if (extracted) {
+                        extractedTaskId = extracted.taskId;
+                        extractedDeviceType = extracted.deviceType;
+                        break;
                     }
                 }
             }
@@ -510,9 +503,9 @@ export const xiaoyiProvider = {
                             dynamicHeaders["x-cron-flag"] = "begin";
                     }
                 }
-                else if (resolvedTaskId) {
-                    // Session mode: taskId extracted from user message marker
-                    const traceId = resolvedTaskId;
+                else if (extractedTaskId) {
+                    // Session mode: taskId extracted from Conversation info
+                    const traceId = extractedTaskId;
                     const sessionId = traceId.split("&")[0];
                     const interactionId = traceId.split("&")[1] ?? "";
                     const isCron = isCronTriggered(context.messages);
@@ -524,13 +517,11 @@ export const xiaoyiProvider = {
                         if (context.messages?.length === 1)
                             dynamicHeaders["x-cron-flag"] = "begin";
                     }
-                    if (typeof sessionId === "string")
-                        dynamicHeaders[HEADER_SESSION_ID] = sessionId;
-                    if (typeof interactionId === "string")
-                        dynamicHeaders[HEADER_INTERACTION_ID] = interactionId;
+                    dynamicHeaders[HEADER_SESSION_ID] = sessionId;
+                    dynamicHeaders[HEADER_INTERACTION_ID] = interactionId;
                 }
                 else {
-                    // No marker found – fall back to extraParams cached values
+                    // Fallback: use extraParams cached values
                     const traceId = ctx.extraParams[HEADER_TRACE_ID];
                     const sessionId = ctx.extraParams[HEADER_SESSION_ID];
                     const interactionId = ctx.extraParams[HEADER_INTERACTION_ID];
@@ -547,9 +538,11 @@ export const xiaoyiProvider = {
             if (context.systemPrompt) {
                 console.log(`[xiaoyiprovider] system prompt length: ${context.systemPrompt.length}`);
             }
-            // deviceType: prefer marker-extracted value, fall back to extraParams
+            // deviceType: prefer value extracted from Conversation info,
+            // then extraParams, then ALS fallback.
             const extraParamsDeviceType = ctx.extraParams?.[DEVICE_TYPE_KEY] || undefined;
-            const deviceType = resolvedDeviceType || extraParamsDeviceType || undefined;
+            const deviceType = (extractedDeviceType || extraParamsDeviceType)
+                ?? getCurrentSessionContext()?.deviceType;
             // 在发送给模型前，优化 systemPrompt 结构
             if (context.systemPrompt) {
                 let sp = context.systemPrompt;

package/package.json

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