@ynhcj/xiaoyi-channel 0.0.160-beta → 0.0.161-beta

package/dist/src/parser.js

@@ -46,6 +46,36 @@ export function extractDataEvents(parts) {
         .filter((event) => event !== undefined);
 }
 export function extractRunCrossTaskContext(parts) {
+    const normalizeSentFiles = (value) => {
+        if (!Array.isArray(value)) {
+            return [];
+        }
+        return value
+            .map((item) => {
+            if (!item || typeof item !== "object") {
+                return null;
+            }
+            const candidate = item;
+            const fileLocalUrls = Array.isArray(candidate.fileLocalUrls)
+                ? candidate.fileLocalUrls.filter((url) => typeof url === "string" && url.length > 0)
+                : [];
+            const fileRemoteUrls = Array.isArray(candidate.fileRemoteUrls)
+                ? candidate.fileRemoteUrls.filter((url) => typeof url === "string" && url.length > 0)
+                : [];
+            const fileNames = Array.isArray(candidate.fileNames)
+                ? candidate.fileNames.filter((name) => typeof name === "string" && name.length > 0)
+                : [];
+            if (fileLocalUrls.length === 0 && fileRemoteUrls.length === 0) {
+                return null;
+            }
+            return {
+                ...(fileLocalUrls.length > 0 ? { fileLocalUrls } : {}),
+                ...(fileRemoteUrls.length > 0 ? { fileRemoteUrls } : {}),
+                ...(fileNames.length > 0 && fileNames.length === fileRemoteUrls.length ? { fileNames } : {}),
+            };
+        })
+            .filter((item) => item !== null);
+    };
     for (const part of parts) {
         if (part.kind !== "data" || !part.data) {
             continue;
@@ -64,7 +94,7 @@ export function extractRunCrossTaskContext(parts) {
             isDistributed: context.isDistributed === true,
             networkId,
             isSupportAgent: context.isSupportAgent !== false,
-            fileUrls: Array.isArray(context.fileUrls) ? context.fileUrls.filter((url) => typeof url === "string") : [],
+            sentFiles: normalizeSentFiles(context.sentFiles),
             rawContext: context,
         };
     }

package/dist/src/provider.js

@@ -536,26 +536,28 @@ export const xiaoyiProvider = {
                 const beforeLen = sp.length;
                 // 删除 ## Tooling 与 TOOLS.md 声明之间的内容
                 sp = sp.replace(/(## Tooling)[\s\S]*?(TOOLS\.md does not control tool availability; it is user guidance for how to use external tools\.)/, "$1\n\n$2");
-                // (1) 提取 ## Skills (mandatory) 到 </available_skills> 作为第一部分
-                const skillsMatch = sp.match(/(## Skills \(mandatory\)[\s\S]*?<\/available_skills>)/);
-                const part1 = skillsMatch ? skillsMatch[0] : '';
-                // (2) 提取 ## /home/sandbox/.openclaw/workspace/SOUL.md 到 ## /home/sandbox/.openclaw/workspace/TOOLS.md 之前的内容作为第二部分
-                const soulMatch = sp.match(/(## \/home\/sandbox\/\.openclaw\/workspace\/SOUL\.md[\s\S]*?)(?=## \/home\/sandbox\/\.openclaw\/workspace\/TOOLS\.md)/);
-                const part2 = soulMatch ? soulMatch[1].trim() : '';
-                if (part1 || part2) {
-                    // 从原始位置删除已提取的部分
-                    if (skillsMatch)
-                        sp = sp.replace(skillsMatch[0], '');
-                    if (soulMatch)
+                // (1) Skills 部分：移动到 ## Runtime 之前
+                if (sp.includes('## Runtime')) {
+                    // 提取 ## Skills (mandatory) 到 </available_skills> 作为第一部分
+                    const skillsMatch = sp.match(/(## Skills \(mandatory\)[\s\S]*?<\/available_skills>)/);
+                    if (skillsMatch) {
+                        const part1 = skillsMatch[0];
+                        sp = sp.replace(part1, '');
+                        sp = sp.replace('## Runtime', part1 + '\n\n## Runtime');
+                    }
+                }
+                // (2) SOUL.md 部分：移动到 ## Silent Replies 之前
+                if (sp.includes('## Silent Replies')) {
+                    // 提取 ## /home/sandbox/.openclaw/workspace/SOUL.md 到 其特定脚注结束标志 的内容作为第二部分
+                    const soulMatch = sp.match(/(## \/home\/sandbox\/\.openclaw\/workspace\/SOUL\.md[\s\S]*?_This file is yours to evolve\. As you learn who you are, update it\._)/);
+                    if (soulMatch) {
+                        const part2 = soulMatch[1].trim();
                         sp = sp.replace(soulMatch[1], '');
-                    // 清理多余空行
-                    sp = sp.replace(/\n{3,}/g, '\n\n');
-                    // (3) 将 第二部分 + 第一部分 插入到 ## Runtime 上面
-                    const combined = (part2 + '\n\n' + part1).trim();
-                    if (combined && sp.includes('## Runtime')) {
-                        sp = sp.replace('## Runtime', combined + '\n\n## Runtime');
+                        sp = sp.replace('## Silent Replies', part2 + '\n\n## Silent Replies');
                     }
                 }
+                // 清理多余空行
+                sp = sp.replace(/\n{3,}/g, '\n\n');
                 logger.log(`[xiaoyiprovider] system prompt optimized: ${beforeLen} -> ${sp.length}`);
                 context.systemPrompt = sp;
             }

package/dist/src/reply-dispatcher.js

@@ -23,7 +23,7 @@ function buildDistributionStatusCommand(context) {
         },
     };
 }
-function buildCrossTaskExecuteResultCommand(code, message, fileUrls = []) {
+function buildCrossTaskExecuteResultCommand(code, message, sentFiles = []) {
     return {
         header: {
             namespace: "DistributionInteraction",
@@ -32,15 +32,15 @@ function buildCrossTaskExecuteResultCommand(code, message, fileUrls = []) {
         payload: {
             code,
             message,
-            fileUrls,
+            sentFiles,
         },
     };
 }
 async function sendRunCrossTaskResult(params) {
     const { config, sessionId, taskId, messageId, context, resultCode, resultMessage } = params;
-    const fileUrls = Array.isArray(context.fileUrls) ? context.fileUrls : [];
+    const sentFiles = Array.isArray(context.sentFiles) ? context.sentFiles : [];
     const statusCommand = buildDistributionStatusCommand(context);
-    const resultCommand = buildCrossTaskExecuteResultCommand(resultCode, resultMessage, fileUrls);
+    const resultCommand = buildCrossTaskExecuteResultCommand(resultCode, resultMessage, sentFiles);
     await sendCommand({
         config,
         sessionId,
@@ -48,7 +48,7 @@ async function sendRunCrossTaskResult(params) {
         messageId,
         commands: [statusCommand, resultCommand],
     });
-    logger.log(`${RUN_CROSS_TASK_LOG_TAG} sent cross-task result, sessionId=${sessionId}, taskId=${taskId}, code=${resultCode}, fileUrlCount=${fileUrls.length}, messageLength=${resultMessage.length}`);
+    logger.log(`${RUN_CROSS_TASK_LOG_TAG} sent cross-task result, sessionId=${sessionId}, taskId=${taskId}, code=${resultCode}, sentFileCount=${sentFiles.length}, messageLength=${resultMessage.length}`);
 }
 /**
  * 清理 /tmp/xy_channel 目录中超过 24 小时的旧文件
@@ -321,6 +321,7 @@ export function createXYReplyDispatcher(params) {
         dispatcher,
         replyOptions: {
             ...replyOptions,
+            suppressToolErrorWarnings: true,
             onModelSelected: prefixContext.onModelSelected,
             onToolStart: async ({ name, phase }) => {
                 // 🔑 steered dispatch不发送tool状态（让主dispatcher处理）

package/dist/src/tools/discover-cross-devices-tool.js

@@ -106,7 +106,7 @@ export function createDiscoverCrossDevicesTool(ctx) {
 
 当用户明确表达要从另一台设备获取、查找、使用或操作内容时，必须优先调用本工具，例如从 PC、电脑、平板、手机等设备获取文件或查找内容。
 
-本工具只做设备发现和目标设备推荐，不会读取副设备文件内容，不会上传文件，也不会真正下发跨端执行任务。`,
+本工具只做设备发现和目标设备推荐，不会读取副设备文件内容，不会上传文件，也不会真正下发跨端执行任务。下发跨端执行任务需要使用SendCrossDeviceTaskTool`,
         parameters: {
             type: "object",
             properties: {

package/dist/src/tools/send-cross-device-task-tool.js

@@ -18,9 +18,9 @@ function buildResultText(result) {
     };
 }
 function buildModelToolResult(result) {
-    const fileUrls = result.fileUrls;
+    const sentFiles = result.sentFiles;
     const resultStatus = result.success
-        ? fileUrls.length > 0
+        ? sentFiles.length > 0
             ? "对端设备执行任务成功且返回有文件"
             : "对端设备执行任务成功且返回无文件"
         : "对端设备任务失败";
@@ -46,35 +46,31 @@ function buildModelToolResult(result) {
         resultStatus,
     };
 }
-function extractFileUrl(message) {
-    const matches = message.match(/https?:\/\/[^\s<>"']+/g);
-    const firstUrl = matches?.[0] ?? "";
-    return firstUrl.replace(/[，。；、！？,.!?;:)\]}]+$/u, "");
-}
 function buildCrossDeviceResult(params) {
-    const payloadFileUrls = params.success ? params.fileUrls.filter((url) => typeof url === "string" && url.length > 0) : [];
-    const messageFileUrl = params.success ? extractFileUrl(params.message) : "";
-    const fileUrls = Array.from(new Set([...payloadFileUrls, ...(messageFileUrl ? [messageFileUrl] : [])]));
     const result = {
         success: params.success,
         code: params.code,
         message: params.message,
-        fileUrls,
+        sentFiles: params.sentFiles,
         rawEvent: params.rawEvent,
     };
     return result;
 }
 async function autoSendFileToUserIfNeeded(result, ctx) {
-    const fileUrls = result.fileUrls;
-    if (fileUrls.length === 0) {
+    const sentFiles = Array.isArray(result.sentFiles) ? result.sentFiles : [];
+    if (sentFiles.length === 0) {
         return result;
     }
-    logger.log(`${SEND_CROSS_RESULT_LOG_TAG} auto sending ${fileUrls.length} cross-device file(s) to user`);
+    logger.log(`${SEND_CROSS_RESULT_LOG_TAG} auto sending ${sentFiles.length} cross-device file(s) to user`);
     try {
         const sendFileTool = createSendFileToUserTool(ctx);
-        const sendFileResult = await sendFileTool.execute("auto_send_cross_device_file", {
-            fileRemoteUrls: fileUrls,
-        });
+        const sendFileResult = await (async () => {
+            const results = [];
+            for (const sentFileParams of sentFiles) {
+                results.push(await sendFileTool.execute("auto_send_cross_device_file", sentFileParams));
+            }
+            return results;
+        })();
         logger.log(`${SEND_CROSS_RESULT_LOG_TAG} auto send_file_to_user completed`);
         return {
             ...result,
@@ -222,7 +218,7 @@ export function createSendCrossDeviceTaskTool(ctx) {
                     }
                     settled = true;
                     const modelResult = buildModelToolResult(result);
-                    logger.log(`${LOG_TAG} completed, success=${result.success}, code=${result.code}, fileUrlCount=${result.fileUrls.length}`);
+                    logger.log(`${LOG_TAG} completed, success=${result.success}, code=${result.code}, sentFileCount=${result.sentFiles.length}`);
                     cleanup();
                     resolve(buildResultText(modelResult));
                 };
@@ -230,7 +226,7 @@ export function createSendCrossDeviceTaskTool(ctx) {
                     if (event.sessionId && event.sessionId !== sessionId && event.sessionId !== distributionSessionId) {
                         return;
                     }
-                    logger.log(`${SEND_CROSS_RESULT_LOG_TAG} received result, status=${event.status}, code=${event.code}, fileUrlCount=${event.fileUrls.length}`);
+                    logger.log(`${SEND_CROSS_RESULT_LOG_TAG} received result, status=${event.status}, code=${event.code}, sentFileCount=${event.sentFiles.length}`);
                     void (async () => {
                         if (resultHandlingStarted) {
                             return;
@@ -254,7 +250,7 @@ export function createSendCrossDeviceTaskTool(ctx) {
                             success: event.status === "success",
                             code: event.code,
                             message: event.message,
-                            fileUrls: event.fileUrls,
+                            sentFiles: event.sentFiles,
                             rawEvent: event.rawEvent,
                         });
                         const resultWithFileSend = await autoSendFileToUserIfNeeded(result, ctx);
@@ -267,7 +263,7 @@ export function createSendCrossDeviceTaskTool(ctx) {
                         success: false,
                         code: "",
                         message: `Cross-device task timed out after ${CROSS_DEVICE_TASK_TIMEOUT_MS / 1000} seconds.`,
-                        fileUrls: [],
+                        sentFiles: [],
                         rawEvent: null,
                     });
                 }, CROSS_DEVICE_TASK_TIMEOUT_MS);
@@ -293,7 +289,7 @@ export function createSendCrossDeviceTaskTool(ctx) {
                         success: false,
                         code: "",
                         message: `Failed to send cross-device task command: ${error instanceof Error ? error.message : String(error)}`,
-                        fileUrls: [],
+                        sentFiles: [],
                         rawEvent: null,
                     });
                 });

package/dist/src/tools/send-file-to-user-tool.d.ts

@@ -1,4 +1,4 @@
-import type { SessionContext } from "./session-manager.js";
+import { type SessionContext } from "./session-manager.js";
 /**
  * XY send file to user tool - sends local files or remote files to user's device.
  * Supports both local file paths and remote URLs.

package/dist/src/tools/send-file-to-user-tool.js

@@ -1,5 +1,6 @@
 import { getXYWebSocketManager } from "../client.js";
 import { XYFileUploadService } from "../file-upload.js";
+import { appendRunCrossTaskSentFiles } from "./session-manager.js";
 import { logger } from "../utils/logger.js";
 import { getCurrentTaskId, getCurrentMessageId } from "../task-manager.js";
 import fetch from "node-fetch";
@@ -173,6 +174,16 @@ b. 操作超时时间为2分钟（120秒），请勿重复调用此工具，如
                         throw new Error(`fileNames length (${fileNames.length}) must match fileRemoteUrls length (${fileRemoteUrls.length})`);
                     }
                 }
+                if (ctx.runCrossTaskContext && (fileLocalUrls.length > 0 || fileRemoteUrls.length > 0)) {
+                    const cachedSentFiles = appendRunCrossTaskSentFiles([
+                        {
+                            ...(fileLocalUrls.length > 0 ? { fileLocalUrls } : {}),
+                            ...(fileRemoteUrls.length > 0 ? { fileRemoteUrls } : {}),
+                            ...(fileNames.length > 0 ? { fileNames } : {}),
+                        },
+                    ], ctx.runCrossTaskContext);
+                    logger.log(`[RunCrossTask] cached ${cachedSentFiles.length} send_file_to_user input(s) for cross-task result`);
+                }
                 // Get WebSocket manager
                 const wsManager = getXYWebSocketManager(config);
                 // Create upload service

package/dist/src/tools/session-manager.d.ts

@@ -1,5 +1,5 @@
 import { AsyncLocalStorage } from "async_hooks";
-import type { RunCrossTaskContext, XYChannelConfig } from "../types.js";
+import type { RunCrossTaskContext, SentFileParams, XYChannelConfig } from "../types.js";
 export interface SessionContext {
     config: XYChannelConfig;
     sessionId: string;
@@ -76,5 +76,5 @@ export declare function cleanupStaleSessions(): number;
  * Get the current number of active sessions (for diagnostics).
  */
 export declare function getActiveSessionCount(): number;
-export declare function appendRunCrossTaskFileUrls(fileUrls: string[], explicitRunCrossTaskContext?: RunCrossTaskContext): string[];
+export declare function appendRunCrossTaskSentFiles(sentFiles: SentFileParams[], explicitRunCrossTaskContext?: RunCrossTaskContext): SentFileParams[];
 export {};

package/dist/src/tools/session-manager.js

@@ -237,18 +237,40 @@ export function cleanupStaleSessions() {
 export function getActiveSessionCount() {
     return activeSessions.size;
 }
-export function appendRunCrossTaskFileUrls(fileUrls, explicitRunCrossTaskContext) {
+function normalizeSentFileParams(params) {
+    const fileLocalUrls = Array.isArray(params.fileLocalUrls)
+        ? params.fileLocalUrls.filter((url) => typeof url === "string" && url.length > 0)
+        : [];
+    const fileRemoteUrls = Array.isArray(params.fileRemoteUrls)
+        ? params.fileRemoteUrls.filter((url) => typeof url === "string" && url.length > 0)
+        : [];
+    const fileNames = Array.isArray(params.fileNames)
+        ? params.fileNames.filter((name) => typeof name === "string" && name.length > 0)
+        : [];
+    if (fileLocalUrls.length === 0 && fileRemoteUrls.length === 0) {
+        return null;
+    }
+    return {
+        ...(fileLocalUrls.length > 0 ? { fileLocalUrls } : {}),
+        ...(fileRemoteUrls.length > 0 ? { fileRemoteUrls } : {}),
+        ...(fileNames.length > 0 && fileNames.length === fileRemoteUrls.length ? { fileNames } : {}),
+    };
+}
+export function appendRunCrossTaskSentFiles(sentFiles, explicitRunCrossTaskContext) {
     const context = asyncLocalStorage.getStore() ?? null;
     const runCrossTaskContext = explicitRunCrossTaskContext ?? context?.runCrossTaskContext;
-    if (!runCrossTaskContext || fileUrls.length === 0) {
-        return runCrossTaskContext?.fileUrls ?? [];
+    const normalizedSentFiles = sentFiles
+        .map((params) => normalizeSentFileParams(params))
+        .filter((params) => params !== null);
+    if (!runCrossTaskContext || normalizedSentFiles.length === 0) {
+        return runCrossTaskContext?.sentFiles ?? [];
     }
-    const existing = Array.isArray(runCrossTaskContext.fileUrls) ? runCrossTaskContext.fileUrls : [];
-    const merged = Array.from(new Set([...existing, ...fileUrls.filter((url) => typeof url === "string" && url.length > 0)]));
-    runCrossTaskContext.fileUrls = merged;
+    const existing = Array.isArray(runCrossTaskContext.sentFiles) ? runCrossTaskContext.sentFiles : [];
+    const merged = [...existing, ...normalizedSentFiles];
+    runCrossTaskContext.sentFiles = merged;
     const sessionWithRef = Array.from(activeSessions.values()).find((session) => session.runCrossTaskContext === runCrossTaskContext);
     if (sessionWithRef?.runCrossTaskContext) {
-        sessionWithRef.runCrossTaskContext.fileUrls = merged;
+        sessionWithRef.runCrossTaskContext.sentFiles = merged;
     }
     return merged;
 }

package/dist/src/tools/upload-file-tool.d.ts

@@ -1,4 +1,4 @@
-import { type SessionContext } from "./session-manager.js";
+import type { SessionContext } from "./session-manager.js";
 /**
  * XY upload file tool - uploads local files to get publicly accessible URLs.
  * Requires file URIs from search_file tool as prerequisite.

package/dist/src/tools/upload-file-tool.js

@@ -1,6 +1,5 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
-import { appendRunCrossTaskFileUrls } from "./session-manager.js";
 import { getCurrentTaskId } from "../task-manager.js";
 import { logger } from "../utils/logger.js";
 /**
@@ -108,10 +107,6 @@ export function createUploadFileTool(ctx) {
             // Get public URLs for the files
             const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
             const fileUrls = await getFileUrls(wsManager, config, sessionId, currentTaskId, messageId, toolCallId, fileInfos, params.udid);
-            if (ctx.runCrossTaskContext && fileUrls.length > 0) {
-                const cachedFileUrls = appendRunCrossTaskFileUrls(fileUrls, ctx.runCrossTaskContext);
-                logger.log(`[RunCrossTask] cached ${fileUrls.length} upload_file URL(s) for cross-task result, total=${cachedFileUrls.length}`);
-            }
             return {
                 content: [
                     {

package/dist/src/types.d.ts

@@ -66,7 +66,7 @@ export interface CrossDeviceTaskResultEvent {
     sessionId: string;
     code: string;
     message: string;
-    fileUrls: string[];
+    sentFiles: SentFileParams[];
     status: "success" | "failed";
     rawEvent: any;
 }
@@ -76,9 +76,14 @@ export interface RunCrossTaskContext {
     isDistributed: boolean;
     networkId: string;
     isSupportAgent: boolean;
-    fileUrls?: string[];
+    sentFiles: SentFileParams[];
     rawContext: any;
 }
+export interface SentFileParams {
+    fileLocalUrls?: string[];
+    fileRemoteUrls?: string[];
+    fileNames?: string[];
+}
 export interface A2ATaskArtifactUpdateEvent {
     taskId: string;
     kind: "artifact-update";

package/dist/src/websocket.js

@@ -392,15 +392,36 @@ export class XYWebSocketManager extends EventEmitter {
         }
         const code = item?.payload?.code === undefined ? "" : String(item.payload.code);
         const message = typeof item?.payload?.message === "string" ? item.payload.message : "";
-        const fileUrls = Array.isArray(item?.payload?.fileUrls)
-            ? item.payload.fileUrls.filter((url) => typeof url === "string" && url.length > 0)
+        const sentFiles = Array.isArray(item?.payload?.sentFiles)
+            ? item.payload.sentFiles.map((entry) => {
+                if (!entry || typeof entry !== "object") {
+                    return null;
+                }
+                const fileLocalUrls = Array.isArray(entry.fileLocalUrls)
+                    ? entry.fileLocalUrls.filter((url) => typeof url === "string" && url.length > 0)
+                    : [];
+                const fileRemoteUrls = Array.isArray(entry.fileRemoteUrls)
+                    ? entry.fileRemoteUrls.filter((url) => typeof url === "string" && url.length > 0)
+                    : [];
+                const fileNames = Array.isArray(entry.fileNames)
+                    ? entry.fileNames.filter((name) => typeof name === "string" && name.length > 0)
+                    : [];
+                if (fileLocalUrls.length === 0 && fileRemoteUrls.length === 0) {
+                    return null;
+                }
+                return {
+                    ...(fileLocalUrls.length > 0 ? { fileLocalUrls } : {}),
+                    ...(fileRemoteUrls.length > 0 ? { fileRemoteUrls } : {}),
+                    ...(fileNames.length > 0 && fileNames.length === fileRemoteUrls.length ? { fileNames } : {}),
+                };
+            }).filter((entry) => entry !== null)
             : [];
         const status = code === "0" ? "success" : "failed";
         const event = {
             sessionId,
             code,
             message,
-            fileUrls,
+            sentFiles,
             status,
             rawEvent: item,
         };
@@ -444,7 +465,7 @@ export class XYWebSocketManager extends EventEmitter {
             networkId,
             isDistributed: true,
             isSupportAgent: true,
-            fileUrls: [],
+            sentFiles: [],
             rawContext: parsed,
         };
         const request = {

package/package.json

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