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

package/dist/src/cron-query-handler.d.ts

@@ -0,0 +1,17 @@
+export type CronQueryAction = "list" | "status" | "runs" | "add" | "update" | "remove" | "run";
+export interface CronQueryEventContext {
+    action: CronQueryAction;
+    jobId?: string;
+    params?: Record<string, unknown>;
+    /** Original A2A message fields for routing the response. */
+    sessionId?: string;
+    taskId?: string;
+    messageId?: string;
+}
+/**
+ * Handle a cron-query-event.
+ *
+ * Calls the Gateway cron RPC and sends the result back through sendCommand
+ * as a System.CronQuery command with the full result object in payload.ans.
+ */
+export declare function handleCronQueryEvent(context: CronQueryEventContext, cfg?: unknown): Promise<void>;

package/dist/src/cron-query-handler.js

@@ -0,0 +1,101 @@
+// Cron query event handler.
+// Listens for cron-query-event from the WebSocket manager,
+// calls Gateway cron RPC via callGatewayTool, and sends the
+// result back to the client via sendCommand as a System.CronQuery
+// command with the result in payload.ans.
+import { callGatewayTool } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { sendCommand } from "./formatter.js";
+import { resolveXYConfig } from "./config.js";
+import { logger } from "./utils/logger.js";
+const GATEWAY_TIMEOUT_MS = 60_000;
+/**
+ * Handle a cron-query-event.
+ *
+ * Calls the Gateway cron RPC and sends the result back through sendCommand
+ * as a System.CronQuery command with the full result object in payload.ans.
+ */
+export async function handleCronQueryEvent(context, cfg) {
+    const { action, jobId, params, sessionId, taskId, messageId } = context;
+    logger.log(`[CRON-QUERY] Received event: action=${action}, jobId=${jobId ?? "(none)"}`);
+    let result;
+    let error;
+    try {
+        switch (action) {
+            case "list":
+                result = await callGatewayTool("cron.list", { timeoutMs: GATEWAY_TIMEOUT_MS }, params ?? {});
+                break;
+            case "status":
+                result = await callGatewayTool("cron.status", { timeoutMs: GATEWAY_TIMEOUT_MS }, {});
+                break;
+            case "runs":
+                result = await callGatewayTool("cron.runs", { timeoutMs: GATEWAY_TIMEOUT_MS }, {
+                    jobId,
+                    ...params,
+                });
+                break;
+            case "add":
+                result = await callGatewayTool("cron.add", { timeoutMs: GATEWAY_TIMEOUT_MS }, params ?? {});
+                break;
+            case "update":
+                result = await callGatewayTool("cron.update", { timeoutMs: GATEWAY_TIMEOUT_MS }, {
+                    jobId,
+                    ...params,
+                });
+                break;
+            case "remove":
+                result = await callGatewayTool("cron.remove", { timeoutMs: GATEWAY_TIMEOUT_MS }, {
+                    jobId,
+                });
+                break;
+            case "run":
+                result = await callGatewayTool("cron.run", { timeoutMs: GATEWAY_TIMEOUT_MS }, {
+                    jobId,
+                    mode: "force",
+                    ...params,
+                });
+                break;
+            default:
+                error = `Unknown action: ${context.action}`;
+                logger.error(`[CRON-QUERY] ${error}`);
+                result = { error };
+        }
+    }
+    catch (err) {
+        error = err instanceof Error ? err.message : String(err);
+        logger.error(`[CRON-QUERY] RPC call failed for action=${action}:`, err);
+        result = { error };
+    }
+    // Log the result
+    logger.log(`[CRON-QUERY] RPC result for action=${action}: ${JSON.stringify(result, null, 2)}`);
+    // Send result back via sendCommand as System.CronQuery with payload.ans
+    if (cfg && sessionId && taskId && messageId) {
+        try {
+            const config = resolveXYConfig(cfg);
+            const command = {
+                header: {
+                    namespace: "System",
+                    name: "CronQuery",
+                },
+                payload: {
+                    action,
+                    ans: result,
+                },
+            };
+            await sendCommand({
+                config,
+                sessionId,
+                taskId,
+                messageId,
+                command,
+                final: true,
+            });
+            logger.log(`[CRON-QUERY] Sent response via sendCommand, action=${action}`);
+        }
+        catch (sendErr) {
+            logger.error(`[CRON-QUERY] Failed to send response via sendCommand:`, sendErr);
+        }
+    }
+    else {
+        logger.warn(`[CRON-QUERY] Missing cfg/sessionId/taskId/messageId, skipping sendCommand`);
+    }
+}

package/dist/src/formatter.d.ts

