@ynhcj/xiaoyi-channel 0.0.75-beta → 0.0.77-beta

package/dist/src/channel.js

@@ -24,11 +24,11 @@ import { sendFileToUserTool } from "./tools/send-file-to-user-tool.js";
 import { viewPushResultTool } from "./tools/view-push-result-tool.js";
 import { imageReadingTool } from "./tools/image-reading-tool.js";
 import { timestampToUtc8Tool } from "./tools/timestamp-to-utc8-tool.js";
-import { sendCommandToCarTool } from "./tools/send-command-to-car-tool.js";
 import { xiaoyiCollectionTool } from "./tools/xiaoyi-collection-tool.js";
 import { xiaoyiAddCollectionTool } from "./tools/xiaoyi-add-collection-tool.js";
 import { xiaoyiDeleteCollectionTool } from "./tools/xiaoyi-delete-collection-tool.js";
 import { saveMediaToGalleryTool } from "./tools/save-media-to-gallery-tool.js";
+import { saveFileToPhoneTool } from "./tools/save-file-to-phone-tool.js";
 import { filterToolsByDevice } from "./tools/device-tool-map.js";
 import { getCurrentSessionContext } from "./tools/session-manager.js";
 import { logger } from "./utils/logger.js";
@@ -71,7 +71,7 @@ export const xyPlugin = {
     },
     outbound: xyOutbound,
     agentTools: () => {
-        const allTools = [locationTool, noteTool, searchNoteTool, modifyNoteTool, calendarTool, searchCalendarTool, searchContactTool, searchPhotoGalleryTool, uploadPhotoTool, xiaoyiGuiTool, callPhoneTool, searchMessageTool, sendMessageTool, searchFileTool, uploadFileTool, createAlarmTool, searchAlarmTool, modifyAlarmTool, deleteAlarmTool, sendFileToUserTool, viewPushResultTool, imageReadingTool, timestampToUtc8Tool, sendCommandToCarTool, xiaoyiCollectionTool, xiaoyiAddCollectionTool, xiaoyiDeleteCollectionTool, saveMediaToGalleryTool];
+        const allTools = [locationTool, noteTool, searchNoteTool, modifyNoteTool, calendarTool, searchCalendarTool, searchContactTool, searchPhotoGalleryTool, uploadPhotoTool, xiaoyiGuiTool, callPhoneTool, searchMessageTool, sendMessageTool, searchFileTool, uploadFileTool, createAlarmTool, searchAlarmTool, modifyAlarmTool, deleteAlarmTool, sendFileToUserTool, viewPushResultTool, imageReadingTool, timestampToUtc8Tool, xiaoyiCollectionTool, xiaoyiAddCollectionTool, xiaoyiDeleteCollectionTool, saveMediaToGalleryTool, saveFileToPhoneTool];
         const ctx = getCurrentSessionContext();
         const filtered = filterToolsByDevice(allTools, ctx?.deviceType);
         logger.log(`[DEVICE-FILTER] deviceType=${ctx?.deviceType ?? "(none)"}, tools: ${allTools.length} → ${filtered.length} (${filtered.map(t => t.name).join(", ")})`);

package/dist/src/provider.js

@@ -1,3 +1,13 @@
+// Xiaoyi Provider
+// Wraps any OpenAI-compatible endpoint and injects dynamic headers
+// (taskId, sessionId, conversationId) from the current XY channel session.
+// Falls back to uid-based values when no session context is available.
+//
+// Users configure the underlying model in config:
+//   models.providers.xiaoyiprovider.baseUrl = "https://..."
+//   models.providers.xiaoyiprovider.api = "openai-completions"
+//   models.providers.xiaoyiprovider.models = [...]
+import { createHash } from "crypto";
 import { getCurrentSessionContext } from "./tools/session-manager.js";
 /**
  * Dynamic header keys injected via extraParams and forwarded to the HTTP request.
@@ -8,10 +18,10 @@ const HEADER_TRACE_ID = "x-hag-trace-id";
 const HEADER_SESSION_ID = "x-session-id";
 const HEADER_INTERACTION_ID = "x-interaction-id";
 /**
- * Encode uid to base64 and take first 32 chars.
+ * Encode uid via SHA-256 and take first 32 hex chars.
  */
 function encodeUid(uid) {
-    return Buffer.from(uid).toString("base64").slice(0, 32);
+    return createHash("sha256").update(uid).digest("hex").slice(0, 32);
 }
 /**
  * Get uid from plugin config (OpenClawConfig -> plugins -> xiaoyi-channel -> config).
@@ -31,7 +41,7 @@ export const xiaoyiProvider = {
      *
      * Priority:
      *   1. Session context (from AsyncLocalStorage, set by bot.ts)
-     *   2. uid-based fallback: base64(uid)[:32]_timestamp
+     *   2. uid-based fallback: sha256(uid).hex[:32]_timestamp
      *   3. No uid available → return undefined (no headers injected)
      */
     prepareExtraParams: (ctx) => {
@@ -72,21 +82,20 @@ export const xiaoyiProvider = {
         const underlying = ctx.streamFn;
         if (!underlying)
             return underlying;
-        const dynamicHeaders = {};
-        if (ctx.extraParams) {
-            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;
-        }
-        if (Object.keys(dynamicHeaders).length === 0)
-            return underlying;
         return async (model, context, options) => {
+            // 每次请求时从 ctx.extraParams 动态读取 header
+            const dynamicHeaders = {};
+            if (ctx.extraParams) {
+                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;
+            }
             // 记录输入
             console.log(`[xiaoyiprovider] input messages count: ${context.messages?.length ?? 0}`);
             if (context.systemPrompt) {

package/dist/src/tools/device-tool-map.js

@@ -13,7 +13,6 @@ const DEVICE_TOOL_POLICY = {
             "call_phone",
             "send_message",
             "search_message",
-            "send_command_to_car",
             "search_contact",
             "QueryCollection",
             "AddCollection",

package/dist/src/tools/save-file-to-phone-tool.d.ts

@@ -0,0 +1,5 @@
+/**
+ * XY save file to phone tool - saves files to user's device file manager.
+ * Supports local file paths (auto-uploaded to get public URL) and public URLs.
+ */
+export declare const saveFileToPhoneTool: any;

package/dist/src/tools/save-file-to-phone-tool.js

@@ -0,0 +1,170 @@
+import { getXYWebSocketManager } from "../client.js";
+import { sendCommand } from "../formatter.js";
+import { getCurrentSessionContext } from "./session-manager.js";
+import { XYFileUploadService } from "../file-upload.js";
+/**
+ * Duck-typed ToolInputError: openclaw 按 .name 字段匹配，不用 instanceof。
+ * 抛出此错误会让 openclaw 返回 HTTP 400 而非 500，
+ * LLM 会将其识别为参数错误而非瞬时故障，不会触发重试。
+ */
+class ToolInputError extends Error {
+    status = 400;
+    constructor(message) {
+        super(message);
+        this.name = "ToolInputError";
+    }
+}
+/**
+ * XY save file to phone tool - saves files to user's device file manager.
+ * Supports local file paths (auto-uploaded to get public URL) and public URLs.
+ */
+export const saveFileToPhoneTool = {
+    name: "SaveFileToFileManager",
+    label: "Save File to Phone",
+    description: `将文件保存到手机文件管理器。
+  工具参数说明：
+  a. fileName：必填，string类型，文件名称。
+  b. url：必填，string类型，支持本地路径或者公网url路径。如果是本地路径，会先上传获取公网url再保存到手机。
+  c. suffix：必填，string类型，文件后缀，例如 ppt、doc、pdf 等。
+
+  注意:
+  a. 操作超时时间为60秒,请勿重复调用此工具
+  b. 如果遇到各类调用失败场景,最多只能重试一次，不可以重复调用多次。
+  c. 调用工具前需认真检查调用参数是否满足工具要求
+
+  回复约束：如果工具返回没有授权或者其他报错，只需要完整描述没有授权或者其他报错内容即可，不需要主动给用户提供解决方案，例如告诉用户如何授权，如何解决报错等都是不需要的，请严格遵守。
+  `,
+    parameters: {
+        type: "object",
+        properties: {
+            fileName: {
+                type: "string",
+                description: "必填，文件名称。",
+            },
+            url: {
+                type: "string",
+                description: "必填，支持本地路径或者公网url路径。如果是本地路径会先上传获取公网url。",
+            },
+            suffix: {
+                type: "string",
+                description: "必填，文件后缀，例如 ppt、doc、pdf 等。",
+            },
+        },
+        required: ["fileName", "url", "suffix"],
+    },
+    async execute(toolCallId, params) {
+        // Validate parameters
+        const { fileName, url, suffix } = params;
+        if (!url || typeof url !== "string") {
+            throw new ToolInputError("缺少必填参数: url");
+        }
+        if (!fileName || typeof fileName !== "string") {
+            throw new ToolInputError("缺少必填参数: fileName");
+        }
+        if (!suffix || typeof suffix !== "string") {
+            throw new ToolInputError("缺少必填参数: suffix");
+        }
+        // Get session context
+        const sessionContext = getCurrentSessionContext();
+        if (!sessionContext) {
+            throw new Error("No active XY session found. SaveFileToFileManager tool can only be used during an active conversation.");
+        }
+        const { config, sessionId, taskId, messageId } = sessionContext;
+        // Get WebSocket manager
+        const wsManager = getXYWebSocketManager(config);
+        // Determine the URL: if it's a local path, upload first to get public URL
+        let publicUrl = url;
+        if (!url.startsWith("http://") && !url.startsWith("https://")) {
+            // Local file path - upload to get public URL
+            const uploadService = new XYFileUploadService(config.fileUploadUrl, config.apiKey, config.uid);
+            publicUrl = await uploadService.uploadFileAndGetUrl(url);
+            if (!publicUrl) {
+                throw new Error("本地文件上传失败，无法获取公网URL");
+            }
+        }
+        // Build intentParam
+        const intentParam = {
+            fileName: fileName,
+            url: publicUrl,
+            suffix: suffix,
+        };
+        // Build SaveFileToFileManager command
+        const command = {
+            header: {
+                namespace: "Common",
+                name: "Action",
+            },
+            payload: {
+                cardParam: {},
+                executeParam: {
+                    executeMode: "background",
+                    intentName: "SaveFileToFileManager",
+                    bundleName: "com.huawei.hmos.vassistant",
+                    dimension: "",
+                    needUnlock: true,
+                    actionResponse: true,
+                    appType: "OHOS_APP",
+                    timeOut: 5,
+                    timeout: 1000,
+                    intentParam,
+                    permissionId: ["ohos.permission.WRITE_IMAGEVIDEO"],
+                    achieveType: "INTENT",
+                },
+                responses: [
+                    {
+                        resultCode: "",
+                        displayText: "",
+                        ttsText: "",
+                    },
+                ],
+                needUploadResult: true,
+                noHalfPage: false,
+                pageControlRelated: false,
+            },
+        };
+        // Send command and wait for response (60 second timeout)
+        return new Promise((resolve, reject) => {
+            const timeout = setTimeout(() => {
+                wsManager.off("data-event", handler);
+                reject(new Error("保存文件到手机超时（60秒）"));
+            }, 60000);
+            // Listen for data events from WebSocket
+            const handler = (event) => {
+                if (event.intentName === "SaveFileToFileManager") {
+                    clearTimeout(timeout);
+                    wsManager.off("data-event", handler);
+                    if (event.status === "success" && event.outputs) {
+                        resolve({
+                            content: [
+                                {
+                                    type: "text",
+                                    text: JSON.stringify(event.outputs),
+                                }
+                            ]
+                        });
+                    }
+                    else {
+                        reject(new Error(`保存文件到手机失败: ${event.status}`));
+                    }
+                }
+            };
+            // Register event handler
+            wsManager.on("data-event", handler);
+            // Send the command
+            sendCommand({
+                config,
+                sessionId,
+                taskId,
+                messageId,
+                command,
+            })
+                .then(() => {
+            })
+                .catch((error) => {
+                clearTimeout(timeout);
+                wsManager.off("data-event", handler);
+                reject(error);
+            });
+        });
+    },
+};

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

@@ -20,7 +20,14 @@ class ToolInputError extends Error {
 export const xiaoyiAddCollectionTool = {
     name: "AddCollection",
     label: "Add XiaoYi Collection",
-    description: `向小艺收藏中添加公共知识数据，可以给用户提供个性化体验。用户希望保存到个人化知识库中的数据都可以调用本技能。不同类型的数据对应的数据要求如下：
+    description: `向小艺收藏中添加公共知识数据，可以给用户提供个性化体验。任何用户希望保存到个人化知识库中的数据都可以调用本技能。不同类型的数据对应的数据要求如下：
+请求入参说明：
+● content:必填字段，数据类型为string，功能描述是该字段是用户添加收藏的链接url或文本原文。适用于HYPER_LINK和TEXT类型。
+● uri:必填字段，数据类型为string，功能描述是该字段是图片或文件的端存储地址链接。适用于IMAGE和FILE类型。
+● sourceAppBundleName:非必填字段，数据类型为string，功能描述是标识该数据的来源应用。
+● dataType:必填字段，数据类型为string，功能描述是标识数据类型。HYPER_LINK标识网页，TEXT标识文本，IMAGE标识图片，FILE标识文件。
+● title:非必填字段，数据类型为string，功能描述是标识文件类型数据的文件名称。适用于FILE类型。
+说明：如果dataType为HYPER_LINK或TEXT，则content字段必填且不能为空；如果dataType为IMAGE或FILE，则uri字段必填且不能为空。当用户希望收藏海报、截图等图片类数据时，请将数据以图片IMAGE的形式存入到小艺帮记；当用户希望收藏电子书、笔记、报告、素材、文档、合同、协议、简历、证书、报表、日志、安装包、压缩包等描述的文件时，请将数据以文件FILE的形式存入到小艺帮记。
   注意:
   a. 操作超时时间为60秒,请勿重复调用此工具
   b. 如果遇到各类调用失败场景,最多只能重试一次，不可以重复调用多次。
@@ -47,12 +54,16 @@ export const xiaoyiAddCollectionTool = {
                 type: "string",
                 description: "必填字段。标识数据类型：HYPER_LINK表示网页，TEXT表示文本，IMAGE表示图片，FILE表示文件。",
             },
+            title: {
+                type: "string",
+                description: "非必填字段。标识文件类型数据的文件名称。适用于FILE类型。",
+            },
         },
         required: ["dataType"],
     },
     async execute(toolCallId, params) {
         // Validate parameters
-        const { content, uri, sourceAppBundleName, dataType } = params;
+        const { content, uri, sourceAppBundleName, dataType, title } = params;
         const validTypes = ["HYPER_LINK", "TEXT", "IMAGE", "FILE"];
         if (!dataType || !validTypes.includes(dataType)) {
             throw new ToolInputError(`dataType必填且必须为 HYPER_LINK、TEXT、IMAGE、FILE 之一，当前值: ${dataType}`);
@@ -93,6 +104,9 @@ export const xiaoyiAddCollectionTool = {
         if (sourceAppBundleName) {
             intentParam.sourceAppBundleName = sourceAppBundleName;
         }
+        if (title) {
+            intentParam.title = title;
+        }
         // Build AddCollection command
         const command = {
             header: {

package/package.json

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