@ynhcj/xiaoyi-channel 0.0.153-beta → 0.0.154-beta

package/dist/src/tools/discover-cross-devices-tool.js

@@ -0,0 +1,235 @@
+import { sendCommand, sendStatusUpdate } from "../formatter.js";
+import { getXYWebSocketManager } from "../client.js";
+import { getCurrentMessageId, getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
+const DISCOVER_DEVICES_INTENT = "SearchAllDeviceInfo";
+const DISCOVER_DEVICES_BUNDLE = "com.huawei.hmos.vassistant";
+const DISCOVER_DEVICES_TIMEOUT_MS = 30_000;
+const LOG_TAG = "[GetPCDeviceList]";
+const DISCOVER_DEVICES_STATUS_TEXT = "正在查询设备列表...";
+const DEVICE_TYPE_LABELS = {
+    "14": "phone",
+    "17": "pad",
+    "131": "car",
+    "2607": "PC",
+};
+function buildResultText(result) {
+    return {
+        content: [
+            {
+                type: "text",
+                text: JSON.stringify(result),
+            },
+        ],
+    };
+}
+function normalizeDevices(rawDevices) {
+    if (!Array.isArray(rawDevices)) {
+        return [];
+    }
+    return rawDevices
+        .filter((item) => Boolean(item) && typeof item === "object")
+        .map((device) => {
+        const networkId = typeof device.networkId === "string"
+            ? device.networkId
+            : typeof device.deviceId === "string"
+                ? device.deviceId
+                : "";
+        const deviceTypeId = typeof device.deviceTypeId === "string"
+            ? device.deviceTypeId
+            : typeof device.deviceType === "string"
+                ? device.deviceType
+                : "";
+        return {
+            networkId,
+            deviceName: typeof device.deviceName === "string" ? device.deviceName : "",
+            deviceTypeId,
+            deviceTypeLabel: DEVICE_TYPE_LABELS[deviceTypeId] ?? "unknown",
+            nearby: device.nearby === true,
+            rawDevice: device,
+        };
+    });
+}
+function inferDesiredDeviceTypes(query) {
+    const normalized = query.toLowerCase();
+    if (/(pc|computer|desktop|laptop|notebook)/iu.test(normalized) || /电脑|台式机|笔记本/iu.test(query)) {
+        return ["2607"];
+    }
+    if (/(tablet|pad|ipad)/iu.test(normalized) || /平板/iu.test(query)) {
+        return ["17"];
+    }
+    if (/(phone|mobile)/iu.test(normalized) || /手机/iu.test(query)) {
+        return ["14"];
+    }
+    return [];
+}
+function sortByNearby(devices) {
+    return [...devices].sort((a, b) => Number(b.nearby) - Number(a.nearby));
+}
+function recommendDevices(query, devices) {
+    const desiredTypes = inferDesiredDeviceTypes(query);
+    if (desiredTypes.length === 0) {
+        return {
+            recommendedDevices: [],
+            recommendationReason: "No explicit target device type was detected in the query.",
+            needsUserSelection: devices.length > 1,
+            selectionPrompt: devices.length > 1
+                ? "The query does not identify a unique device type. Ask the user to choose a target device by deviceName or networkId before sending a cross-device task."
+                : "",
+        };
+    }
+    const matches = devices.filter((device) => desiredTypes.includes(device.deviceTypeId));
+    if (matches.length === 0) {
+        return {
+            recommendedDevices: [],
+            recommendationReason: `No discovered device matches requested type(s): ${desiredTypes.join(", ")}.`,
+            needsUserSelection: false,
+            selectionPrompt: "",
+        };
+    }
+    const sortedMatches = sortByNearby(matches);
+    return {
+        recommendedDevices: sortedMatches,
+        recommendationReason: `Matched requested device type(s): ${desiredTypes.join(", ")}. Nearby devices are ranked first.`,
+        needsUserSelection: sortedMatches.length > 1,
+        selectionPrompt: sortedMatches.length > 1
+            ? "Multiple candidate devices match the user request. Ask the user to choose one target device by deviceName or networkId before calling send_cross_device_task."
+            : "",
+    };
+}
+export function createDiscoverCrossDevicesTool(ctx) {
+    const { config, sessionId, taskId, messageId } = ctx;
+    return {
+        name: "discover_cross_devices",
+        label: "发现跨设备协作设备",
+        description: `跨设备协作的设备发现工具。
+
+当用户明确表达要从另一台设备获取、查找、使用或操作内容时，必须优先调用本工具，例如从 PC、电脑、平板、手机等设备获取文件或查找内容。
+
+本工具只做设备发现和目标设备推荐，不会读取副设备文件内容，不会上传文件，也不会真正下发跨端执行任务。`,
+        parameters: {
+            type: "object",
+            properties: {
+                query: {
+                    type: "string",
+                    description: "The user's original cross-device request, used to recommend the target device type.",
+                },
+            },
+            required: ["query"],
+        },
+        async execute(_toolCallId, params) {
+            const query = typeof params.query === "string" ? params.query.trim() : "";
+            logger.log(`${LOG_TAG} tool invoked`);
+            if (!query) {
+                return buildResultText({
+                    success: false,
+                    rawOutputs: null,
+                    devices: [],
+                    recommendedDevices: [],
+                    recommendationReason: "",
+                    message: "Missing required parameter: query.",
+                });
+            }
+            const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
+            const currentMessageId = getCurrentMessageId(sessionId) ?? messageId;
+            const wsManager = getXYWebSocketManager(config);
+            const command = {
+                header: {
+                    namespace: "Common",
+                    name: "Action",
+                },
+                payload: {
+                    needUploadResult: true,
+                    actionResponseConfig: {},
+                    response: [],
+                    executeParam: {
+                        executeMode: "background",
+                        intentName: DISCOVER_DEVICES_INTENT,
+                        intentParam: {},
+                        bundleName: DISCOVER_DEVICES_BUNDLE,
+                    },
+                },
+            };
+            return new Promise((resolve) => {
+                let timeout;
+                let handler;
+                let settled = false;
+                const cleanup = () => {
+                    clearTimeout(timeout);
+                    wsManager.off("data-event", handler);
+                };
+                const finish = (result) => {
+                    if (settled) {
+                        return;
+                    }
+                    settled = true;
+                    cleanup();
+                    resolve(buildResultText(result));
+                };
+                handler = (event) => {
+                    if (event.intentName !== DISCOVER_DEVICES_INTENT) {
+                        return;
+                    }
+                    const rawOutputs = event.outputs ?? {};
+                    const code = rawOutputs.code;
+                    const success = event.status === "success" && String(code) === "0";
+                    const devices = normalizeDevices(rawOutputs.result?.devices);
+                    const recommendation = recommendDevices(query, devices);
+                    logger.log(`${LOG_TAG} completed, success=${success}, deviceCount=${devices.length}, recommendedCount=${recommendation.recommendedDevices.length}`);
+                    finish({
+                        success,
+                        rawOutputs,
+                        devices,
+                        recommendedDevices: recommendation.recommendedDevices,
+                        recommendationReason: recommendation.recommendationReason,
+                        needsUserSelection: recommendation.needsUserSelection,
+                        selectionPrompt: recommendation.selectionPrompt,
+                        message: success
+                            ? recommendation.needsUserSelection
+                                ? `Discovered ${devices.length} device(s). Multiple candidates may match; ask the user to choose the target device before sending a cross-device task.`
+                                : `Discovered ${devices.length} device(s). The model should choose the final target device based on the user request.`
+                            : "Device discovery failed on the device side.",
+                    });
+                };
+                timeout = setTimeout(() => {
+                    logger.log(`${LOG_TAG} timeout waiting UploadExeResult after ${DISCOVER_DEVICES_TIMEOUT_MS}ms`);
+                    finish({
+                        success: false,
+                        rawOutputs: null,
+                        devices: [],
+                        recommendedDevices: [],
+                        recommendationReason: "",
+                        message: `Device discovery timed out after ${DISCOVER_DEVICES_TIMEOUT_MS / 1000} seconds.`,
+                    });
+                }, DISCOVER_DEVICES_TIMEOUT_MS);
+                wsManager.on("data-event", handler);
+                sendStatusUpdate({
+                    config,
+                    sessionId,
+                    taskId: currentTaskId,
+                    messageId: currentMessageId,
+                    text: DISCOVER_DEVICES_STATUS_TEXT,
+                    state: "working",
+                })
+                    .then(() => sendCommand({
+                    config,
+                    sessionId,
+                    taskId: currentTaskId,
+                    messageId: currentMessageId,
+                    command,
+                }))
+                    .catch((error) => {
+                    logger.error(`${LOG_TAG} failed to send device discovery command: ${error instanceof Error ? error.message : String(error)}`);
+                    finish({
+                        success: false,
+                        rawOutputs: null,
+                        devices: [],
+                        recommendedDevices: [],
+                        recommendationReason: "",
+                        message: `Failed to send device discovery command: ${error instanceof Error ? error.message : String(error)}`,
+                    });
+                });
+            });
+        },
+    };
+}

package/dist/src/tools/find-pc-devices-tool.js

@@ -82,6 +82,7 @@ export function createFindPcDevicesTool(ctx) {
                     taskId,
                     messageId,
                     command,
+                    toolCallId,
                 }).then(() => {
                 }).catch((error) => {
                     clearTimeout(timeout);

package/dist/src/tools/location-tool.js

@@ -90,6 +90,7 @@ export function createLocationTool(ctx) {
                     taskId: currentTaskId,
                     messageId,
                     command,
+                    toolCallId,
                 }).then(() => {
                 }).catch((error) => {
                     clearTimeout(timeout);

package/dist/src/tools/modify-alarm-tool.js

@@ -270,6 +270,7 @@ export function createModifyAlarmTool(ctx) {
                     taskId: currentTaskId,
                     messageId,
                     command,
+                    toolCallId,
                 })
                     .then(() => {
                 })

package/dist/src/tools/modify-note-tool.js

@@ -111,6 +111,7 @@ export function createModifyNoteTool(ctx) {
                     taskId: currentTaskId,
                     messageId,
                     command,
+                    toolCallId,
                 })
                     .then(() => {
                 })

package/dist/src/tools/note-tool.js

@@ -128,6 +128,7 @@ export function createNoteTool(ctx) {
                     taskId: currentTaskId,
                     messageId,
                     command,
+                    toolCallId,
                 }).catch((error) => {
                     clearTimeout(timeout);
                     wsManager.off("data-event", handler);

package/dist/src/tools/query-app-message-tool.js

@@ -47,7 +47,7 @@ c. 调用工具前需认真检查调用参数是否满足工具要求
             },
             required: [],
         },