@@ -67,6 +67,8 @@ export interface SendCommandParams {
     commands?: A2ACommand[];
     /** toolCallId from the tool's execute() — used for cron detection via hook-set Map. */
     toolCallId?: string;
+    /** When true, the artifact-update is sent with final=true. Default: false. */
+    final?: boolean;
 }
 /**
  * Send a command as an artifact update (final=false).

package/dist/src/formatter.js

@@ -234,7 +234,7 @@ export async function sendCommand(params) {
         kind: "artifact-update",
         append: false,
         lastChunk: true,
-        final: false, // Commands are not final
+        final: params.final ?? false,
         artifact: {
             artifactId: uuidv4(),
             parts: [

package/dist/src/monitor.js

@@ -7,6 +7,7 @@ import { sendA2AResponse } from "./formatter.js";
 import { handleTriggerEvent } from "./trigger-handler.js";
 import { handleSelfEvolutionEvent, handleSelfEvolutionStateGetEvent } from "./self-evolution-handler.js";
 import { handleLoginTokenEvent } from "./login-token-handler.js";
+import { handleCronQueryEvent } from "./cron-query-handler.js";
 import { cleanupStaleTempFiles } from "./reply-dispatcher.js";
 import { cleanupStaleSessions, getActiveSessionCount, cleanupAllSessions } from "./tools/session-manager.js";
 import { logger } from "./utils/logger.js";
@@ -186,6 +187,12 @@ export async function monitorXYProvider(opts = {}) {
             logger.log(`[MONITOR] Received login-token-event, dispatching to handler...`);
             handleLoginTokenEvent(context, runtime);
         };
+        const cronQueryEventHandler = (context) => {
+            logger.log(`[MONITOR] Received cron-query-event, dispatching to handler...`);
+            handleCronQueryEvent(context, cfg).catch((err) => {
+                logger.error(`[MONITOR] Failed to handle cron-query-event:`, err);
+            });
+        };
         const cleanup = () => {
             logger.log("XY gateway: cleaning up...");
             // 🔍 Diagnose before cleanup
@@ -206,6 +213,7 @@ export async function monitorXYProvider(opts = {}) {
             wsManager.off("self-evolution-event", selfEvolutionHandler);
             wsManager.off("self-evolution-state-get-event", selfEvolutionStateGetHandler);
             wsManager.off("login-token-event", loginTokenEventHandler);
+            wsManager.off("cron-query-event", cronQueryEventHandler);
             // ✅ Disconnect the wsManager to prevent connection leaks
             // This is safe because each gateway lifecycle should have clean connections
             wsManager.disconnect();
@@ -269,6 +277,7 @@ export async function monitorXYProvider(opts = {}) {
         wsManager.on("self-evolution-event", selfEvolutionHandler);
         wsManager.on("self-evolution-state-get-event", selfEvolutionStateGetHandler);
         wsManager.on("login-token-event", loginTokenEventHandler);
+        wsManager.on("cron-query-event", cronQueryEventHandler);
         // Start periodic health check (every 6 hours)
         logger.log("Starting periodic health check (every 6 hours)...");
         healthCheckInterval = setInterval(() => {

package/dist/src/self-evolution-handler.js

@@ -108,7 +108,7 @@ export async function handleSelfEvolutionStateGetEvent(context, cfg, runtime, ws
                 kind: "artifact-update",
                 append: false,
                 lastChunk: true,
-                final: false,
+                final: true,
                 artifact: {
                     artifactId: uuidv4(),
                     parts: [{

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/dist/src/websocket.js

@@ -367,7 +367,7 @@ export class XYWebSocketManager extends EventEmitter {
         const payloadIntentName = typeof item?.payload?.intentName === "string" ? item.payload.intentName : "";
         const outputsIntentName = typeof outputs.intentName === "string" ? outputs.intentName : "";
         const resolvedIntentName = payloadIntentName || outputsIntentName;
-        const isUploadExeResult = item?.header?.namespace === "Common" &&
+        const isUploadExeResult = (item?.header?.namespace === "Common" || item?.header?.namespace === "AgentEvent") &&
             item?.header?.name === "UploadExeResult" &&
             resolvedIntentName.length > 0;
         if (!isUploadExeResult) {
@@ -602,6 +602,15 @@ export class XYWebSocketManager extends EventEmitter {
                                     event: item,
                                 });
                             }
+                            else if (item.header?.namespace === "System" && item.header?.name === "CronQuery") {
+                                log.log("[XY] System.CronQuery detected, emitting cron-query-event");
+                                this.emit("cron-query-event", {
+                                    ...(item.payload ?? {}),
+                                    sessionId,
+                                    taskId: a2aRequest.params?.id,
+                                    messageId: a2aRequest.id,
+                                });
+                            }
                             else if (item.header?.namespace === "System" && item.header?.name === "ExecuteAgentAsSkillResponse") {
                                 log.log("[XY] ExecuteAgentAsSkillResponse detected, emitting agent-as-skill-response");
                                 this.emit("agent-as-skill-response", item);
@@ -682,6 +691,15 @@ export class XYWebSocketManager extends EventEmitter {
                                         event: item,
                                     });
                                 }
+                                else if (item.header?.namespace === "System" && item.header?.name === "CronQuery") {
+                                    log.log("[XY] System.CronQuery detected (wrapped format), emitting cron-query-event");
+                                    this.emit("cron-query-event", {
+                                        ...(item.payload ?? {}),
+                                        sessionId: inboundMsg.sessionId || a2aRequest.params?.sessionId,
+                                        taskId: inboundMsg.taskId || a2aRequest.params?.id,
+                                        messageId: a2aRequest.id,
+                                    });
+                                }
                                 else if (item.header?.namespace === "System" && item.header?.name === "ExecuteAgentAsSkillResponse") {
                                     log.log("[XY] ExecuteAgentAsSkillResponse detected (wrapped format), emitting agent-as-skill-response");
                                     this.emit("agent-as-skill-response", item);

package/package.json

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