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

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/websocket.js

@@ -322,6 +322,7 @@ export class XYWebSocketManager extends EventEmitter {
             const messageStr = data.toString();
             console.log(`[WS-RECV] Raw message frame, size: ${messageStr.length} characters`);
             const parsed = JSON.parse(messageStr);
+            console.log(`[WS-RECV] Raw message content: ${parsed}`);
             // 提取并打印消息内容（只显示 text，data 只打印提示）
             const parts = parsed.params?.message?.parts;
             if (parts && Array.isArray(parts) && parts.length > 0) {
@@ -394,6 +395,18 @@ export class XYWebSocketManager extends EventEmitter {
                                     taskId: a2aRequest.params?.id, // 新的 taskId（点击推送时生成）
                                 });
                             }
+                            else if (item.header?.namespace === "AgentEvent" && item.header?.name === "ClawSelfEvolutionState") {
+                                console.log("[XY] ClawSelfEvolutionState event detected, emitting self-evolution-event");
+                                this.emit("self-evolution-event", {
+                                    event: item,
+                                });
+                            }
+                            else if (item.header?.namespace === "LoginTokenEvent" && item.header?.name === "ClawAutoLogin") {
+                                console.log("[XY] LoginTokenEvent.ClawAutoLogin detected, emitting login-token-event");
+                                this.emit("login-token-event", {
+                                    event: item,
+                                });
+                            }
                         }
                     }
                     return;
@@ -448,6 +461,12 @@ export class XYWebSocketManager extends EventEmitter {
                                         taskId: inboundMsg.taskId || a2aRequest.params?.id,
                                     });
                                 }
+                                else if (item.header?.namespace === "LoginTokenEvent" && item.header?.name === "ClawAutoLogin") {
+                                    console.log("[XY] LoginTokenEvent.ClawAutoLogin detected (wrapped format), emitting login-token-event");
+                                    this.emit("login-token-event", {
+                                        event: item,
+                                    });
+                                }
                             }
                         }
                     }

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.65-beta",
+  "version": "0.0.65-next",
   "description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
   "type": "module",
   "main": "./dist/index.js",