-        async execute(_toolCallId, params) {
+        async execute(toolCallId, params) {
             const wsManager = getXYWebSocketManager(config);
             const intentParam = {};
             if (params.startTime !== undefined)
@@ -96,7 +96,7 @@ c. 调用工具前需认真检查调用参数是否满足工具要求
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
-                    logger.error("超时: 查询通知消息超时（60秒）", { toolCallId: _toolCallId });
+                    logger.error("超时: 查询通知消息超时（60秒）", { toolCallId: toolCallId });
                     reject(new Error("查询通知消息超时（60秒）"));
                 }, 60000);
                 const handler = (event) => {
@@ -126,6 +126,7 @@ c. 调用工具前需认真检查调用参数是否满足工具要求
                     taskId: currentTaskId,
                     messageId,
                     command,
+                    toolCallId,
                 })
                     .then(() => { })
                     .catch((error) => {

package/dist/src/tools/query-memory-data-tool.js

@@ -56,7 +56,7 @@ c. 调用工具前需认真检查调用参数是否满足工具要求
             },
             required: [],
         },
-        async execute(_toolCallId, params) {
+        async execute(toolCallId, params) {
             const { category, subCategory } = params;
             // Validate category
             if (category && !VALID_CATEGORIES.includes(category)) {
@@ -112,7 +112,7 @@ c. 调用工具前需认真检查调用参数是否满足工具要求
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
-                    logger.error("超时: 查询记忆数据超时（60秒）", { toolCallId: _toolCallId });
+                    logger.error("超时: 查询记忆数据超时（60秒）", { toolCallId: toolCallId });
                     reject(new Error("查询记忆数据超时（60秒）"));
                 }, 60000);
                 const handler = (event) => {
@@ -142,6 +142,7 @@ c. 调用工具前需认真检查调用参数是否满足工具要求
                     taskId: currentTaskId,
                     messageId,
                     command,
+                    toolCallId,
                 })
                     .then(() => { })
                     .catch((error) => {

package/dist/src/tools/query-todo-task-tool.js

@@ -44,7 +44,7 @@ d. 当只传入 startTime 时，返回该时间点之后的所有任务；当只
             },
             required: [],
         },
