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

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

@@ -1,153 +1,131 @@
-import { createNoteTool } from "./note-tool.js";
-import { createSearchNoteTool } from "./search-note-tool.js";
-import { createModifyNoteTool } from "./modify-note-tool.js";
-import { makeAlarmTool } from "./create-alarm-tool.js";
-import { createSearchAlarmTool } from "./search-alarm-tool.js";
-import { createModifyAlarmTool } from "./modify-alarm-tool.js";
-import { createDeleteAlarmTool } from "./delete-alarm-tool.js";
-import { createSearchContactTool } from "./search-contact-tool.js";
-import { createCallPhoneTool } from "./call-phone-tool.js";
-import { createSearchMessageTool } from "./search-message-tool.js";
-import { createSendMessageTool } from "./send-message-tool.js";
-import { createXiaoyiAddCollectionTool } from "./xiaoyi-add-collection-tool.js";
-import { createXiaoyiCollectionTool } from "./xiaoyi-collection-tool.js";
-import { createXiaoyiDeleteCollectionTool } from "./xiaoyi-delete-collection-tool.js";
-import { createCalendarTool } from "./calendar-tool.js";
-import { createSearchCalendarTool } from "./search-calendar-tool.js";
-import { createSearchPhotoGalleryTool } from "./search-photo-gallery-tool.js";
-import { createUploadPhotoTool } from "./upload-photo-tool.js";
-import { createSaveMediaToGalleryTool } from "./save-media-to-gallery-tool.js";
-import { createSearchFileTool } from "./search-file-tool.js";
-import { createUploadFileTool } from "./upload-file-tool.js";
-import { createSaveFileToPhoneTool } from "./save-file-to-phone-tool.js";
-import { createSendEmailTool } from "./send-email-tool.js";
-import { createSearchEmailTool } from "./search-email-tool.js";
+import { noteTool } from "./note-tool.js";
+import { searchNoteTool } from "./search-note-tool.js";
+import { modifyNoteTool } from "./modify-note-tool.js";
+import { createAlarmTool } from "./create-alarm-tool.js";
+import { searchAlarmTool } from "./search-alarm-tool.js";
+import { modifyAlarmTool } from "./modify-alarm-tool.js";
+import { deleteAlarmTool } from "./delete-alarm-tool.js";
+import { searchContactTool } from "./search-contact-tool.js";
+import { callPhoneTool } from "./call-phone-tool.js";
+import { searchMessageTool } from "./search-message-tool.js";
+import { sendMessageTool } from "./send-message-tool.js";
+import { xiaoyiAddCollectionTool } from "./xiaoyi-add-collection-tool.js";
+import { xiaoyiCollectionTool } from "./xiaoyi-collection-tool.js";
+import { xiaoyiDeleteCollectionTool } from "./xiaoyi-delete-collection-tool.js";
+import { calendarTool } from "./calendar-tool.js";
+import { searchCalendarTool } from "./search-calendar-tool.js";
+import { searchPhotoGalleryTool } from "./search-photo-gallery-tool.js";
+import { uploadPhotoTool } from "./upload-photo-tool.js";
+import { saveMediaToGalleryTool } from "./save-media-to-gallery-tool.js";
+import { searchFileTool } from "./search-file-tool.js";
+import { uploadFileTool } from "./upload-file-tool.js";
+import { saveFileToPhoneTool } from "./save-file-to-phone-tool.js";
+import { sendEmailTool } from "./send-email-tool.js";
+import { searchEmailTool } from "./search-email-tool.js";
+import { getCachedXYWebSocketManager } from "../client.js";
 import { sendStatusUpdate } from "../formatter.js";
-import { getCurrentTaskId, getCurrentMessageId } from "../task-manager.js";
+import { getCurrentSessionContext } from './session-manager.js';
 /**
  * call_device_tool - 通用端工具调度器。
  * LLM 必须先通过 get_xxx_tool_schema 获取具体工具 schema，再用本工具执行。
  */
