@ynhcj/xiaoyi-channel 0.0.157-beta → 0.0.158-beta

package/dist/src/tools/agent-as-skill-tool.js

@@ -3,6 +3,7 @@ import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
 import { getCurrentTaskId } from "../task-manager.js";
 import { logger } from "../utils/logger.js";
+import { XYFileUploadService } from "../file-upload.js";
 /**
  * Agent-as-skill tool - invokes a registered agent by agentId as a skill.
  * The tool receives the agentId, query, and optional file attachments,
@@ -11,7 +12,7 @@ import { logger } from "../utils/logger.js";
 export function createAgentAsSkillTool(ctx) {
     const { config, sessionId, taskId, messageId } = ctx;
     return {
-        name: "agent-as-skill-tool",
+        name: "agent_as_a_tool",
         label: "Agent as Skill Tool",
         description: `智能体作为skill的执行元工具。当需要调用其他已注册的Agent来执行特定任务时使用此工具。
 该工具会将用户请求和可选的附件文件转发给目标Agent执行，并返回执行结果。
@@ -37,8 +38,7 @@ export function createAgentAsSkillTool(ctx) {
                     description: "用户原始请求文本，原样转发给目标Agent执行",
                 },
                 filesInfo: {
-                    type: "array",
-                    description: "附件文件/图片信息列表，无文件时可传null或空数组",
+                    description: "附件文件/图片信息列表，无文件时可传null或空数组，支持传入数组或JSON字符串",
                     items: {
                         type: "object",
                         properties: {
@@ -55,6 +55,10 @@ export function createAgentAsSkillTool(ctx) {
                                 type: "string",
                                 description: "文件可访问下载链接（完整HTTP/HTTPS地址）",
                             },
+                            fileUrlLocal: {
+                                type: "string",
+                                description: "文件本地路径，如果提供此字段，工具会自动上传文件并将公网URL填入fileUrl",
+                            },
                         },
                     },
                 },
@@ -71,6 +75,53 @@ export function createAgentAsSkillTool(ctx) {
             if (!params.query || typeof params.query !== "string") {
                 throw new Error("Missing or invalid required parameter: query must be a non-empty string");
             }
+            // Robust parsing: normalize filesInfo from array or JSON string
+            let filesInfo = null;
+            if (params.filesInfo) {
+                if (Array.isArray(params.filesInfo)) {
+                    filesInfo = params.filesInfo;
+                }
+                else if (typeof params.filesInfo === 'string') {
+                    try {
+                        const parsed = JSON.parse(params.filesInfo);
+                        if (Array.isArray(parsed)) {
+                            filesInfo = parsed;
+                        }
+                        else {
+                            throw new Error("filesInfo must be an array or a JSON string representing an array");
+                        }
+                    }
+                    catch (parseError) {
+                        throw new Error(`filesInfo JSON解析失败: ${parseError instanceof Error ? parseError.message : String(parseError)}`);
+                    }
+                }
+                else {
+                    filesInfo = null;
+                }
+            }
+            // Upload local files and fill fileUrl
+            if (filesInfo && filesInfo.length > 0) {
+                const uploadService = new XYFileUploadService(config.fileUploadUrl, config.apiKey, config.uid);
+                for (const fileInfo of filesInfo) {
+                    if (fileInfo.fileUrlLocal && !fileInfo.fileUrl) {
+                        try {
+                            const publicUrl = await uploadService.uploadFileAndGetUrl(fileInfo.fileUrlLocal, "TEMPORARY_MATERIAL_DOC");
+                            if (publicUrl) {
+                                fileInfo.fileUrl = publicUrl;
+                            }
+                            else {
+                                logger.warn("[AGENT-AS-SKILL] 上传文件未返回公网URL", { fileUrlLocal: fileInfo.fileUrlLocal });
+                            }
+                        }
+                        catch (uploadError) {
+                            logger.error("[AGENT-AS-SKILL] 上传本地文件失败", { fileUrlLocal: fileInfo.fileUrlLocal, error: uploadError });
+                            throw new Error(`上传本地文件失败 (${fileInfo.fileUrlLocal}): ${uploadError instanceof Error ? uploadError.message : String(uploadError)}`);
+                        }
+                    }
+                    // Remove fileUrlLocal from the final payload
+                    delete fileInfo.fileUrlLocal;
+                }
+            }
             // Get WebSocket manager
             const wsManager = getXYWebSocketManager(config);
             // Build ExecuteAgentAsSkill command
@@ -82,7 +133,7 @@ export function createAgentAsSkillTool(ctx) {
                 payload: {
                     agentId: params.agentId,
                     query: params.query,
-                    filesInfo: params.filesInfo || null,
+                    filesInfo: filesInfo || null,
                 },
             };
             // Send command and wait for response (5 minute timeout)

package/package.json

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