-        async execute(_toolCallId, params) {
+        async execute(toolCallId, params) {
             const { status } = params;
             if (status && !["all", "completed", "pending"].includes(status)) {
                 throw new ToolInputError('status 参数只能为 "all"、"completed" 或 "pending"');
@@ -91,7 +91,7 @@ d. 当只传入 startTime 时，返回该时间点之后的所有任务；当只
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
-                    logger.error("超时: 查询待办任务超时（60秒）", { toolCallId: _toolCallId });
+                    logger.error("超时: 查询待办任务超时（60秒）", { toolCallId: toolCallId });
                     reject(new Error("查询待办任务超时（60秒）"));
                 }, 60000);
                 const handler = (event) => {
@@ -121,6 +121,7 @@ d. 当只传入 startTime 时，返回该时间点之后的所有任务；当只
                     taskId: currentTaskId,
                     messageId,
                     command,
+                    toolCallId,
                 })
                     .then(() => { })
                     .catch((error) => {

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

@@ -152,6 +152,7 @@ export function createSaveFileToPhoneTool(ctx) {
                     taskId: currentTaskId,
                     messageId,
                     command,
+                    toolCallId,
                 })
                     .then(() => {
                 })

package/dist/src/tools/save-media-to-gallery-tool.js

@@ -160,6 +160,7 @@ export function createSaveMediaToGalleryTool(ctx) {
                     taskId: currentTaskId,
                     messageId,
                     command,
+                    toolCallId,
                 })
                     .then(() => {
                 })

