@ynhcj/xiaoyi-channel 1.1.17 → 1.1.18

package/dist/src/bot.js

@@ -177,6 +177,7 @@ export async function handleXYMessage(params) {
         const fileParts = extractFileParts(parsed.parts);
         // Download files to local disk
         const downloadedFiles = await downloadFilesFromParts(fileParts);
+        console.log("Downloaded files:", JSON.stringify(downloadedFiles, null, 2));
         const mediaPayload = buildXYMediaPayload(downloadedFiles);
         // Resolve envelope format options (following feishu pattern)
         const envelopeOptions = core.channel.reply.resolveEnvelopeFormatOptions(cfg);

package/dist/src/file-download.js

@@ -2,12 +2,10 @@
 import fetch from "node-fetch";
 import fs from "fs/promises";
 import path from "path";
-import { logger } from "./utils/logger.js";
 /**
  * Download a file from URL to local path.
  */
 export async function downloadFile(url, destPath) {
-    logger.debug(`Downloading file from ${url} to ${destPath}`);
     const controller = new AbortController();
     const timeout = setTimeout(() => controller.abort(), 30000); // 30 seconds timeout
     try {
@@ -18,14 +16,13 @@ export async function downloadFile(url, destPath) {
         const arrayBuffer = await response.arrayBuffer();
         const buffer = Buffer.from(arrayBuffer);
         await fs.writeFile(destPath, buffer);
-        logger.debug(`File downloaded successfully: ${destPath}`);
     }
     catch (error) {
         if (error.name === 'AbortError') {
-            logger.error(`Download timeout (30s) for ${url}`);
+            console.log(`Download timeout (30s) for ${url}`);
             throw new Error(`Download timeout after 30 seconds`);
         }
-        logger.error(`Failed to download file from ${url}:`, error);
+        console.log(`Failed to download file from ${url}:`);
         throw error;
     }
     finally {
@@ -54,7 +51,7 @@ export async function downloadFilesFromParts(fileParts, tempDir = "/tmp/xy_chann
             });
         }
         catch (error) {
-            logger.error(`Failed to download file ${name}:`, error);
+            console.log(`Failed to download file ${name}:`);
             // Continue with other files
         }
     }

package/dist/src/file-upload.js

@@ -2,8 +2,25 @@
 // OSMS file upload implementation
 import fetch from "node-fetch";
 import fs from "fs/promises";
+import os from "os";
 import path from "path";
 import { calculateSHA256 } from "./utils/crypto.js";
+function isRemoteUrl(filePath) {
+    return filePath.startsWith("http://") || filePath.startsWith("https://");
+}
+async function downloadToTempFile(url) {
+    console.log(`[XY File Upload] Downloading remote file: ${url}`);
+    const response = await fetch(url);
+    if (!response.ok) {
+        throw new Error(`Failed to download remote file: HTTP ${response.status}`);
+    }
+    const buffer = await response.buffer();
+    const urlFileName = path.basename(new URL(url).pathname) || "download";
+    const tempPath = path.join(os.tmpdir(), `xy-upload-${Date.now()}-${urlFileName}`);
+    await fs.writeFile(tempPath, buffer);
+    console.log(`[XY File Upload] Downloaded to temp file: ${tempPath}`);
+    return tempPath;
+}
 /**
  * Service for uploading files to XY file storage.
  * Implements three-phase upload: prepare → upload → complete.
@@ -23,10 +40,17 @@ export class XYFileUploadService {
      */
     async uploadFile(filePath, objectType = "TEMPORARY_MATERIAL_DOC") {
         console.log(`[XY File Upload] Starting file upload: ${filePath}`);
+        let localFilePath = filePath;
+        let isTempFile = false;
         try {
+            // Handle remote URLs by downloading first
+            if (isRemoteUrl(filePath)) {
+                localFilePath = await downloadToTempFile(filePath);
+                isTempFile = true;
+            }
             // Read file
-            const fileBuffer = await fs.readFile(filePath);
-            const fileName = path.basename(filePath);
+            const fileBuffer = await fs.readFile(localFilePath);
+            const fileName = path.basename(localFilePath);
             const fileSha256 = calculateSHA256(fileBuffer);
             const fileSize = fileBuffer.length;
             // Phase 1: Prepare
@@ -96,7 +120,15 @@ export class XYFileUploadService {
         }
         catch (error) {
             console.error(`[XY File Upload] File upload failed for ${filePath}:`, error);
-            return "";
+            throw error;
+        }
+        finally {
+            if (isTempFile) {
+                try {
+                    await fs.unlink(localFilePath);
+                }
+                catch { }
+            }
         }
     }
     /**
@@ -104,10 +136,17 @@ export class XYFileUploadService {
      * Uses completeAndQuery endpoint to get the file URL directly.
      */
     async uploadFileAndGetUrl(filePath, objectType = "TEMPORARY_MATERIAL_DOC") {
+        let localFilePath = filePath;
+        let isTempFile = false;
         try {
+            // Handle remote URLs by downloading first
+            if (isRemoteUrl(filePath)) {
+                localFilePath = await downloadToTempFile(filePath);
+                isTempFile = true;
+            }
             // Read file
-            const fileBuffer = await fs.readFile(filePath);
-            const fileName = path.basename(filePath);
+            const fileBuffer = await fs.readFile(localFilePath);
+            const fileName = path.basename(localFilePath);
             const fileSha256 = calculateSHA256(fileBuffer);
             const fileSize = fileBuffer.length;
             // Phase 1: Prepare
@@ -186,6 +225,14 @@ export class XYFileUploadService {
             console.error(`[XY File Upload] File upload with URL retrieval failed for ${filePath}:`, error);
             throw error;
         }
+        finally {
+            if (isTempFile) {
+                try {
+                    await fs.unlink(localFilePath);
+                }
+                catch { }
+            }
+        }
     }
     /**
      * Upload multiple files and return their file IDs.

package/dist/src/outbound.js

@@ -174,14 +174,9 @@ export const xyOutbound = {
         }
         // Upload file
         const fileId = await uploadService.uploadFile(mediaUrl);
-        // Check if fileId is empty
+        // Check if fileId is empty (should not happen if uploadFile throws on failure)
         if (!fileId) {
-            console.log(`[xyOutbound.sendMedia] ⚠️ File upload failed: fileId is empty, aborting sendMedia`);
-            return {
-                channel: "xiaoyi-channel",
-                messageId: "",
-                chatId: to,
-            };
+            throw new Error(`File upload returned empty fileId for: ${mediaUrl}`);
         }
         console.log(`[xyOutbound.sendMedia] File uploaded:`, {
             fileId,

package/dist/src/provider.js

@@ -24,10 +24,10 @@ function encodeUid(uid) {
     return createHash("sha256").update(uid).digest("hex").slice(0, 32);
 }
 /**
- * Get uid from plugin config (OpenClawConfig -> plugins -> xiaoyi-channel -> config).
+ * Get uid from channel config (OpenClawConfig -> channels -> xiaoyi-channel -> uid).
  */
 function getUidFromConfig(config) {
-    return config?.plugins?.entries?.["xiaoyi-channel"]?.config?.uid;
+    return config?.channels?.["xiaoyi-channel"]?.uid;
 }
 export const xiaoyiProvider = {
     id: "xiaoyiprovider",
@@ -101,6 +101,35 @@ export const xiaoyiProvider = {
             if (context.systemPrompt) {
                 console.log(`[xiaoyiprovider] system prompt length: ${context.systemPrompt.length}`);
             }
+            // 在发送给模型前，优化 systemPrompt 结构
+            if (context.systemPrompt) {
+                let sp = context.systemPrompt;
+                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)
+                        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');
+                    }
+                }
+                console.log(`[xiaoyiprovider] system prompt optimized: ${beforeLen} -> ${sp.length}`);
+                context.systemPrompt = sp;
+            }
             const stream = await underlying(model, context, {
                 ...options,
                 headers: {
@@ -109,7 +138,9 @@ export const xiaoyiProvider = {
                 },
             });
             // 异步监听输出（不阻塞 stream 返回）
-            stream.result().then((err) => console.log(`[xiaoyiprovider] error: ${err}`));
+            stream.result().then((result) => {
+                console.log(`[xiaoyiprovider] stream completed, usage: input=${result.usage?.input} output=${result.usage?.output}`);
+            }, (err) => console.log(`[xiaoyiprovider] stream error: ${JSON.stringify(err)}`));
             return stream;
         };
     },

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

@@ -18,10 +18,10 @@ export const uploadFileTool = {
     label: "Upload File",
     description: `工具能力描述：将手机本地文件上传并获取可公网访问的 URL。
 
-  前置工具调用：此工具使用前必须先调用 search_file 或者 QueryCollection 工具获取文件的 uri
+  前置工具调用：此工具使用前必须先调用 search_file 或者 query_collection 工具获取文件的 uri=
 
   工具参数说明：
-  a. 入参中的fileInfos数组，每个元素必须包含mediaUri字段（对应于search_file工具或者QueryCollection返回结果中的uri），必须与search_file或者QueryCollection结果中对应的uri完全保持一致，不要自行修改。
+  a. 入参中的fileInfos数组，每个元素必须包含mediaUri字段（对应于search_file工具或者query_collection返回结果中的uri），必须与search_file或者query_collection结果中对应的uri完全保持一致，不要自行修改。
   b. fileInfos中的timeout字段是可选的，表示上传文件超时时间，单位是毫秒，默认是20000（20秒）。
   c. fileInfos 是文件在手机本地的信息数组（从 search_file 工具响应中获取）。限制：每次最多支持传入 5 条文件信息。
 

package/dist/src/tools/xiaoyi-add-collection-tool.js

@@ -28,6 +28,7 @@ export const xiaoyiAddCollectionTool = {
 ● dataType:必填字段，数据类型为string，功能描述是标识数据类型。HYPER_LINK标识网页，TEXT标识文本，IMAGE标识图片，FILE标识文件。
 ● title:非必填字段，数据类型为string，功能描述是标识文件类型数据的文件名称。适用于FILE类型。
 说明：如果dataType为HYPER_LINK或TEXT，则content字段必填且不能为空；如果dataType为IMAGE或FILE，则uri字段必填且不能为空。当用户希望收藏海报、截图等图片类数据时，请将数据以图片IMAGE的形式存入到小艺帮记；当用户希望收藏电子书、笔记、报告、素材、文档、合同、协议、简历、证书、报表、日志、安装包、压缩包等描述的文件时，请将数据以文件FILE的形式存入到小艺帮记。
+当你成功收藏这个数据到小艺帮记后，请在最后显示"已成功把数据添加到[小艺帮记](vassistant://voice/main?page=CollectionPage&jumpHomePageTab=myCollection)"，
   注意:
   a. 操作超时时间为60秒,请勿重复调用此工具
   b. 如果遇到各类调用失败场景,最多只能重试一次，不可以重复调用多次。
@@ -44,7 +45,11 @@ export const xiaoyiAddCollectionTool = {
             },
             uri: {
                 type: "string",
-                description: "必填字段（IMAGE/FILE类型时）。图片或文件的地址链接。",
+                description: `必填字段（IMAGE/FILE类型时）。图片或文件的地址链接。
+        uri具备三种严格的格式
+        (1) http或者https开头的公网链接，一般是用户通过联网搜索获取的文件地址，不允许自行编造，此类链接填入时必须确保真实
+        (2) file://开头的链接，此类链接必须来源于query_collection结果或者search_file或者search_photo_gallery的结果，不允许自行编造
+        (3) 本地路径例，如/tmp/xy_channel/xxx，此类路径是文件保存在当前openclaw运行环境的本地目录，可以直接填入，不要擅自拼接http://或者file://前缀`,
             },
             sourceAppBundleName: {
                 type: "string",

package/dist/src/tools/xiaoyi-collection-tool.js

@@ -25,6 +25,7 @@ export const xiaoyiCollectionTool = {
   a. 操作超时时间为60秒,请勿重复调用此工具
   b. 如果遇到各类调用失败场景,最多只能重试一次，不可以重复调用多次。
   c. 调用工具前需认真检查调用参数是否满足工具要求
+  d. 如果用户希望获取文件，可以使用upload_file工具完成文件上传
 
   回复约束：如果工具返回没有授权或者其他报错，只需要完整描述没有授权或者其他报错内容即可，不需要主动给用户提供解决方案，例如告诉用户如何授权，如何解决报错等都是不需要的，请严格遵守。
   `,

package/package.json

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