@ynhcj/xiaoyi-channel 0.0.210-beta → 0.0.211-beta

package/dist/src/channel.js

@@ -27,6 +27,7 @@ import { discoverCrossDevicesTool } from "./tools/discover-cross-devices-tool.js
 import { sendCrossDeviceTaskTool } from "./tools/send-cross-device-task-tool.js";
 import { displayA2UICardByPathTool } from "./tools/display-a2ui-card-bypath-tool.js";
 import { checkPluginPrivilegeTool } from "./tools/check-plugin-privilege-tool.js";
+import { invokeTool } from "./tools/invoke.js";
 const ALL_TOOLS = [
     locationTool,
     discoverCrossDevicesTool,
@@ -50,6 +51,7 @@ const ALL_TOOLS = [
     loginTokenTool,
     agentAsSkillTool,
     checkPluginPrivilegeTool,
+    invokeTool,
 ];
 /**
  * Xiaoyi Channel Plugin for OpenClaw.

package/dist/src/tools/hmos-cli.js

@@ -15,6 +15,7 @@ import path from "path";
 import os from "os";
 import { logger } from "../utils/logger.js";
 import { InvokeError, invokeErrorToResult } from "./invoke.js";
+import { getCurrentSessionContext } from "./session-manager.js";
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
 import { getCurrentTaskId } from "../task-manager.js";
@@ -534,8 +535,8 @@ export async function cliBeforeToolCallHandler(event, ctx) {
             },
         };
     }
-    // Get session context and execute
-    const sessionCtx = (await import("./session-manager.js")).getCurrentSessionContext();
+    // Get session context via ALS (propagated through the async call chain)
+    const sessionCtx = getCurrentSessionContext();
     if (!sessionCtx) {
         logger.warn(`[CLI-HOOK] No session context, blocking (${(performance.now() - t0).toFixed(1)}ms)`);
         return { block: true, blockReason: JSON.stringify({ code: "CONFIG_MISSING", message: "No active session context for CLI execution", retryable: false }) };

package/dist/src/tools/invoke.d.ts

@@ -18,8 +18,6 @@
  *   7. Device executor
  *   8. Invoke tool factory (public API)
  */
-import type { ChannelAgentTool } from "openclaw/plugin-sdk";
-import type { SessionContext } from "./session-manager.js";
 export type InvokeErrorCode = "INVALID_PARAM" | "INVALID_TOOL_DEFINITION" | "CONFIG_MISSING" | "AUTH_FAIL" | "PERMISSION_DENIED" | "CLI_COMMAND_BLOCKED" | "RATE_LIMIT" | "TIMEOUT" | "TOOL_NOT_FOUND" | "TOOL_CONFLICT" | "UNSUPPORTED_PLUGIN_TYPE" | "UNSUPPORTED_PROTOCOL" | "DEVICE_TOOL_BLOCKED" | "UPSTREAM_ERROR" | "NETWORK_ERROR" | "UNKNOWN";
 interface ExecuteResult {
     content: Array<{
@@ -38,11 +36,53 @@ export declare class InvokeError extends Error {
     get status(): number;
 }
 export declare function invokeErrorToResult(error: InvokeError): ExecuteResult;
-/**
- * Create the invoke meta-tool for the given session context.
- *
- * This is the ONLY exported function — the single integration point for
- * create-all-tools.ts.
- */
-export declare function createInvokeTool(ctx: SessionContext): ChannelAgentTool;
+export declare const invokeTool: {
+    name: string;
+    label: string;
+    description: string;
+    parameters: {
+        type: string;
+        properties: {
+            functionName: {
+                type: string;
+                minLength: number;
+                description: string;
+            };
+            funcName: {
+                type: string;
+                minLength: number;
+                description: string;
+            };
+            arguments: {
+                type: string;
+                description: string;
+                properties: {
+                    bundleName: {
+                        type: string;
+                        minLength: number;
+                        description: string;
+                    };
+                };
+                required: string[];
+                additionalProperties: boolean;
+            };
+            params: {
+                type: string;
+                description: string;
+                properties: {
+                    bundleName: {
+                        type: string;
+                        minLength: number;
+                        description: string;
+                    };
+                };
+                required: string[];
+                additionalProperties: boolean;
+            };
+        };
+        required: any[];
+        additionalProperties: boolean;
+    };
+    execute(toolCallId: string, rawParams: unknown, _signal?: AbortSignal, _onUpdate?: (partialResult: any) => void): Promise<ExecuteResult>;
+};
 export {};

package/dist/src/tools/invoke.js

@@ -27,6 +27,7 @@ import { logger } from "../utils/logger.js";
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
 import { getCurrentTaskId } from "../task-manager.js";
+import { getCurrentSessionContext } from "./session-manager.js";
 const RETRYABLE_CODES = new Set([
     "RATE_LIMIT",
     "TIMEOUT",
@@ -1066,136 +1067,135 @@ function validateBusinessParams(businessParams, definition) {
     }
     return null;
 }
-/**
- * Create the invoke meta-tool for the given session context.
- *
- * This is the ONLY exported function — the single integration point for
- * create-all-tools.ts.
- */
-export function createInvokeTool(ctx) {
-    return {
-        name: "invoke",
-        label: "Invoke",
-        description: "调用已安装 skill 中声明的工具。必须传 functionName(或funcName) 与 arguments(或params)；functionName 的值等于工具定义中的 toolName；arguments 是包含 bundleName 和业务参数字段的对象；完整业务参数定义见 references/tools/<bundleName>__<toolName>.json。",
-        parameters: {
-            type: "object",
-            properties: {
-                functionName: {
-                    type: "string",
-                    minLength: 1,
-                    description: "工具名称，值等于对应 references/tools JSON 中的 toolName，如 weather_query（优先使用；funcName 已废弃但仍兼容）。",
-                },
-                funcName: {
-                    type: "string",
-                    minLength: 1,
-                    description: "[废弃] 请使用 functionName 替代。工具名称，值等于对应 references/tools JSON 中的 toolName。",
-                },
-                arguments: {
-                    type: "object",
-                    description: "包含定位字段 bundleName 与业务参数字段；除 bundleName 外的字段遵循对应 references/tools JSON 中的 arguments schema（优先使用；params 已废弃但仍兼容）。",
-                    properties: {
-                        bundleName: {
-                            type: "string",
-                            minLength: 1,
-                            description: "HarmonyOS 应用唯一标识，如 com.example.weather。",
-                        },
+// ═══════════════════════════════════════════════════════════════════════════
+// 8. Invoke tool (static — matches ALL_TOOLS pattern)
+// ═══════════════════════════════════════════════════════════════════════════
+export const invokeTool = {
+    name: "invoke",
+    label: "Invoke",
+    description: "调用已安装 skill 中声明的工具。必须传 functionName(或funcName) 与 arguments(或params)；functionName 的值等于工具定义中的 toolName；arguments 是包含 bundleName 和业务参数字段的对象；完整业务参数定义见 references/tools/<bundleName>__<toolName>.json。",
+    parameters: {
+        type: "object",
+        properties: {
+            functionName: {
+                type: "string",
+                minLength: 1,
+                description: "工具名称，值等于对应 references/tools JSON 中的 toolName，如 weather_query（优先使用；funcName 已废弃但仍兼容）。",
+            },
+            funcName: {
+                type: "string",
+                minLength: 1,
+                description: "[废弃] 请使用 functionName 替代。工具名称，值等于对应 references/tools JSON 中的 toolName。",
+            },
+            arguments: {
+                type: "object",
+                description: "包含定位字段 bundleName 与业务参数字段；除 bundleName 外的字段遵循对应 references/tools JSON 中的 arguments schema（优先使用；params 已废弃但仍兼容）。",
+                properties: {
+                    bundleName: {
+                        type: "string",
+                        minLength: 1,
+                        description: "HarmonyOS 应用唯一标识，如 com.example.weather。",
                     },
-                    required: ["bundleName"],
-                    additionalProperties: true,
                 },
-                params: {
-                    type: "object",
-                    description: "[废弃] 请使用 arguments 替代。包含定位字段 bundleName 与业务参数字段。",
-                    properties: {
-                        bundleName: {
-                            type: "string",
-                            minLength: 1,
-                            description: "HarmonyOS 应用唯一标识，如 com.example.weather。",
-                        },
+                required: ["bundleName"],
+                additionalProperties: true,
+            },
+            params: {
+                type: "object",
+                description: "[废弃] 请使用 arguments 替代。包含定位字段 bundleName 与业务参数字段。",
+                properties: {
+                    bundleName: {
+                        type: "string",
+                        minLength: 1,
+                        description: "HarmonyOS 应用唯一标识，如 com.example.weather。",
                     },
-                    required: ["bundleName"],
-                    additionalProperties: true,
                 },
+                required: ["bundleName"],
+                additionalProperties: true,
             },
-            required: [],
-            additionalProperties: false,
         },
-        async execute(toolCallId, rawParams, _signal, _onUpdate) {
-            // Layer 1: input validation
-            const validated = validateAndExtract(rawParams);
-            if ("content" in validated) {
-                logger.warn("[INVOKE] input validation failed", { toolCallId });
-                return validated;
-            }
-            const { toolName, bundleName, businessParams } = validated;
-            const businessKeys = Object.keys(businessParams);
-            logger.log("[INVOKE] tool called", {
-                toolCallId, toolName, bundleName,
-                businessKeys: businessKeys.join(","),
-                businessKeysCount: businessKeys.length,
-            });
-            // Layer 2: cache lookup
-            const cache = getToolCache();
-            const entry = cache.get(bundleName, toolName);
-            if (!entry) {
-                const conflict = cache.getConflict(bundleName, toolName);
-                if (conflict) {
-                    const files = conflict.entries.map((e) => e.filePath).join(", ");
-                    logger.warn("[INVOKE] tool conflict", { toolCallId, toolName, bundleName, conflictCount: conflict.entries.length });
-                    return invokeErrorToResult(new InvokeError("TOOL_CONFLICT", `Multiple conflicting definitions for '${toolName}' in bundle '${bundleName}': ${files}`));
-                }
-                logger.warn("[INVOKE] tool not found", { toolCallId, toolName, bundleName });
-                return invokeErrorToResult(new InvokeError("TOOL_NOT_FOUND", `Tool '${toolName}' not found in bundle '${bundleName}'.`));
+        required: [],
+        additionalProperties: false,
+    },
+    async execute(toolCallId, rawParams, _signal, _onUpdate) {
+        const ctx = getCurrentSessionContext();
+        // Layer 1: input validation
+        const validated = validateAndExtract(rawParams);
+        if ("content" in validated) {
+            logger.warn("[INVOKE] input validation failed", { toolCallId });
+            return validated;
+        }
+        const { toolName, bundleName, businessParams } = validated;
+        const businessKeys = Object.keys(businessParams);
+        logger.log("[INVOKE] tool called", {
+            toolCallId, toolName, bundleName,
+            businessKeys: businessKeys.join(","),
+            businessKeysCount: businessKeys.length,
+        });
+        // Layer 2: cache lookup
+        const cache = getToolCache();
+        const entry = cache.get(bundleName, toolName);
+        if (!entry) {
+            const conflict = cache.getConflict(bundleName, toolName);
+            if (conflict) {
+                const files = conflict.entries.map((e) => e.filePath).join(", ");
+                logger.warn("[INVOKE] tool conflict", { toolCallId, toolName, bundleName, conflictCount: conflict.entries.length });
+                return invokeErrorToResult(new InvokeError("TOOL_CONFLICT", `Multiple conflicting definitions for '${toolName}' in bundle '${bundleName}': ${files}`));
             }
-            const { definition, skillName } = entry;
-            logger.log("[INVOKE] cache hit", {
-                toolCallId, toolName, bundleName, skillName,
-                pluginType: definition.pluginType,
-                protocol: definition.protocol ?? "N/A",
-            });
-            // Layer 2b: business param validation
-            const paramError = validateBusinessParams(businessParams, definition);
-            if (paramError) {
-                logger.warn("[INVOKE] business param validation failed", { toolCallId, toolName, bundleName });
-                return paramError;
+            logger.warn("[INVOKE] tool not found", { toolCallId, toolName, bundleName });
+            return invokeErrorToResult(new InvokeError("TOOL_NOT_FOUND", `Tool '${toolName}' not found in bundle '${bundleName}'.`));
+        }
+        const { definition, skillName } = entry;
+        logger.log("[INVOKE] cache hit", {
+            toolCallId, toolName, bundleName, skillName,
+            pluginType: definition.pluginType,
+            protocol: definition.protocol ?? "N/A",
+        });
+        // Layer 2b: business param validation
+        const paramError = validateBusinessParams(businessParams, definition);
+        if (paramError) {
+            logger.warn("[INVOKE] business param validation failed", { toolCallId, toolName, bundleName });
+            return paramError;
+        }
+        // Layer 3: execute
+        const pluginType = definition.pluginType;
+        logger.log(`[INVOKE] dispatching to ${pluginType} executor`, { toolCallId, toolName, bundleName, pluginType });
+        try {
+            if (pluginType === "Cloud" || pluginType === "MCP") {
+                const result = await executeCloudTool({ definition, businessParams, skillName, sessionId: ctx?.sessionId ?? "", agentId: ctx?.agentId ?? "" });
+                logger.log("[INVOKE] cloud execution succeeded", {
+                    toolCallId, toolName, bundleName, pluginType,
+                    resultLength: result.content[0]?.text?.length ?? 0,
+                });
+                return result;
             }
-            // Layer 3: execute
-            const pluginType = definition.pluginType;
-            logger.log(`[INVOKE] dispatching to ${pluginType} executor`, { toolCallId, toolName, bundleName, pluginType });
-            try {
-                if (pluginType === "Cloud" || pluginType === "MCP") {
-                    const result = await executeCloudTool({ definition, businessParams, skillName, sessionId: ctx.sessionId, agentId: ctx.agentId });
-                    logger.log("[INVOKE] cloud execution succeeded", {
-                        toolCallId, toolName, bundleName, pluginType,
-                        resultLength: result.content[0]?.text?.length ?? 0,
-                    });
-                    return result;
-                }
-                if (pluginType === "Device") {
-                    const result = await executeDeviceTool({ definition, businessParams, toolCallId }, ctx);
-                    logger.log("[INVOKE] device execution succeeded", {
-                        toolCallId, toolName, bundleName,
-                        resultLength: result.content[0]?.text?.length ?? 0,
-                    });
-                    return result;
+            if (pluginType === "Device") {
+                if (!ctx) {
+                    return invokeErrorToResult(new InvokeError("DEVICE_TOOL_BLOCKED", "Device tools require an active session context."));
                 }
-                logger.warn("[INVOKE] unsupported pluginType", { toolCallId, toolName, bundleName, pluginType });
-                return invokeErrorToResult(new InvokeError("UNSUPPORTED_PLUGIN_TYPE", `Unsupported pluginType '${pluginType}'. Must be Cloud, Device, or MCP.`));
+                const result = await executeDeviceTool({ definition, businessParams, toolCallId }, ctx);
+                logger.log("[INVOKE] device execution succeeded", {
+                    toolCallId, toolName, bundleName,
+                    resultLength: result.content[0]?.text?.length ?? 0,
+                });
+                return result;
             }
-            catch (err) {
-                if (err instanceof InvokeError) {
-                    logger.warn("[INVOKE] invocation error", {
-                        toolCallId, toolName, bundleName, pluginType,
-                        errorCode: err.code, errorMessage: err.message, retryable: err.retryable,
-                    });
-                    return invokeErrorToResult(err);
-                }
-                logger.error("[INVOKE] unexpected execution error", {
+            logger.warn("[INVOKE] unsupported pluginType", { toolCallId, toolName, bundleName, pluginType });
+            return invokeErrorToResult(new InvokeError("UNSUPPORTED_PLUGIN_TYPE", `Unsupported pluginType '${pluginType}'. Must be Cloud, Device, or MCP.`));
+        }
+        catch (err) {
+            if (err instanceof InvokeError) {
+                logger.warn("[INVOKE] invocation error", {
                     toolCallId, toolName, bundleName, pluginType,
-                    error: err instanceof Error ? `${err.name}: ${err.message}` : String(err),
+                    errorCode: err.code, errorMessage: err.message, retryable: err.retryable,
                 });
-                return unknownErrorToResult(err);
+                return invokeErrorToResult(err);
             }
-        },
-    };
-}
+            logger.error("[INVOKE] unexpected execution error", {
+                toolCallId, toolName, bundleName, pluginType,
+                error: err instanceof Error ? `${err.name}: ${err.message}` : String(err),
+            });
+            return unknownErrorToResult(err);
+        }
+    },
+};

package/package.json

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