@ynhcj/xiaoyi-channel 0.0.52-beta → 0.0.52-next

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

@@ -1,26 +1,54 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
 import { getCurrentSessionContext } from "./session-manager.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 collection tool - retrieves user's collection data from XiaoYi.
  * Returns personalized knowledge data saved in user's collection.
  */
 export const xiaoyiCollectionTool = {
-    name: "xiaoyi_collection",
+    name: "query_collection",
     label: "XiaoYi Collection",
-    description: "检索用户在小艺收藏中记下来的公共知识数据，可以给用户提供个性化体验。当用户语料中涉及从我的小艺收藏或者查看我的收藏或者我xx时候收藏的xxx帮我看一下这种类型的语料的时候需要使用此工具。注意:操作超时时间为60秒,请勿重复调用此工具,如果超时或失败,最多重试一次。",
+    description: `检索用户在小艺收藏中记下来的公共知识数据，本技能支持查询用户收藏的公共知识数据，也可以根据特定语义化描述进行特定内容的检索，通过参数进行控制。本技能返回结果中，linkTitle是收藏内容的标题，description是对收藏内容的总结，label是收藏内容的标签，linkUrl是可以直接访问的原始内容链接。如果你认为某条数据对用户交互有用，可以通过linkUrl抓取更加丰富的原始数据。
+  注意:
+  a. 操作超时时间为60秒,请勿重复调用此工具
+  b. 如果遇到各类调用失败场景,最多只能重试一次，不可以重复调用多次。
+  c. 调用工具前需认真检查调用参数是否满足工具要求
+
+  回复约束：如果工具返回没有授权或者其他报错，只需要完整描述没有授权或者其他报错内容即可，不需要主动给用户提供解决方案，例如告诉用户如何授权，如何解决报错等都是不需要的，请严格遵守。
+  `,
     parameters: {
         type: "object",
         properties: {
             queryAll: {
                 type: "string",
-                description: "描述是否需要查询用户所有收藏数据，默认为true",
-                default: "true",
+                description: "非必填参数，描述是否需要查询用户所有收藏数据。如果填入true则表示获取用户所有公共知识数据，其他参数无效。",
+            },
+            query: {
+                type: "string",
+                description: "非必填参数，queryAll不填或者为false则必填。用户的查询条件，可按照用户query进行检索。",
             },
         },
         required: [],
     },
     async execute(toolCallId, params) {
+        // Validate parameters
+        const queryAll = params.queryAll;
+        const query = params.query;
+        if (queryAll !== "true" && (!query || typeof query !== "string")) {
+            throw new ToolInputError("queryAll不为true时，query参数必填");
+        }
         // Get session context
         const sessionContext = getCurrentSessionContext();
         if (!sessionContext) {
@@ -29,6 +57,15 @@ export const xiaoyiCollectionTool = {
         const { config, sessionId, taskId, messageId } = sessionContext;
         // Get WebSocket manager
         const wsManager = getXYWebSocketManager(config);
+        // Build intentParam
+        const intentParam = {};
+        if (queryAll === "true") {
+            intentParam.queryAll = "true";
+        }
+        else {
+            intentParam.queryAll = "false";
+            intentParam.query = query;
+        }
         // Build QueryCollection command
         const command = {
             header: {
@@ -45,9 +82,7 @@ export const xiaoyiCollectionTool = {
                     actionResponse: true,
                     appType: "OHOS_APP",
                     timeOut: 5,
-                    intentParam: {
-                        queryAll: params.queryAll || "true",
-                    },
+                    intentParam,
                     permissionId: [],
                     achieveType: "INTENT",
                 },

package/dist/src/tools/xiaoyi-delete-collection-tool.d.ts

@@ -0,0 +1,4 @@
+/**
+ * XY delete collection tool - deletes data from user's XiaoYi collection.
+ */
+export declare const xiaoyiDeleteCollectionTool: any;

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

@@ -0,0 +1,163 @@
+import { getXYWebSocketManager } from "../client.js";
+import { sendCommand } from "../formatter.js";
+import { getCurrentSessionContext } from "./session-manager.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 delete collection tool - deletes data from user's XiaoYi collection.
+ */
+export const xiaoyiDeleteCollectionTool = {
+    name: "delete_collection",
+    label: "Delete XiaoYi Collection",
+    description: `从小艺收藏中删除之前已保存的公共知识数据。任何用户希望删除已保存到个人知识库的数据都可以调用本技能。如果用户想更新之前的收藏数据，需要先query获取itemId然后再delete，最后执行Add，按照这个步骤完成收藏数据更新。
+  注意:
+  a. 操作超时时间为60秒,请勿重复调用此工具
+  b. 如果遇到各类调用失败场景,最多只能重试一次，不可以重复调用多次。
+  c. 调用工具前需认真检查调用参数是否满足工具要求
+
+  回复约束：如果工具返回没有授权或者其他报错，只需要完整描述没有授权或者其他报错内容即可，不需要主动给用户提供解决方案，例如告诉用户如何授权，如何解决报错等都是不需要的，请严格遵守。
+  `,
+    parameters: {
+        type: "object",
+        properties: {
+            itemIds: {
+                // 不指定 type，允许传入数组或 JSON 字符串
+                // 具体的类型验证和转换在 execute 函数内部进行
+                description: "准备删除的数据的itemId合集。itemId可以由用户指定，也可以从之前检索回来的收藏数据项的itemId字段获取。",
+            },
+        },
+        required: ["itemIds"],
+    },
+    async execute(toolCallId, params) {
+        // ===== 参数规范化：兼容数组和 JSON 字符串 =====
+        let itemIds = null;
+        if (!params.itemIds) {
+            throw new ToolInputError("缺少必填参数: itemIds");
+        }
+        // 情况1: 已经是数组
+        if (Array.isArray(params.itemIds)) {
+            itemIds = params.itemIds;
+        }
+        // 情况2: 是字符串，尝试解析为 JSON 数组
+        else if (typeof params.itemIds === 'string') {
+            try {
+                const parsed = JSON.parse(params.itemIds);
+                if (Array.isArray(parsed)) {
+                    itemIds = parsed;
+                }
+                else {
+                    throw new ToolInputError("itemIds must be an array or a JSON string representing an array");
+                }
+            }
+            catch (parseError) {
+                if (parseError instanceof ToolInputError)
+                    throw parseError;
+                throw new ToolInputError(`itemIds must be a valid JSON array string. Parse error: ${parseError instanceof Error ? parseError.message : String(parseError)}`);
+            }
+        }
+        // 情况3: 其他类型，报错
+        else {
+            throw new ToolInputError(`itemIds must be an array or a JSON string, got ${typeof params.itemIds}`);
+        }
+        // 验证数组非空
+        if (!itemIds || itemIds.length === 0) {
+            throw new ToolInputError("itemIds array cannot be empty");
+        }
+        // Get session context
+        const sessionContext = getCurrentSessionContext();
+        if (!sessionContext) {
+            throw new Error("No active XY session found. DeleteCollection tool can only be used during an active conversation.");
+        }
+        const { config, sessionId, taskId, messageId } = sessionContext;
+        // Get WebSocket manager
+        const wsManager = getXYWebSocketManager(config);
+        // Build DeleteCollection command
+        const command = {
+            header: {
+                namespace: "Common",
+                name: "Action",
+            },
+            payload: {
+                cardParam: {},
+                executeParam: {
+                    executeMode: "background",
+                    intentName: "DeleteCollection",
+                    bundleName: "com.huawei.hmos.vassistant",
+                    needUnlock: true,
+                    actionResponse: true,
+                    appType: "OHOS_APP",
+                    timeOut: 5,
+                    intentParam: {
+                        itemIds,
+                    },
+                    permissionId: [],
+                    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 === "DeleteCollection") {
+                    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/utils/runtime-manager.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 保存 runtime 信息到 .xiaoyiruntime 文件
+ * @param webSocketSessionId - WebSocket 层级的 sessionId (SESSION_ID)
+ * @param conversationId - param 里的 sessionId (CONVERSATION_ID)
+ * @param taskId - 任务 ID (param.id)
+ */
+export declare function saveRuntimeInfo(webSocketSessionId: string, conversationId: string, taskId: string): Promise<void>;

package/dist/src/utils/runtime-manager.js

@@ -0,0 +1,42 @@
+// xiaoyi runtime 持久化管理器
+import { promises as fs } from "fs";
+import * as path from "path";
+import { logger } from "./logger.js";
+const RUNTIME_FILE = "/home/sandbox/.openclaw/.xiaoyiruntime";
+/**
+ * 确保目录存在
+ */
+async function ensureDirectoryExists(filePath) {
+    const dir = path.dirname(filePath);
+    try {
+        await fs.mkdir(dir, { recursive: true });
+    }
+    catch (error) {
+        logger.error(`[RuntimeManager] Failed to create directory ${dir}:`, error);
+    }
+}
+/**
+ * 保存 runtime 信息到 .xiaoyiruntime 文件
+ * @param webSocketSessionId - WebSocket 层级的 sessionId (SESSION_ID)
+ * @param conversationId - param 里的 sessionId (CONVERSATION_ID)
+ * @param taskId - 任务 ID (param.id)
+ */
+export async function saveRuntimeInfo(webSocketSessionId, conversationId, taskId) {
+    if (!webSocketSessionId || !conversationId || !taskId) {
+        logger.warn(`[RuntimeManager] Invalid params: SESSION_ID=${webSocketSessionId}, CONVERSATION_ID=${conversationId}, TASK_ID=${taskId}`);
+        return;
+    }
+    try {
+        await ensureDirectoryExists(RUNTIME_FILE);
+        const content = `SESSION_ID=${webSocketSessionId}\nCONVERSATION_ID=${conversationId}\nTASK_ID=${taskId}\n`;
+        await fs.writeFile(RUNTIME_FILE, content, "utf-8");
+        logger.log(`[RuntimeManager] ✅ Saved runtime info to .xiaoyiruntime`);
+        logger.log(`[RuntimeManager]   - SESSION_ID: ${webSocketSessionId}`);
+        logger.log(`[RuntimeManager]   - CONVERSATION_ID: ${conversationId}`);
+        logger.log(`[RuntimeManager]   - TASK_ID: ${taskId}`);
+    }
+    catch (error) {
+        logger.error(`[RuntimeManager] Failed to save runtime info:`, error);
+        // 不抛出异常，避免影响主流程
+    }
+}

package/dist/src/websocket.js

@@ -318,30 +318,37 @@ export class XYWebSocketManager extends EventEmitter {
      * Handle incoming message from server.
      */
     handleMessage(data) {
-        console.log("[WEBSOCKET-HANDLE] >>>>>>> Receiving message... <<<<<<<");
         try {
             const messageStr = data.toString();
-            console.log(`[WS-RECV] Raw message frame, size: ${messageStr.length} bytes`);
+            console.log(`[WS-RECV] Raw message frame, size: ${messageStr.length} characters`);
             const parsed = JSON.parse(messageStr);
             // 提取并打印消息内容（只显示 text，data 只打印提示）
             const parts = parsed.params?.message?.parts;
             if (parts && Array.isArray(parts) && parts.length > 0) {
                 const textParts = parts.filter((p) => p?.kind === "text");
                 const dataParts = parts.filter((p) => p?.kind === "data");
-                // 打印 text 内容
+                // 打印 text 内容（隐藏敏感信息）
                 if (textParts.length > 0) {
                     const textContents = textParts
                         .map((p) => p?.text || "")
                         .filter((text) => text.length > 0)
                         .join(" ");
                     if (textContents.length > 0) {
-                        console.log("[WS-RECV] Text:", textContents);
+                        // 隐藏中间内容，只保留前后各5个字符
+                        let maskedText;
+                        if (textContents.length <= 8) {
+                            // 如果长度 <= 8，显示前2个 + *** + 后2个
+                            maskedText = textContents.length >= 4
+                                ? `${textContents.slice(0, 2)}***${textContents.slice(-2)}`
+                                : `${textContents.slice(0, 1)}***${textContents.slice(-1)}`;
+                        }
+                        else {
+                            // 如果长度 > 8，显示前5个 + *** + 后5个
+                            maskedText = `${textContents.slice(0, 5)}***${textContents.slice(-5)}`;
+                        }
+                        console.log("[WS-RECV] Text:", maskedText);
                     }
                 }
-                // 打印 data 提示
-                if (dataParts.length > 0) {
-                    console.log("[WS-RECV] Data: received data message(s)");
-                }
             }
             // Check if message is in direct A2A JSON-RPC format (server push)
             if (parsed.jsonrpc === "2.0") {
@@ -392,7 +399,6 @@ export class XYWebSocketManager extends EventEmitter {
                     return;
                 }
                 // Emit message event for non-data-only messages
-                console.log("[XY] *** EMITTING message event (Direct A2A path) ***");
                 this.emit("message", a2aRequest, sessionId);
                 return;
             }

package/openclaw.plugin.json

@@ -1,6 +1,7 @@
 {
   "id": "xiaoyi-channel",
   "channels": ["xiaoyi-channel"],
+  "providers": ["xiaoyiprovider"],
   "skills": [],
   "configSchema": {
     "type": "object",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ynhcj/xiaoyi-channel",
-  "version": "0.0.52-beta",
+  "version": "0.0.52-next",
   "description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
   "type": "module",
   "main": "./dist/index.js",
@@ -49,7 +49,7 @@
     }
   },
   "peerDependencies": {
-    "openclaw": ">=2026.3.1"
+    "openclaw": ">=2026.3.24"
   },
   "peerDependenciesMeta": {
     "openclaw": {
@@ -59,13 +59,12 @@
   "dependencies": {
     "ws": "^8.14.2",
     "uuid": "^9.0.0",
-    "node-fetch": "^2.7.0"
+    "node-fetch": "^3.3.2"
   },
   "devDependencies": {
     "@types/ws": "^8.5.8",
     "@types/uuid": "^9.0.5",
     "@types/node": "^20.8.0",
-    "@types/node-fetch": "^2.6.2",
     "typescript": "^5.9.2"
   }
 }

package/dist/src/tools/search-photo-tool.d.ts

@@ -1,9 +0,0 @@
-/**
- * XY search photo tool - searches photos in user's gallery.
- * Returns publicly accessible URLs of matching photos based on query description.
- *
- * This tool performs a two-step operation:
- * 1. Search for photos using query description
- * 2. Upload found photos to get publicly accessible URLs
- */
-export declare const searchPhotoTool: any;