-export function createCallDeviceTool(ctx) {
-    const { config, sessionId, taskId, messageId } = ctx;
-    const noteTool = createNoteTool(ctx);
-    const modifyNoteTool = createModifyNoteTool(ctx);
-    const createAlarmTool = makeAlarmTool(ctx);
-    const modifyAlarmTool = createModifyAlarmTool(ctx);
-    const deleteAlarmTool = createDeleteAlarmTool(ctx);
-    const callPhoneTool = createCallPhoneTool(ctx);
-    const calendarTool = createCalendarTool(ctx);
-    const searchNoteTool = createSearchNoteTool(ctx);
-    const searchMessageTool = createSearchMessageTool(ctx);
-    const sendMessageTool = createSendMessageTool(ctx);
-    const xiaoyiAddCollectionTool = createXiaoyiAddCollectionTool(ctx);
-    const xiaoyiCollectionTool = createXiaoyiCollectionTool(ctx);
-    const xiaoyiDeleteCollectionTool = createXiaoyiDeleteCollectionTool(ctx);
-    const searchPhotoGalleryTool = createSearchPhotoGalleryTool(ctx);
-    const uploadPhotoTool = createUploadPhotoTool(ctx);
-    const uploadFileTool = createUploadFileTool(ctx);
-    const sendEmailTool = createSendEmailTool(ctx);
-    const searchAlarmTool = createSearchAlarmTool(ctx);
-    const searchContactTool = createSearchContactTool(ctx);
-    const searchCalendarTool = createSearchCalendarTool(ctx);
-    const saveMediaToGalleryTool = createSaveMediaToGalleryTool(ctx);
-    const searchFileTool = createSearchFileTool(ctx);
-    const saveFileToPhoneTool = createSaveFileToPhoneTool(ctx);
-    const searchEmailTool = createSearchEmailTool(ctx);
-    /**
-     * 端工具注册表 —— 按 name 索引所有可通过 call_device_tool 调度的工具。
-     */
-    const deviceToolRegistry = new Map([
-        [noteTool.name, noteTool],
-        [searchNoteTool.name, searchNoteTool],
-        [modifyNoteTool.name, modifyNoteTool],
-        [createAlarmTool.name, createAlarmTool],
-        [searchAlarmTool.name, searchAlarmTool],
-        [modifyAlarmTool.name, modifyAlarmTool],
-        [deleteAlarmTool.name, deleteAlarmTool],
-        [searchContactTool.name, searchContactTool],
-        [callPhoneTool.name, callPhoneTool],
-        [searchMessageTool.name, searchMessageTool],
-        [sendMessageTool.name, sendMessageTool],
-        [xiaoyiAddCollectionTool.name, xiaoyiAddCollectionTool],
-        [xiaoyiCollectionTool.name, xiaoyiCollectionTool],
-        [xiaoyiDeleteCollectionTool.name, xiaoyiDeleteCollectionTool],
-        [calendarTool.name, calendarTool],
-        [searchCalendarTool.name, searchCalendarTool],
-        [searchPhotoGalleryTool.name, searchPhotoGalleryTool],
-        [uploadPhotoTool.name, uploadPhotoTool],
-        [saveMediaToGalleryTool.name, saveMediaToGalleryTool],
-        [searchFileTool.name, searchFileTool],
-        [uploadFileTool.name, uploadFileTool],
-        [saveFileToPhoneTool.name, saveFileToPhoneTool],
-        [sendEmailTool.name, sendEmailTool],
-        [searchEmailTool.name, searchEmailTool],
-    ]);
-    return {
-        name: "call_device_tool",
-        label: "Call Device Tool",
-        description: "用户设备侧工具调用。必须先调用get_xxx_tool_schema获取了具体的工具schema，才能使用本工具执行对应设备侧工具。",
-        parameters: {
-            type: "object",
-            properties: {
-                toolName: {
-                    type: "string",
-                    description: "要调用的具体端工具名称，即get_xxx_tool_schema返回的工具的name",
-                },
-                arguments: {
-                    type: "object",
-                    description: "工具所需的具体参数JSON键值对",
-                },
+/**
+ * 端工具注册表 —— 按 name 索引所有可通过 call_device_tool 调度的工具。
+ */
+const deviceToolRegistry = new Map([
+    [noteTool.name, noteTool],
+    [searchNoteTool.name, searchNoteTool],
+    [modifyNoteTool.name, modifyNoteTool],
+    [createAlarmTool.name, createAlarmTool],
+    [searchAlarmTool.name, searchAlarmTool],
+    [modifyAlarmTool.name, modifyAlarmTool],
+    [deleteAlarmTool.name, deleteAlarmTool],
+    [searchContactTool.name, searchContactTool],
+    [callPhoneTool.name, callPhoneTool],
+    [searchMessageTool.name, searchMessageTool],
+    [sendMessageTool.name, sendMessageTool],
+    [xiaoyiAddCollectionTool.name, xiaoyiAddCollectionTool],
+    [xiaoyiCollectionTool.name, xiaoyiCollectionTool],
+    [xiaoyiDeleteCollectionTool.name, xiaoyiDeleteCollectionTool],
+    [calendarTool.name, calendarTool],
+    [searchCalendarTool.name, searchCalendarTool],
+    [searchPhotoGalleryTool.name, searchPhotoGalleryTool],
+    [uploadPhotoTool.name, uploadPhotoTool],
+    [saveMediaToGalleryTool.name, saveMediaToGalleryTool],
+    [searchFileTool.name, searchFileTool],
+    [uploadFileTool.name, uploadFileTool],
+    [saveFileToPhoneTool.name, saveFileToPhoneTool],
+    [sendEmailTool.name, sendEmailTool],
+    [searchEmailTool.name, searchEmailTool],
+]);
+export const callDeviceTool = {
+    name: "call_device_tool",
+    label: "Call Device Tool",
+    description: "用户设备侧工具调用。必须先调用get_xxx_tool_schema获取了具体的工具schema，才能使用本工具执行对应设备侧工具。",
+    parameters: {
+        type: "object",
+        properties: {
+            toolName: {
+                type: "string",
+                description: "要调用的具体端工具名称，即get_xxx_tool_schema返回的工具的name",
+            },
+            arguments: {
+                type: "object",
+                description: "工具所需的具体参数JSON键值对",
             },
-            required: ["toolName", "arguments"],
         },
-        async execute(toolCallId, params) {
-            const { toolName, arguments: toolArgs } = params;
-            // 向用户端发送具体工具名的状态更新
-            const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
-            const currentMessageId = getCurrentMessageId(sessionId) ?? messageId;
-            try {
-                await sendStatusUpdate({
-                    config,
-                    sessionId,
-                    taskId: currentTaskId,
-                    messageId: currentMessageId,
-                    text: `正在使用工具: ${toolName}...`,
-                    state: "working",
-                });
-            }
-            catch (_) {
-                // 状态更新失败不影响工具执行
-            }
-            const tool = deviceToolRegistry.get(toolName);
-            if (!tool) {
+        required: ["toolName", "arguments"],
+    },
+    async execute(toolCallId, params) {
+        const ctx = getCurrentSessionContext();
+        const wsManager = getCachedXYWebSocketManager();
+        const config = wsManager.config;
+        const sessionId = ctx?.sessionId ?? "";
+        const taskId = ctx?.taskId ?? "";
+        const messageId = ctx?.messageId ?? "";
+        const { toolName, arguments: toolArgs } = params;
+        // 向用户端发送具体工具名的状态更新
+        try {
+            await sendStatusUpdate({
+                config,
+                sessionId,
+                taskId,
+                messageId,
+                text: `正在使用工具: ${toolName}...`,
+                state: "working",
+            });
+        }
+        catch (_) {
+            // 状态更新失败不影响工具执行
+        }
+        const tool = deviceToolRegistry.get(toolName);
+        if (!tool) {
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: `端工具${toolName}不存在。请确保toolName为get_xxx_tool_schema返回的工具的name。`,
+                    },
+                ],
+            };
+        }
+        try {
+            return await tool.execute(toolCallId, toolArgs);
+        }
+        catch (error) {
+            // ToolInputError (.name === "ToolInputError") 或其他参数校验错误
+            if (error.name === "ToolInputError") {
                 return {
                     content: [
                         {
                             type: "text",
-                            text: `端工具${toolName}不存在。请确保toolName为get_xxx_tool_schema返回的工具的name。`,
+                            text: `端工具参数错误：${error.message}。请确保arguments符合get_xxx_tool_schema返回的工具schema。`,
                         },
                     ],
                 };
             }
-            try {
-                return await tool.execute(toolCallId, toolArgs);
-            }
-            catch (error) {
-                // ToolInputError (.name === "ToolInputError") 或其他参数校验错误
-                if (error.name === "ToolInputError") {
-                    return {
-                        content: [
-                            {
-                                type: "text",
-                                text: `端工具参数错误：${error.message}。请确保arguments符合get_xxx_tool_schema返回的工具schema。`,
-                            },
-                        ],
-                    };
-                }
-                // 非参数错误（网络超时等），直接向上抛出
-                throw error;
-            }
-        },
-    };
-}
+            // 非参数错误（网络超时等），直接向上抛出
+            throw error;
+        }
+    },
+};

