@ynhcj/xiaoyi-channel 0.0.40-next → 0.0.41-next

package/dist/src/bot.js

@@ -1,7 +1,7 @@
 import { getXYRuntime } from "./runtime.js";
 import { setCachedContext } from "./steer-injector.js";
 import { createXYReplyDispatcher } from "./reply-dispatcher.js";
-import { parseA2AMessage, extractTextFromParts, extractFileParts, extractPushId, extractTriggerData } from "./parser.js";
+import { parseA2AMessage, extractTextFromParts, extractFileParts, extractPushId, extractDeviceType, extractTriggerData } from "./parser.js";
 import { downloadFilesFromParts } from "./file-download.js";
 import { resolveXYConfig } from "./config.js";
 import { sendStatusUpdate, sendClearContextResponse, sendTasksCancelResponse, sendA2AResponse } from "./formatter.js";
@@ -126,6 +126,11 @@ export async function handleXYMessage(params) {
         else {
             log(`[BOT] ℹ️  No push_id found in message, will use config default`);
         }
+        // Extract deviceType if present (same level as push_id in systemVariables)
+        const deviceType = extractDeviceType(parsed.parts);
+        if (deviceType) {
+            log(`[BOT] 📱 Extracted deviceType from user message: ${deviceType}`);
+        }
         // 保存 runtime 信息到 .xiaoyiruntime 文件（异步，不阻塞主流程）
         saveRuntimeInfo(webSocketSessionId || parsed.sessionId, // SESSION_ID (WebSocket 层级，如果没有则 fallback)
         parsed.sessionId, // CONVERSATION_ID (param 里的 sessionId)
@@ -238,6 +243,7 @@ export async function handleXYMessage(params) {
             taskId: parsed.taskId,
             messageId: parsed.messageId,
             agentId: route.accountId,
+            deviceType,
         };
         log(`[BOT-DISPATCH] ⏳ withReplyDispatcher starting, sessionKey=${route.sessionKey}`);
         await core.channel.reply.withReplyDispatcher({

package/dist/src/channel.js

@@ -24,6 +24,10 @@ 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 { filterToolsByDevice } from "./tools/device-tool-map.js";
+import { getCurrentSessionContext } from "./tools/session-manager.js";
+import { logger } from "./utils/logger.js";
 /**
  * Xiaoyi Channel Plugin for OpenClaw.
  * Implements Xiaoyi A2A protocol with dual WebSocket connections.
@@ -62,7 +66,13 @@ export const xyPlugin = {
         schema: xyConfigSchema,
     },
     outbound: xyOutbound,
-    agentTools: [locationTool, noteTool, searchNoteTool, modifyNoteTool, calendarTool, searchCalendarTool, searchContactTool, searchPhotoGalleryTool, uploadPhotoTool, xiaoyiGuiTool, callPhoneTool, searchMessageTool, sendMessageTool, searchFileTool, uploadFileTool, createAlarmTool, searchAlarmTool, modifyAlarmTool, deleteAlarmTool, sendFileToUserTool, viewPushResultTool, imageReadingTool, timestampToUtc8Tool],
+    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];
+        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(", ")})`);
+        return filtered;
+    },
     messaging: {
         normalizeTarget: (raw) => {
             const trimmed = raw.trim();

package/dist/src/parser.d.ts

@@ -43,6 +43,12 @@ export declare function isTasksCancelMessage(method: string): boolean;
  * Looks for push_id in data parts under variables.systemVariables.push_id
  */
 export declare function extractPushId(parts: A2AMessagePart[]): string | null;
+/**
+ * Extract deviceType from message parts.
+ * Looks for deviceType in data parts under variables.systemVariables.deviceType
+ * (same level as push_id).
+ */
+export declare function extractDeviceType(parts: A2AMessagePart[]): string | null;
 /**
  * Extract Trigger event data from message parts.
  * Looks for Trigger events with pushDataId in data parts.

package/dist/src/parser.js

@@ -72,6 +72,22 @@ export function extractPushId(parts) {
     }
     return null;
 }
+/**
+ * Extract deviceType from message parts.
+ * Looks for deviceType in data parts under variables.systemVariables.deviceType
+ * (same level as push_id).
+ */
+export function extractDeviceType(parts) {
+    for (const part of parts) {
+        if (part.kind === "data" && part.data) {
+            const deviceType = part.data.variables?.systemVariables?.deviceType;
+            if (deviceType && typeof deviceType === "string") {
+                return deviceType;
+            }
+        }
+    }
+    return null;
+}
 /**
  * Extract Trigger event data from message parts.
  * Looks for Trigger events with pushDataId in data parts.

package/dist/src/tools/device-tool-map.d.ts

@@ -0,0 +1,4 @@
+/** Known device type enum. */
+export declare const DEVICE_TYPES: readonly ["car", "pc", "phone"];
+export type DeviceType = (typeof DEVICE_TYPES)[number];
+export declare function filterToolsByDevice(tools: any[], deviceType?: string): any[];

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

@@ -0,0 +1,23 @@
+// Device type to tool name mapping.
+// Only tools listed under a device type are available for that device.
+// Tools NOT listed here are available to ALL devices (no restriction).
+/** Known device type enum. */
+export const DEVICE_TYPES = ["car", "pc", "phone"];
+/**
+ * Map: deviceType → tool names allowed for that device.
+ * undefined / empty deviceType → all tools available.
+ * Unrecognized deviceType → all tools available.
+ * Tool not listed in any device entry → available to all devices.
+ */
+const DEVICE_TOOL_ALLOWLIST = {
+    car: ["send_command_to_car"],
+    pc: ["location"],
+};
+export function filterToolsByDevice(tools, deviceType) {
+    if (!deviceType)
+        return tools;
+    const allowedTools = DEVICE_TOOL_ALLOWLIST[deviceType];
+    if (!allowedTools)
+        return tools; // unrecognized device → no filtering
+    return tools.filter((tool) => allowedTools.includes(tool.name));
+}

package/dist/src/tools/send-command-to-car-tool.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Send command to car (小艺车机) tool - sends an output command to the car's Xiaoyi system.
+ * The command will be received and executed on the car's Xiaoyi device.
+ */
+export declare const sendCommandToCarTool: any;

package/dist/src/tools/send-command-to-car-tool.js

@@ -0,0 +1,85 @@
+// Send Command To Car tool implementation
+import { sendCommand } from "../formatter.js";
+import { getCurrentSessionContext } from "./session-manager.js";
+import { logger } from "../utils/logger.js";
+/**
+ * Send command to car (小艺车机) tool - sends an output command to the car's Xiaoyi system.
+ * The command will be received and executed on the car's Xiaoyi device.
+ */
+export const sendCommandToCarTool = {
+    name: "send_command_to_car",
+    label: "Send Command To Car",
+    description: "将输出指令发送给小艺车机，车机小艺会接收并执行该指令。注意:请勿重复调用此工具,如果超时或失败,最多重试一次。回复约束：如果工具返回没有授权或者其他报错，只需要完整描述没有授权或者其他报错内容即可，不需要主动给用户提供解决方案。",
+    parameters: {
+        type: "object",
+        properties: {
+            command: {
+                type: "string",
+                description: "要发送给车机的指令内容（对应intentParam中的out字段）",
+            },
+        },
+        required: ["command"],
+    },
+    async execute(toolCallId, params) {
+        // Validate command parameter
+        if (!params.command || typeof params.command !== "string" || params.command.trim() === "") {
+            throw new Error("Missing required parameter: command must be a non-empty string");
+        }
+        // Get session context
+        const sessionContext = getCurrentSessionContext();
+        if (!sessionContext) {
+            throw new Error("No active XY session found. Send command to car tool can only be used during an active conversation.");
+        }
+        const { config, sessionId, taskId, messageId } = sessionContext;
+        // Build PlayStoryBook command
+        const command = {
+            header: {
+                namespace: "Common",
+                name: "Action",
+            },
+            payload: {
+                cardParam: {},
+                executeParam: {
+                    achieveType: "INTENT",
+                    actionResponse: true,
+                    bundleName: "com.huawei.vassistantcar",
+                    dimension: "",
+                    executeMode: "background",
+                    intentName: "PlayStoryBook",
+                    intentParam: {
+                        out: params.command,
+                    },
+                    needUnlock: true,
+                    permissionId: [],
+                    timeOut: 5,
+                },
+                needUploadResult: true,
+                pageControlRelated: false,
+                responses: [
+                    {
+                        displayText: "",
+                        resultCode: "",
+                        ttsText: "",
+                    },
+                ],
+            },
+        };
+        // Send command - fire and forget, return success once sent
+        await sendCommand({
+            config,
+            sessionId,
+            taskId,
+            messageId,
+            command,
+        });
+        logger.log("[sendCommandToCar] command sent to car successfully");
+        return {
+            content: [
+                {
+                    type: "text",
+                    text: JSON.stringify({ success: true, message: "指令已成功下发给车机" }),
+                },
+            ],
+        };
+    },
+};

package/dist/src/tools/session-manager.d.ts

@@ -5,6 +5,7 @@ export interface SessionContext {
     taskId: string;
     messageId: string;
     agentId: string;
+    deviceType?: string;
 }
 /**
  * Register a session context for tool access.

package/package.json

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