@ynhcj/xiaoyi-channel 0.0.173-next → 0.0.174-next

package/dist/src/channel.js

@@ -25,14 +25,12 @@ import { loginTokenTool } from "./tools/login-token-tool.js";
 import { agentAsSkillTool } from "./tools/agent-as-skill-tool.js";
 import { discoverCrossDevicesTool } from "./tools/discover-cross-devices-tool.js";
 import { sendCrossDeviceTaskTool } from "./tools/send-cross-device-task-tool.js";
-import { displayA2UICardTool } from "./tools/display-a2ui-card-tool.js";
 import { displayA2UICardByPathTool } from "./tools/display-a2ui-card-bypath-tool.js";
 import { checkPluginPrivilegeTool } from "./tools/check-plugin-privilege-tool.js";
 const ALL_TOOLS = [
     locationTool,
     discoverCrossDevicesTool,
     sendCrossDeviceTaskTool,
-    displayA2UICardTool,
     displayA2UICardByPathTool,
     callDeviceTool,
     getNoteToolSchemaTool,

package/dist/src/tools/create-all-tools.js

@@ -19,7 +19,6 @@ import { createLoginTokenTool } from "./login-token-tool.js";
 import { createAgentAsSkillTool } from "./agent-as-skill-tool.js";
 import { createDiscoverCrossDevicesTool } from "./discover-cross-devices-tool.js";
 import { createSendCrossDeviceTaskTool } from "./send-cross-device-task-tool.js";
-import { createDisplayA2UICardTool } from "./display-a2ui-card-tool.js";
 import { createDisplayA2UICardByPathTool } from "./display-a2ui-card-bypath-tool.js";
 import { createCheckPluginPrivilegeTool } from "./check-plugin-privilege-tool.js";
 import { logger } from "../utils/logger.js";
@@ -39,7 +38,6 @@ export function createAllTools(ctx) {
         createLocationTool(ctx),
         createDiscoverCrossDevicesTool(ctx),
         createSendCrossDeviceTaskTool(ctx),
-        createDisplayA2UICardTool(ctx),
         createDisplayA2UICardByPathTool(ctx),
         createCallDeviceTool(ctx),
         createGetNoteToolSchemaTool(ctx),

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

@@ -32,7 +32,6 @@ const DEVICE_TOOL_POLICY = {
             "image_reading",
             "convert_time_to_utc8_time",
             "save_self_evolution_skill",
-            "displayA2UICard",
             "display-a2ui-card-bypath",
         ],
     },

package/dist/src/tools/display-a2ui-card-tool.d.ts

@@ -1,27 +1,2 @@
-export declare const displayA2UICardTool: {
-    name: string;
-    label: string;
-    description: string;
-    parameters: {
-        type: string;
-        properties: {
-            cardId: {
-                type: string;
-                description: string;
-            };
-            cardData: {
-                oneOf: {
-                    type: string;
-                }[];
-                description: string;
-            };
-        };
-        required: string[];
-    };
-    execute(toolCallId: string, params: any): Promise<{
-        content: {
-            type: string;
-            text: string;
-        }[];
-    }>;
-};
+import type { SessionContext } from "./session-manager.js";
+export declare function createDisplayA2UICardTool(ctx: SessionContext): any;

package/dist/src/tools/display-a2ui-card-tool.js

@@ -1,6 +1,6 @@
 import { sendCommand } from "../formatter.js";
+import { getCurrentMessageId, getCurrentTaskId } from "../task-manager.js";
 import { logger } from "../utils/logger.js";
-import { getCurrentSessionContext } from './session-manager.js';
 class ToolInputError extends Error {
     status = 400;
     constructor(message) {
@@ -11,72 +11,75 @@ class ToolInputError extends Error {
 function isJsonObjectOrArray(value) {
     return !!value && typeof value === "object";
 }
-export const displayA2UICardTool = {
-    name: "displayA2UICard",
-    label: "Display A2UI Card",
-    description: "当模型根据 MCP 工具返回结果判断需要向端侧下发 A2UI card 时调用。参数 cardId 和 cardData 由模型根据 MCP 工具返回结果传入，本工具只负责下发卡片展示指令。",
-    parameters: {
-        type: "object",
-        properties: {
-            cardId: {
-                type: "string",
-                description: "A2UI card 的唯一标识。",
-            },
-            cardData: {
-                oneOf: [
-                    { type: "object" },
-                    { type: "array" },
-                ],
-                description: "A2UI card 渲染所需的 JSON 对象或 JSON 数组，由模型根据 MCP 工具返回结果填充。",
+export function createDisplayA2UICardTool(ctx) {
+    const { config, sessionId, taskId, messageId } = ctx;
+    return {
+        name: "displayA2UICard",
+        label: "Display A2UI Card",
+        description: "当模型根据 MCP 工具返回结果判断需要向端侧下发 A2UI card 时调用。参数 cardId 和 cardData 由模型根据 MCP 工具返回结果传入，本工具只负责下发卡片展示指令。",
+        parameters: {
+            type: "object",
+            properties: {
+                cardId: {
+                    type: "string",
+                    description: "A2UI card 的唯一标识。",
+                },
+                cardData: {
+                    oneOf: [
+                        { type: "object" },
+                        { type: "array" },
+                    ],
+                    description: "A2UI card 渲染所需的 JSON 对象或 JSON 数组，由模型根据 MCP 工具返回结果填充。",
+                },
             },
+            required: ["cardId", "cardData"],
         },
-        required: ["cardId", "cardData"],
-    },
-    async execute(toolCallId, params) {
-        const _c = getCurrentSessionContext();
-        const { config, sessionId, taskId, messageId } = _c;
-        const cardId = typeof params?.cardId === "string" ? params.cardId.trim() : "";
-        const cardData = params?.cardData;
-        if (!cardId) {
-            throw new ToolInputError("缺少必填参数: cardId");
-        }
-        if (!isJsonObjectOrArray(cardData)) {
-            throw new ToolInputError("缺少必填参数: cardData，且必须是 JSON 对象或 JSON 数组");
-        }
-        const command = {
-            header: {
-                namespace: "Common",
-                name: "DisplayFACard",
-            },
-            payload: {
-                isA2ui: true,
-                a2uiParam: {
-                    cardId,
-                    cardData,
+        async execute(toolCallId, params) {
+            const cardId = typeof params?.cardId === "string" ? params.cardId.trim() : "";
+            const cardData = params?.cardData;
+            if (!cardId) {
+                throw new ToolInputError("缺少必填参数: cardId");
+            }
+            if (!isJsonObjectOrArray(cardData)) {
+                throw new ToolInputError("缺少必填参数: cardData，且必须是 JSON 对象或 JSON 数组");
+            }
+            const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
+            const currentMessageId = getCurrentMessageId(sessionId) ?? messageId;
+            const command = {
+                header: {
+                    namespace: "Common",
+                    name: "DisplayFACard",
                 },
-            },
-        };
-        logger.log(`[DISPLAY-A2UI-CARD] sending card, cardId=${cardId}`);
-        await sendCommand({
-            config,
-            sessionId,
-            taskId,
-            messageId,
-            command,
-            toolCallId,
-        });
-        logger.log(`[DISPLAY-A2UI-CARD] card sent successfully, cardId=${cardId}`);
-        return {
-            content: [
-                {
-                    type: "text",
-                    text: JSON.stringify({
-                        success: true,
+                payload: {
+                    isA2ui: true,
+                    a2uiParam: {
                         cardId,
-                        message: "A2UI card display command sent successfully.",
-                    }),
+                        cardData,
+                    },
                 },
-            ],
-        };
-    },
-};
+            };
+            logger.log(`[DISPLAY-A2UI-CARD] sending card, cardId=${cardId}`);
+            await sendCommand({
+                config,
+                sessionId,
+                taskId: currentTaskId,
+                messageId: currentMessageId,
+                command,
+                toolCallId,
+            });
+            logger.log(`[DISPLAY-A2UI-CARD] card sent successfully, cardId=${cardId}`);
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: JSON.stringify({
+                            success: true,
+                            cardId,
+                            message: "A2UI card display command sent successfully.",
+                        }),
+                    },
+                ],
+            };
+        },
+    };
+}

package/package.json

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