@ynhcj/xiaoyi-channel 0.0.206-beta → 0.0.208-beta

package/dist/src/channel.js

@@ -126,14 +126,27 @@ export const xyPlugin = {
                 ? { conversationId, matchPriority: 2 }
                 : null;
         },
-        resolveCommandConversation: ({ accountId }) => {
+        resolveCommandConversation: ({ accountId, sessionKey }) => {
             // xiaoyi-channel: the A2A sessionId IS the conversationId.
-            // Read from the current ALS session context.
+            // 1. Prefer the current ALS session context (works when the command
+            //    is processed inside an active A2A message-handling turn).
             const ctx = getCurrentSessionContext();
-            const sessionId = ctx?.sessionId?.trim();
-            if (!sessionId)
-                return null;
-            return { conversationId: sessionId };
+            const alsSessionId = ctx?.sessionId?.trim();
+            if (alsSessionId)
+                return { conversationId: alsSessionId };
+            // 2. Fall back to parsing the session key. For xiaoyi-channel the
+            //    session key has the form:
+            //      agent:<agentId>:xiaoyi-channel:<accountId>:<sessionId>
+            //    The last `:`-delimited segment is the A2A sessionId.
+            if (sessionKey) {
+                const lastColon = sessionKey.lastIndexOf(":");
+                if (lastColon >= 0) {
+                    const sessionId = sessionKey.slice(lastColon + 1).trim();
+                    if (sessionId)
+                        return { conversationId: sessionId };
+                }
+            }
+            return null;
         },
     },
     reload: {

package/dist/src/cspl/config.js

@@ -3,6 +3,9 @@
  */
 import fs from 'fs';
 import path from 'path';
+import { fileURLToPath } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 import { CONFIG_FILE_NAME, ENV_FILE_PATH, REQUIRED_ENV_VARS } from './constants.js';
 import { logger } from '../utils/logger.js';
 let cachedConfig = null;

package/dist/src/reply-dispatcher.js

@@ -430,15 +430,16 @@ export function createXYReplyDispatcher(params) {
                         }
                         else {
                             // 新文本不以已累积内容为前缀（如工具调用后模型重新开始生成），
-                            // 更新 accumulatedText 为当前文本，后续基于此新前缀做去重
+                            // 重置 accumulatedText 为当前文本，后续基于此新前缀做去重
                             const wasFirstRound = accumulatedText.length === 0;
-                            accumulatedText = "";
                             // 新一轮输出前加换行分隔（第一轮除外）
                             if (sendText.length > 0 && !wasFirstRound) {
                                 sendText = "\n" + sendText;
                             }
                         }
-                        accumulatedText += sendText;
+                        // 始终追踪模型的原始输出文本，避免注入的 "\n" 前缀污染 accumulatedText
+                        // 导致下一轮 startsWith 永久匹配失败
+                        accumulatedText = text;
                         hasSentResponse = true;
                         if (sendText.length > 0) {
                             await sendA2AResponse({

package/package.json

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