package/dist/src/tools/search-alarm-tool.js

@@ -202,6 +202,7 @@ b. 使用该工具之前需获取当前真实时间
                     taskId: currentTaskId,
                     messageId,
                     command,
+                    toolCallId,
                 })
                     .then(() => {
                 })

package/dist/src/tools/search-calendar-tool.js

@@ -173,6 +173,7 @@ d. 如果查询结果返回-303，代表查询结果为空
                     taskId: currentTaskId,
                     messageId,
                     command,
+                    toolCallId,
                 })
                     .then(() => {
                 })

package/dist/src/tools/search-contact-tool.js

@@ -101,6 +101,7 @@ export function createSearchContactTool(ctx) {
                     taskId: currentTaskId,
                     messageId,
                     command,
+                    toolCallId,
                 })
                     .then(() => {
                 })

package/dist/src/tools/search-email-tool.js

@@ -40,7 +40,7 @@ b. 使用该工具之前需获取当前真实时间
             },
             required: ["queryText"],
         },
-        async execute(_toolCallId, params) {
+        async execute(toolCallId, params) {
             // ===== Validate queryText =====
             if (!params.queryText || typeof params.queryText !== "string" || !params.queryText.trim()) {
                 throw new Error("queryText 为必填参数，且不能为空字符串");
@@ -91,7 +91,7 @@ b. 使用该工具之前需获取当前真实时间
             return new Promise((resolve, reject) => {
                 const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
-                    logger.error("超时: 检索邮件超时（60秒）", { toolCallId: _toolCallId });
+                    logger.error("超时: 检索邮件超时（60秒）", { toolCallId: toolCallId });
                     reject(new Error("检索邮件超时（60秒）"));
                 }, 60000);
                 // Listen for data events from WebSocket
@@ -124,6 +124,7 @@ b. 使用该工具之前需获取当前真实时间
                     taskId: currentTaskId,
                     messageId,
                     command,
+                    toolCallId,
                 })
                     .then(() => { })
                     .catch((error) => {

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

@@ -117,6 +117,7 @@ export function createSearchFileTool(ctx) {
                     taskId: currentTaskId,
                     messageId,
                     command,
+                    toolCallId,
                 })
                     .then(() => {
                 })

package/dist/src/tools/search-message-tool.js

@@ -103,6 +103,7 @@ export function createSearchMessageTool(ctx) {
                     taskId: currentTaskId,
                     messageId,
                     command,
+                    toolCallId,
                 })
                     .then(() => {
                 })

package/dist/src/tools/search-note-tool.js

@@ -100,6 +100,7 @@ export function createSearchNoteTool(ctx) {
                     taskId: currentTaskId,
                     messageId,
                     command,
+                    toolCallId,
                 }).then(() => {
                 }).catch((error) => {
                     clearTimeout(timeout);

package/dist/src/tools/search-photo-gallery-tool.js

@@ -75,7 +75,7 @@ export function createSearchPhotoGalleryTool(ctx) {
             const wsManager = getXYWebSocketManager(config);
             // Search for photos
             const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
-            const outputs = await searchPhotos(wsManager, config, sessionId, currentTaskId, messageId, params.query);
+            const outputs = await searchPhotos(wsManager, config, sessionId, currentTaskId, messageId, toolCallId, params.query);
             return {
                 content: [
                     {
@@ -91,7 +91,7 @@ export function createSearchPhotoGalleryTool(ctx) {
  * Search for photos using query description
  * Returns complete event.outputs object
  */
-async function searchPhotos(wsManager, config, sessionId, taskId, messageId, query) {
+async function searchPhotos(wsManager, config, sessionId, taskId, messageId, toolCallId, query) {
     const command = {
         header: {
             namespace: "Common",
@@ -151,6 +151,7 @@ async function searchPhotos(wsManager, config, sessionId, taskId, messageId, que
             taskId,
             messageId,
             command,
+            toolCallId,
         })
             .then(() => {
         })

package/dist/src/tools/send-cross-device-task-tool.d.ts

@@ -0,0 +1,2 @@
+import type { SessionContext } from "./session-manager.js";
+export declare function createSendCrossDeviceTaskTool(ctx: SessionContext): any;