package/dist/src/tools/call-phone-tool.d.ts

@@ -1,6 +1,25 @@
-import type { SessionContext } from "./session-manager.js";
 /**
  * XY call phone tool - makes a phone call on user's device.
  * Requires phoneNumber parameter and optional slotId (0 for primary SIM, 1 for secondary SIM).
  */
-export declare function createCallPhoneTool(ctx: SessionContext): any;
+export declare const callPhoneTool: {
+    name: string;
+    label: string;
+    description: string;
+    parameters: {
+        type: string;
+        properties: {
+            phoneNumber: {
+                type: string;
+                description: string;
+            };
+            slotId: {
+                type: string;
+                description: string;
+                default: number;
+            };
+        };
+        required: string[];
+    };
+    execute(toolCallId: string, params: any): Promise<unknown>;
+};

package/dist/src/tools/call-phone-tool.js

@@ -1,127 +1,125 @@
-import { getXYWebSocketManager } from "../client.js";
+import { getCachedXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
-import { getCurrentTaskId } from "../task-manager.js";
+import { getCurrentSessionContext } from './session-manager.js';
 import { logger } from "../utils/logger.js";
 /**
  * XY call phone tool - makes a phone call on user's device.
  * Requires phoneNumber parameter and optional slotId (0 for primary SIM, 1 for secondary SIM).
  */
-export function createCallPhoneTool(ctx) {
-    const { config, sessionId, taskId, messageId } = ctx;
-    return {
-        name: "call_phone",
-        label: "Call Phone",
-        description: "拨打电话。需要提供要拨打的电话号码。slotId参数可选，默认为0（主卡），如果用户明确要求使用副卡则设置为1。注意:操作超时时间为60秒,请勿重复调用此工具,如果超时或失败,最多重试一次。回复约束：如果工具返回没有授权或者其他报错，只需要完整描述没有授权或者其他报错内容即可，不需要主动给用户提供解决方案，例如告诉用户如何授权，如何解决报错等都是不需要的，请严格遵守。",
-        parameters: {
-            type: "object",
-            properties: {
-                phoneNumber: {
-                    type: "string",
-                    description: "要拨打的电话号码",
-                },
-                slotId: {
-                    type: "number",
-                    description: "SIM卡槽ID，默认为0（主卡），设置为1表示副卡。仅当用户明确要求使用副卡时才设置为1",
-                    default: 0,
-                },
+export const callPhoneTool = {
+    name: "call_phone",
+    label: "Call Phone",
+    description: "拨打电话。需要提供要拨打的电话号码。slotId参数可选，默认为0（主卡），如果用户明确要求使用副卡则设置为1。注意:操作超时时间为60秒,请勿重复调用此工具,如果超时或失败,最多重试一次。回复约束：如果工具返回没有授权或者其他报错，只需要完整描述没有授权或者其他报错内容即可，不需要主动给用户提供解决方案，例如告诉用户如何授权，如何解决报错等都是不需要的，请严格遵守。",
+    parameters: {
+        type: "object",
+        properties: {
+            phoneNumber: {
+                type: "string",
+                description: "要拨打的电话号码",
+            },
+            slotId: {
+                type: "number",
+                description: "SIM卡槽ID，默认为0（主卡），设置为1表示副卡。仅当用户明确要求使用副卡时才设置为1",
+                default: 0,
             },
-            required: ["phoneNumber"],
         },
-        async execute(toolCallId, params) {
-            // Validate phoneNumber parameter
-            if (!params.phoneNumber || typeof params.phoneNumber !== "string" || params.phoneNumber.trim() === "") {
-                throw new Error("Missing required parameter: phoneNumber must be a non-empty string");
-            }
-            // Set default slotId if not provided
-            const slotId = params.slotId !== undefined && params.slotId !== null ? params.slotId : 0;
-            // Validate slotId (must be 0 or 1)
-            if (slotId !== 0 && slotId !== 1) {
-                throw new Error("Invalid slotId: must be 0 (primary SIM) or 1 (secondary SIM)");
-            }
-            // Get WebSocket manager
-            const wsManager = getXYWebSocketManager(config);
-            // Build StartCall command
-            const command = {
-                header: {
-                    namespace: "Common",
-                    name: "Action",
-                },
-                payload: {
-                    cardParam: {},
-                    executeParam: {
-                        executeMode: "background",
-                        intentName: "StartCall",
-                        bundleName: "com.huawei.hmos.aidispatchservice",
-                        dimension: "",
-                        needUnlock: true,
-                        actionResponse: true,
-                        timeOut: 5,
-                        intentParam: {
-                            phoneNumber: params.phoneNumber.trim(),
-                            slotId: slotId,
-                        },
-                        permissionId: [],
-                        achieveType: "INTENT",
+        required: ["phoneNumber"],
+    },
+    async execute(toolCallId, params) {
+        const _c = getCurrentSessionContext();
+        const { config, sessionId, taskId, messageId } = _c;
+        // Validate phoneNumber parameter
+        if (!params.phoneNumber || typeof params.phoneNumber !== "string" || params.phoneNumber.trim() === "") {
+            throw new Error("Missing required parameter: phoneNumber must be a non-empty string");
+        }
+        // Set default slotId if not provided
+        const slotId = params.slotId !== undefined && params.slotId !== null ? params.slotId : 0;
+        // Validate slotId (must be 0 or 1)
+        if (slotId !== 0 && slotId !== 1) {
+            throw new Error("Invalid slotId: must be 0 (primary SIM) or 1 (secondary SIM)");
+        }
+        // Get WebSocket manager
+        const wsManager = getCachedXYWebSocketManager();
+        // Build StartCall command
+        const command = {
+            header: {
+                namespace: "Common",
+                name: "Action",
+            },
+            payload: {
+                cardParam: {},
+                executeParam: {
+                    executeMode: "background",
+                    intentName: "StartCall",
+                    bundleName: "com.huawei.hmos.aidispatchservice",
+                    dimension: "",
+                    needUnlock: true,
+                    actionResponse: true,
+                    timeOut: 5,
+                    intentParam: {
+                        phoneNumber: params.phoneNumber.trim(),
+                        slotId: slotId,
                     },
-                    responses: [
-                        {
-                            resultCode: "",
-                            displayText: "",
-                            ttsText: "",
-                        },
-                    ],
-                    needUploadResult: true,
-                    noHalfPage: false,
-                    pageControlRelated: false,
+                    permissionId: [],
+                    achieveType: "INTENT",
                 },
-            };
-            // Send command and wait for response (60 second timeout)
-            return new Promise((resolve, reject) => {
-                const timeout = setTimeout(() => {
-                    wsManager.off("data-event", handler);
-                    logger.error("超时: 拨打电话超时（60秒）", { toolCallId });
-                    reject(new Error("拨打电话超时（60秒）"));
-                }, 60000);
-                // Listen for data events from WebSocket
-                const handler = (event) => {
-                    if (event.intentName === "StartCall") {
-                        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(`拨打电话失败: ${JSON.stringify(event.outputs)}`));
-                        }
-                    }
-                };
-                // Register event handler
-                wsManager.on("data-event", handler);
-                // Send the command
-                const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
-                sendCommand({
-                    config,
-                    sessionId,
-                    taskId: currentTaskId,
-                    messageId,
-                    command,
-                    toolCallId,
-                })
-                    .then(() => {
-                })
-                    .catch((error) => {
+                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);
+                logger.error("超时: 拨打电话超时（60秒）", { toolCallId });
+                reject(new Error("拨打电话超时（60秒）"));
+            }, 60000);
+            // Listen for data events from WebSocket
+            const handler = (event) => {
+                if (event.intentName === "StartCall") {
                     clearTimeout(timeout);
                     wsManager.off("data-event", handler);
-                    reject(error);
-                });
+                    if (event.status === "success" && event.outputs) {
+                        resolve({
+                            content: [
+                                {
+                                    type: "text",
+                                    text: JSON.stringify(event.outputs),
+                                },
+                            ],
+                        });
+                    }
+                    else {
+                        reject(new Error(`拨打电话失败: ${JSON.stringify(event.outputs)}`));
+                    }
+                }
+            };
+            // Register event handler
+            wsManager.on("data-event", handler);
+            // Send the command
+            sendCommand({
+                config,
+                sessionId,
+                taskId,
+                messageId,
+                command,
+                toolCallId,
+            })
+                .then(() => {
+            })
+                .catch((error) => {
+                clearTimeout(timeout);
+                wsManager.off("data-event", handler);
+                reject(error);
             });
-        },
-    };
-}
+        });
+    },
+};

package/dist/src/tools/check-plugin-privilege-tool.d.ts

@@ -1,6 +1,20 @@
-import type { SessionContext } from "./session-manager.js";
 /**
  * XY check plugin privilege tool - checks user authorization for device-side tools
  * used in scheduled tasks.
  */
-export declare function createCheckPluginPrivilegeTool(ctx: SessionContext): any;
+export declare const checkPluginPrivilegeTool: {
+    name: string;
+    label: string;
+    description: string;
+    parameters: {
+        type: string;
+        properties: {
+            checkIntentName: {
+                type: string;
+                description: string;
+            };
+        };
+        required: string[];
+    };
+    execute(toolCallId: string, params: any): Promise<unknown>;
+};