@ynhcj/xiaoyi-channel 0.0.165-beta → 0.0.166-beta

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

@@ -1,17 +1,7 @@
-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>;
+export declare function handleCronQueryEvent(context: any, cfg: any): Promise<void>;

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

@@ -4,9 +4,12 @@
 // 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 * as os from "os";
 import { sendCommand } from "./formatter.js";
 import { resolveXYConfig } from "./config.js";
 import { logger } from "./utils/logger.js";
+import { readFileSync, readdirSync } from "fs";
+import { join } from "path";
 const GATEWAY_TIMEOUT_MS = 60_000;
 /**
  * Handle a cron-query-event.
@@ -54,6 +57,9 @@ export async function handleCronQueryEvent(context, cfg) {
                     ...params,
                 });
                 break;
+            case "queryTimeList":
+                result = await queryTimeListLocal();
+                break;
             default:
                 error = `Unknown action: ${context.action}`;
                 logger.error(`[CRON-QUERY] ${error}`);
@@ -99,3 +105,84 @@ export async function handleCronQueryEvent(context, cfg) {
         logger.warn(`[CRON-QUERY] Missing cfg/sessionId/taskId/messageId, skipping sendCommand`);
     }
 }
+/**
+ * Read local cron folder directly (bypassing openclaw RPC) and return
+ * run records from the last 7 days, grouped by date and sorted by time.
+ *
+ * Data sources:
+ *   - state/cron/jobs.json   → job id → name mapping
+ *   - state/cron/runs/*.jsonl → run records (one JSON per line)
+ *
+ * Return format:
+ *   [ { "YYYY-MM-DD": [ { run record with .name }, ... ] }, ... ]
+ */
+async function queryTimeListLocal() {
+    const cronDir = join(os.homedir(), ".openclaw", "cron");
+    const jobsPath = join(cronDir, "jobs.json");
+    const runsDir = join(cronDir, "runs");
+    // 1. Build jobId → name map from jobs.json
+    const jobNameMap = {};
+    try {
+        const jobsRaw = readFileSync(jobsPath, "utf-8");
+        const jobsData = JSON.parse(jobsRaw);
+        for (const job of jobsData.jobs || []) {
+            jobNameMap[job.id] = job.name || job.id;
+        }
+    }
+    catch (err) {
+        logger.error(`[CRON-QUERY] Failed to read jobs.json: ${err.message}`);
+    }
+    // 2. Read all run files, collect runs within last 7 days
+    const sevenDaysAgo = Date.now() - 7 * 24 * 60 * 60 * 1000;
+    const allRuns = [];
+    let files = [];
+    try {
+        files = readdirSync(runsDir);
+    }
+    catch {
+        files = [];
+    }
+    for (const file of files) {
+        if (!file.endsWith(".jsonl"))
+            continue;
+        try {
+            const content = readFileSync(join(runsDir, file), "utf-8");
+            const lines = content.trim().split("\n");
+            for (const line of lines) {
+                if (!line.trim())
+                    continue;
+                try {
+                    const run = JSON.parse(line);
+                    if (run.ts && run.ts >= sevenDaysAgo) {
+                        run.name = jobNameMap[run.jobId] || run.jobId || "";
+                        allRuns.push(run);
+                    }
+                }
+                catch {
+                    // skip malformed line
+                }
+            }
+        }
+        catch (err) {
+            logger.error(`[CRON-QUERY] Failed to read run file ${file}: ${err.message}`);
+        }
+    }
+    // 3. Sort by ts ascending
+    allRuns.sort((a, b) => a.ts - b.ts);
+    // 4. Group by date (YYYY-MM-DD in local time)
+    const grouped = new Map();
+    for (const run of allRuns) {
+        const d = new Date(run.ts);
+        const label = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, "0")}-${String(d.getDate()).padStart(2, "0")}`;
+        if (!grouped.has(label)) {
+            grouped.set(label, []);
+        }
+        grouped.get(label).push(run);
+    }
+    // 5. Convert to ordered array of single-key objects
+    const result = [];
+    for (const [date, runs] of grouped) {
+        result.push({ [date]: runs });
+    }
+    return result;
+}

package/dist/src/formatter.d.ts

@@ -17,6 +17,7 @@ export interface SendA2AResponseParams {
     }>;
     errorCode?: number | string;
     errorMessage?: string;
+    log?: boolean;
 }
 /**
  * Send an A2A artifact update response.

package/dist/src/formatter.js

@@ -42,7 +42,7 @@ function buildTextPreview(text) {
  * Send an A2A artifact update response.
  */
 export async function sendA2AResponse(params) {
-    const { config, sessionId, taskId, messageId, text, append, final, files, errorCode, errorMessage } = params;
+    const { config, sessionId, taskId, messageId, text, append, final, files, errorCode, errorMessage, log: shouldLog = true } = params;
     const log = logger.withContext(sessionId, taskId);
     // 审批桥接：将 OpenClaw 的审批提示翻译成用户友好的确认文案
     const bridgedText = text === undefined ? text : rewriteOutboundApprovalText(sessionId, text);
@@ -97,11 +97,14 @@ export async function sendA2AResponse(params) {
         taskId,
         msgDetail: JSON.stringify(jsonRpcResponse),
     };
-    // Log complete response body
-    const redactedText = redactSensitiveText(bridgedText ?? "");
-    log.log(`[A2A_RESPONSE] Sending artifact-update, append=${append}, final=${final}, text=${buildTextPreview(redactedText)}, files=${files?.length ?? 0}, sensitive=${containsSensitiveInfo(bridgedText ?? "")}`);
+    if (shouldLog) {
+        const redactedText = redactSensitiveText(bridgedText ?? "");
+        log.log(`[A2A_RESPONSE] Sending artifact-update, append=${append}, final=${final}, text=${buildTextPreview(redactedText)}, files=${files?.length ?? 0}, sensitive=${containsSensitiveInfo(bridgedText ?? "")}`);
+    }
     await wsManager.sendMessage(sessionId, outboundMessage);
-    log.log(`[A2A_RESPONSE] Message sent successfully`);
+    if (shouldLog) {
+        log.log(`[A2A_RESPONSE] Message sent successfully`);
+    }
 }
 /**
  * Send an A2A artifact-update with reasoningText part.

package/dist/src/reply-dispatcher.js

@@ -172,18 +172,23 @@ export function createXYReplyDispatcher(params) {
                     scopedLog().log(`[DELIVER SKIP] Empty text, skipping`);
                     return;
                 }
+                // 🔑 如果 onPartialReply 已经流式发送过文本，deliver 不再重复发送
+                if (hasSentResponse) {
+                    scopedLog().log(`[DELIVER SKIP] Already sent via onPartialReply`);
+                    return;
+                }
                 accumulatedText += text;
                 hasSentResponse = true;
-                scopedLog().log(`[DELIVER] Accumulated text, length=${accumulatedText.length}`);
-                // 🔑 使用动态taskId发送reasoningText更新
-                await sendReasoningTextUpdate({
+                // 🔑 使用动态taskId发送A2A响应（流式append）
+                await sendA2AResponse({
                     config,
                     sessionId,
                     taskId: currentTaskId,
                     messageId: currentMessageId,
                     text,
+                    append: true,
+                    final: false,
                 });
-                scopedLog().log(`[DELIVER] Sent deliver text as reasoningText update`);
             }
             catch (deliverError) {
                 scopedLog().error(`Failed to deliver message:`, deliverError);
@@ -251,18 +256,18 @@ export function createXYReplyDispatcher(params) {
                         state: "completed",
                     });
                     scopedLog().log(`[ON-IDLE] Sent completion status update`);
-                    // 🔑 使用动态taskId发送最终响应
+                    // 🔑 使用动态taskId发送最终响应（空字符串表示流结束）
                     await sendA2AResponse({
                         config,
                         sessionId,
                         taskId: currentTaskId,
                         messageId: currentMessageId,
-                        text: accumulatedText,
+                        text: "",
                         append: false,
                         final: true,
                     });
                     finalSent = true;
-                    scopedLog().log(`[ON-IDLE] Sent final response`);
+                    scopedLog().log(`[ON-IDLE] Sent final response (empty, stream end)`);
                 }
                 catch (err) {
                     scopedLog().error(`[ON-IDLE] Failed to send final response:`, err);
@@ -389,10 +394,25 @@ export function createXYReplyDispatcher(params) {
                 if (steerState.steered) {
                     return;
                 }
+                const currentTaskId = getActiveTaskId();
+                const currentMessageId = getActiveMessageId();
                 const text = payload.text ?? "";
-                scopedLog().log(`[REASONING-STREAM] Reasoning chunk received, text.length: ${text.length}`);
-                // Reasoning stream 目前被注释掉
-                // 如果需要可以启用
+                try {
+                    if (text.length > 0) {
+                        // 🔑 将模型真实的thinking/reasoning内容通过reasoningText转发
+                        await sendReasoningTextUpdate({
+                            config,
+                            sessionId,
+                            taskId: currentTaskId,
+                            messageId: currentMessageId,
+                            text,
+                            append: false,
+                        });
+                    }
+                }
+                catch (err) {
+                    scopedLog().error(`[REASONING-STREAM] Failed to send reasoning text:`, err);
+                }
             },
             onPartialReply: async (payload) => {
                 // 🔑 steered dispatch不发送partial reply（让主dispatcher处理）
@@ -404,18 +424,23 @@ export function createXYReplyDispatcher(params) {
                 const text = payload.text ?? "";
                 try {
                     if (text.length > 0) {
-                        await sendReasoningTextUpdate({
+                        accumulatedText += text;
+                        hasSentResponse = true;
+                        // 🔑 流式文本通过 A2A text 通道发送（而非 reasoningText）
+                        await sendA2AResponse({
                             config,
                             sessionId,
                             taskId: currentTaskId,
                             messageId: currentMessageId,
                             text,
                             append: false,
+                            final: false,
+                            log: false,
                         });
                     }
                 }
                 catch (err) {
-                    scopedLog().error(`[PARTIAL REPLY] Failed to send partial reply:`, err);
+                    scopedLog().error(`[PARTIAL-REPLY] Failed to send partial reply:`, err);
                 }
             },
         },

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

@@ -8,8 +8,8 @@ class ToolInputError extends Error {
         this.name = "ToolInputError";
     }
 }
-function isPlainObject(value) {
-    return !!value && typeof value === "object" && !Array.isArray(value);
+function isJsonObjectOrArray(value) {
+    return !!value && typeof value === "object";
 }
 export function createDisplayA2UICardTool(ctx) {
     const { config, sessionId, taskId, messageId } = ctx;
@@ -25,8 +25,11 @@ export function createDisplayA2UICardTool(ctx) {
                     description: "A2UI card 的唯一标识。",
                 },
                 cardData: {
-                    type: "object",
-                    description: "A2UI card 渲染所需的数据对象，由模型根据 MCP 工具返回结果填充。",
+                    oneOf: [
+                        { type: "object" },
+                        { type: "array" },
+                    ],
+                    description: "A2UI card 渲染所需的 JSON 对象或 JSON 数组，由模型根据 MCP 工具返回结果填充。",
                 },
             },
             required: ["cardId", "cardData"],
@@ -37,8 +40,8 @@ export function createDisplayA2UICardTool(ctx) {
             if (!cardId) {
                 throw new ToolInputError("缺少必填参数: cardId");
             }
-            if (!isPlainObject(cardData)) {
-                throw new ToolInputError("缺少必填参数: cardData，且必须是对象");
+            if (!isJsonObjectOrArray(cardData)) {
+                throw new ToolInputError("缺少必填参数: cardData，且必须是 JSON 对象或 JSON 数组");
             }
             const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
             const currentMessageId = getCurrentMessageId(sessionId) ?? messageId;

package/package.json

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