@ynhcj/xiaoyi-channel 0.0.161-next → 0.0.162-next

package/dist/index.js

@@ -3,7 +3,9 @@ import { xiaoyiProvider } from "./src/provider.js";
 import { xyPlugin } from "./src/channel.js";
 import registerSentinelHook from "./src/cspl/sentinel_hook.js";
 import { setXYRuntime } from "./src/runtime.js";
-import { markCronToolCall, clearCronToolCall } from "./src/tools/session-manager.js";
+import { markCronToolCall, clearCronToolCall, getSessionContext } from "./src/tools/session-manager.js";
+import { configManager } from "./src/utils/config-manager.js";
+import { setJobPushId } from "./src/utils/cron-push-map.js";
 import { registerSelfEvolutionToolResultNudge } from "./src/self-evolution-tool-result-nudge.js";
 import { createBeforePromptBuildHandler } from "./src/skill-retriever/hooks.js";
 import { normalizeToolRetrieverConfig } from "./src/skill-retriever/config.js";
@@ -25,8 +27,58 @@ function registerCronDetectionHook(api) {
         if (event.toolCallId) {
             clearCronToolCall(event.toolCallId);
         }
+        // 捕获对话创建的 cron job：agent 调 cron(add) 后，从 result 拿 jobId，
+        // 配合当前会话的 pushId，写入 jobId↔pushId 映射，供 fire 时反查设备。
+        await captureCronAddMapping(event, ctx).catch((err) => {
+            // 捕获失败不影响工具结果
+            console.error("[xy] captureCronAddMapping failed:", err);
+        });
     });
 }
+/** 从 cron add 工具结果中提取 jobId 并写入 pushId 映射。 */
+async function captureCronAddMapping(event, ctx) {
+    if (event.toolName !== "cron")
+        return;
+    const action = typeof event.params?.action === "string" ? event.params.action : "";
+    if (action !== "add")
+        return;
+    const jobId = readJobIdFromResult(event.result);
+    if (!jobId)
+        return;
+    const sessionCtx = ctx.sessionKey ? getSessionContext(ctx.sessionKey) : null;
+    const sessionId = sessionCtx?.sessionId;
+    if (!sessionId)
+        return;
+    const pushId = configManager.getPushId(sessionId);
+    if (!pushId)
+        return;
+    await setJobPushId(jobId, {
+        pushId,
+        sessionId,
+        deviceType: sessionCtx?.deviceType,
+        source: "conversation",
+    });
+}
+/** 防御性地从 cron add 结果中取 job id（可能是对象或 JSON 字符串）。 */
+function readJobIdFromResult(result) {
+    if (!result)
+        return undefined;
+    let obj = result;
+    if (typeof result === "string") {
+        try {
+            obj = JSON.parse(result);
+        }
+        catch {
+            return undefined;
+        }
+    }
+    if (obj && typeof obj === "object") {
+        const id = obj.id;
+        if (typeof id === "string" && id.trim())
+            return id.trim();
+    }
+    return undefined;
+}
 function registerFullHooks(api) {
     // SKILL RETRIEVER HOOK: before_prompt_build hook
     const pluginConfig = api.pluginConfig || {};

package/dist/src/bot.js

@@ -33,7 +33,6 @@ export async function handleXYMessage(params) {
     try {
         // Check for special messages BEFORE parsing (these have different param structures)
         const messageMethod = message.method;
-        logger.log(`[BOT] Received A2A message: ${JSON.stringify(message)}`);
         // Handle clearContext messages (sessionId at top level, no params)
         if (messageMethod === "clearContext" || messageMethod === "clear_context") {
             const sessionId = message.sessionId ?? message.params?.sessionId;
@@ -189,6 +188,7 @@ export async function handleXYMessage(params) {
                             modelOverrideSource: "user",
                             model: "",
                             modelProvider: "",
+                            contextTokens: 256_000,
                         }),
                     });
                     if (!result) {
@@ -206,6 +206,7 @@ export async function handleXYMessage(params) {
                                     providerOverride: "xiaoyiprovider",
                                     modelOverride: modelName,
                                     modelOverrideSource: "user",
+                                    contextTokens: 256_000,
                                 };
                             }
                         });

package/dist/src/cron-command.d.ts

@@ -2,6 +2,8 @@ import type { XYChannelConfig, A2ACommand } from "./types.js";
 export interface SendCommandViaPushParams {
     config: XYChannelConfig;
     command: A2ACommand;
+    /** 指定设备的 pushId（多设备路由）。未传时回退到 getAllPushIds()[0]。 */
+    pushId?: string;
 }
 /**
  * Send a tool command through the push channel (for cron-triggered tool calls).

package/dist/src/cron-command.js

@@ -24,16 +24,22 @@ export async function sendCommandViaPush(params) {
         command.header?.name ??
         "Command";
     logger.log(`[CRON-CMD] Sending command via push, intent=${intentName}`);
-    // 1. Load push IDs, use first one
+    // 1. 选 pushId：优先用调用方解析出的设备 pushId（多设备路由正确）；
+    //    未提供时回退到 getAllPushIds()[0]（单设备兼容旧行为）。
     let pushId = config.pushId;
-    try {
-        const pushIdList = await getAllPushIds();
-        if (pushIdList.length > 0) {
-            pushId = pushIdList[0];
-        }
+    if (params.pushId) {
+        pushId = params.pushId;
     }
-    catch (error) {
-        logger.error("[CRON-CMD] Failed to load pushIds:", error);
+    else {
+        try {
+            const pushIdList = await getAllPushIds();
+            if (pushIdList.length > 0) {
+                pushId = pushIdList[0];
+            }
+        }
+        catch (error) {
+            logger.error("[CRON-CMD] Failed to load pushIds:", error);
+        }
     }
     // 2. Build and send push notification with command in directives
     const pushService = new XYPushService(config);

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

@@ -7,6 +7,8 @@ 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 { configManager } from "./utils/config-manager.js";
+import { setJobPushId } from "./utils/cron-push-map.js";
 import { logger } from "./utils/logger.js";
 import { readFileSync, readdirSync } from "fs";
 import { join } from "path";
@@ -19,7 +21,8 @@ const GATEWAY_TIMEOUT_MS = 60_000;
  */
 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)"}`);
+    const log = logger.withContext(sessionId ?? "", taskId ?? "");
+    log.log(`[CRON-QUERY] Received event: action=${action}, jobId=${jobId ?? "(none)"}`);
     let result;
     let error;
     try {
@@ -38,6 +41,11 @@ export async function handleCronQueryEvent(context, cfg) {
                 break;
             case "add":
                 result = await callGatewayTool("cron.add", { timeoutMs: GATEWAY_TIMEOUT_MS }, params ?? {});
+                // 捕获 jobId↔pushId：cron-query 路径由 channel 自己建 job，
+                // 此处 context 握着 sessionId，configManager 有对应设备 pushId。
+                await persistCronPushMap(context.sessionId, result).catch((err) => {
+                    logger.error(`[CRON-QUERY] Failed to persist cron-push-map:`, err);
+                });
                 break;
             case "update":
                 result = await callGatewayTool("cron.update", { timeoutMs: GATEWAY_TIMEOUT_MS }, {
@@ -62,17 +70,17 @@ export async function handleCronQueryEvent(context, cfg) {
                 break;
             default:
                 error = `Unknown action: ${context.action}`;
-                logger.error(`[CRON-QUERY] ${error}`);
+                log.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);
+        log.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)}`);
+    log.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 {
@@ -93,17 +101,36 @@ export async function handleCronQueryEvent(context, cfg) {
                 taskId,
                 messageId,
                 command,
-                final: false,
+                final: sessionId.toLowerCase().endsWith("cronquery"),
             });
-            logger.log(`[CRON-QUERY] Sent response via sendCommand, action=${action}`);
+            log.log(`[CRON-QUERY] Sent response via sendCommand, action=${action}`);
         }
         catch (sendErr) {
-            logger.error(`[CRON-QUERY] Failed to send response via sendCommand:`, sendErr);
+            log.error(`[CRON-QUERY] Failed to send response via sendCommand:`, sendErr);
         }
     }
     else {
-        logger.warn(`[CRON-QUERY] Missing cfg/sessionId/taskId/messageId, skipping sendCommand`);
+        log.warn(`[CRON-QUERY] Missing cfg/sessionId/taskId/messageId, skipping sendCommand`);
+    }
+}
+/**
+ * 从 cron.add 结果中提取 jobId，配合 sessionId 对应的 pushId 写入映射。
+ */
+async function persistCronPushMap(sessionId, result) {
+    if (!sessionId)
+        return;
+    let jobId;
+    if (result && typeof result === "object") {
+        const id = result.id;
+        if (typeof id === "string" && id.trim())
+            jobId = id.trim();
     }
+    if (!jobId)
+        return;
+    const pushId = configManager.getPushId(sessionId);
+    if (!pushId)
+        return;
+    await setJobPushId(jobId, { pushId, sessionId, source: "cron-query" });
 }
 /**
  * Read local cron folder directly (bypassing openclaw RPC) and return

package/dist/src/cspl/call_api.js

@@ -4,7 +4,7 @@
 import https from 'https';
 import { URL } from 'url';
 import { getConfig } from './config.js';
-import { DEFAULT_HTTP_PORT, HTTP_STATUS_BAD_REQUEST, API_URL_SUFFIX } from './constants.js';
+import { DEFAULT_HTTPS_PORT, HTTP_STATUS_BAD_REQUEST, API_URL_SUFFIX } from './constants.js';
 function buildHeadersForCelia(config, sessionId) {
     if (!config.uid || !config.apiKey || !config.skillId || !config.requestFrom) {
         throw new Error('[SENTINEL HOOK] Missing required configuration: uid, apiKey, skillId, or requestFrom is not defined');
@@ -22,7 +22,7 @@ function buildRequestOptions(url, headers, timeout) {
     const urlObj = new URL(url);
     return {
         hostname: urlObj.hostname,
-        port: urlObj.port || DEFAULT_HTTP_PORT,
+        port: urlObj.port || DEFAULT_HTTPS_PORT,
         path: urlObj.pathname,
         method: "POST",
         headers: headers,

package/dist/src/cspl/upload_file.js

@@ -6,7 +6,7 @@ import path from 'path';
 import https from 'https';
 import { URL } from 'url';
 import { getConfig } from './config.js';
-import { DEFAULT_HTTP_PORT, DEFAULT_HTTPS_PORT, MAX_TIMES, CONNECT_TIMEOUT, READ_TIMEOUT, EXPIRE_TIME, OSMS_PREPARE_URL, OSMS_COMPLETE_URL, TEMPORARY_MATERIAL_PACKAGE, FILE_OWNER_UID, FILE_OWNER_TEAM_ID } from './constants.js';
+import { DEFAULT_HTTPS_PORT, MAX_TIMES, CONNECT_TIMEOUT, READ_TIMEOUT, EXPIRE_TIME, OSMS_PREPARE_URL, OSMS_COMPLETE_URL, TEMPORARY_MATERIAL_PACKAGE, FILE_OWNER_UID, FILE_OWNER_TEAM_ID } from './constants.js';
 function buildOsmsHeaders(config, traceId) {
     return {
         'content-type': 'application/json',
@@ -22,7 +22,7 @@ function httpRequest(url, method, headers, body, timeout) {
         const urlObj = new URL(url);
         const options = {
             hostname: urlObj.hostname,
-            port: urlObj.port || DEFAULT_HTTP_PORT,
+            port: urlObj.port || DEFAULT_HTTPS_PORT,
             path: urlObj.pathname + urlObj.search,
             method: method,
             headers: headers,

package/dist/src/formatter.js

@@ -5,7 +5,10 @@ import { logger } from "./utils/logger.js";
 import { getCurrentTaskId, getCurrentMessageId } from "./task-manager.js";
 import { redactSensitiveText, containsSensitiveInfo } from "./sensitive-redactor.js";
 import { rewriteOutboundApprovalText } from "./approval-bridge.js";
-import { isCronToolCall } from "./tools/session-manager.js";
+import { isCronToolCall, getCurrentCronJobId } from "./tools/session-manager.js";
+import { configManager } from "./utils/config-manager.js";
+import { getPushIdByJobId } from "./utils/cron-push-map.js";
+import { getAllPushIds } from "./utils/pushid-manager.js";
 // ─────────────────────────────────────────────────────────────
 // 敏感信息脱敏辅助函数
 // ─────────────────────────────────────────────────────────────
@@ -201,6 +204,45 @@ export async function sendStatusUpdate(params) {
     log.log(`[A2A_STATUS] Sending status-update, text="${redactedText}"`);
     await wsManager.sendMessage(sessionId, outboundMessage);
 }
+/**
+ * 解析 cron fire 时应使用的 pushId（多设备路由）。
+ *
+ * 查询链（逐级回退）：
+ *   1. 合成 sessionId → jobId → cron-push-map.json → 创建时记录的设备 pushId
+ *   2. configManager 同进程的 sessionId→pushId（进程未重启时兜底）
+ *   3. getAllPushIds()[0]（单设备兼容旧行为）
+ * 返回 undefined 表示走兜底（由 sendCommandViaPush 内部处理）。
+ */
+async function resolveCronPushId(sessionId, config) {
+    // 1. jobId → 持久化映射
+    const jobId = getCurrentCronJobId(sessionId);
+    if (jobId) {
+        const hit = await getPushIdByJobId(jobId);
+        if (hit?.pushId) {
+            logger.log(`[CRON-PUSH] Resolved pushId via map, jobId=${jobId}`);
+            return hit.pushId;
+        }
+    }
+    // 2. 同进程 configManager 兜底
+    const sessionPushId = configManager.getPushId(sessionId);
+    if (sessionPushId) {
+        logger.log(`[CRON-PUSH] Resolved pushId via configManager (fallback)`);
+        return sessionPushId;
+    }
+    // 3. config.pushId / getAllPushIds()[0] 交给 sendCommandViaPush 内部处理
+    void config;
+    try {
+        const all = await getAllPushIds();
+        if (all.length > 0) {
+            logger.log(`[CRON-PUSH] Resolved pushId via getAllPushIds[0] (legacy fallback)`);
+            return all[0];
+        }
+    }
+    catch (error) {
+        logger.error(`[CRON-PUSH] getAllPushIds failed:`, error);
+    }
+    return undefined;
+}
 /**
  * Send a command as an artifact update (final=false).
  *
@@ -217,11 +259,15 @@ export async function sendCommand(params) {
     if (commands.length === 0) {
         throw new Error("sendCommand requires command or commands.");
     }
-    // ── Cron mode: disabled ────────────────────────────────────────
-    // sendCommandViaPush is disabled in this version. Cron-triggered
-    // tool calls that try to send commands will be rejected.
+    // ── Cron mode: route through push channel ──────────────────────
+    // Detected via: (a) sessionId "cron-" prefix from synthetic session, OR
+    //               (b) toolCallId marked by before_tool_call hook from openclaw's sessionKey.
     if (sessionId.startsWith("cron-") || isCronToolCall(toolCallId)) {
-        throw new Error("sendCommandViaPush is disabled in this version");
+        const { sendCommandViaPush } = await import("./cron-command.js");
+        // 解析正确设备的 pushId：合成 sessionId → jobId → cron-push-map。
+        // provider.ts 在 isCron 分支已把 jobId 绑定到该 sessionId。
+        const pushId = await resolveCronPushId(sessionId, config);
+        return sendCommandViaPush({ config, command: commands[0], pushId });
     }
     // ── Normal mode: WebSocket ─────────────────────────────────────
     // Dynamic lookup: use latest taskId/messageId from task-manager (handles steer/interrupt),

package/dist/src/parser.js

@@ -56,22 +56,16 @@ export function extractRunCrossTaskContext(parts) {
                 return null;
             }
             const candidate = item;
-            const fileLocalUrls = Array.isArray(candidate.fileLocalUrls)
-                ? candidate.fileLocalUrls.filter((url) => typeof url === "string" && url.length > 0)
-                : [];
-            const fileRemoteUrls = Array.isArray(candidate.fileRemoteUrls)
-                ? candidate.fileRemoteUrls.filter((url) => typeof url === "string" && url.length > 0)
-                : [];
-            const fileNames = Array.isArray(candidate.fileNames)
-                ? candidate.fileNames.filter((name) => typeof name === "string" && name.length > 0)
-                : [];
-            if (fileLocalUrls.length === 0 && fileRemoteUrls.length === 0) {
+            const fileName = typeof candidate.fileName === "string" ? candidate.fileName.trim() : "";
+            const fileId = typeof candidate.fileId === "string" ? candidate.fileId.trim() : "";
+            const mimeType = typeof candidate.mimeType === "string" ? candidate.mimeType.trim() : "";
+            if (!fileName || !fileId) {
                 return null;
             }
             return {
-                ...(fileLocalUrls.length > 0 ? { fileLocalUrls } : {}),
-                ...(fileRemoteUrls.length > 0 ? { fileRemoteUrls } : {}),
-                ...(fileNames.length > 0 && fileNames.length === fileRemoteUrls.length ? { fileNames } : {}),
+                fileName,
+                fileId,
+                ...(mimeType ? { mimeType } : {}),
             };
         })
             .filter((item) => item !== null);

package/dist/src/provider.js

@@ -9,7 +9,7 @@
 //   models.providers.xiaoyiprovider.models = [...]
 import { createHash } from "crypto";
 import { logger } from "./utils/logger.js";
-import { getCurrentSessionContext } from "./tools/session-manager.js";
+import { getCurrentSessionContext, setCurrentCronJobId } from "./tools/session-manager.js";
 import { selfEvolutionManager } from "./utils/self-evolution-manager.js";
 import { notifyModelStreaming } from "./bot.js";
 // ── Retry config ──────────────────────────────────────────────
@@ -436,7 +436,7 @@ export const xiaoyiProvider = {
             reasoning: false,
             input: ["text"],
             cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-            contextWindow: 128_000,
+            contextWindow: 256_000,
             maxTokens: 8192,
             ...(ctx.providerConfig?.headers && typeof ctx.providerConfig.headers === "object"
                 ? { headers: ctx.providerConfig.headers }
@@ -506,6 +506,14 @@ export const xiaoyiProvider = {
             //   3. UID-based fallback: sha256(uid).hex[:32]_timestamp
             const isCron = isCronTriggered(context.messages);
             if (isCron) {
+                // fire 期 jobId 桥：把首条消息 `[cron:<jobId> ...]` 解析出的真实 jobId
+                // 绑定到本次 cron run 的合成 sessionId。sendCommand 凭同一 sessionId
+                // 反查 jobId → cron-push-map → 正确设备的 pushId（多设备路由）。
+                const cronJobId = extractCronUuid(context.messages);
+                const cronCtx = getCurrentSessionContext();
+                if (cronJobId && cronCtx?.sessionId) {
+                    setCurrentCronJobId(cronCtx.sessionId, cronJobId);
+                }
                 const fallbackPrefix = ctx.extraParams?.[FALLBACK_PREFIX_KEY];
                 if (typeof fallbackPrefix === "string") {
                     const fallbackValue = `${fallbackPrefix}_${Date.now()}`;

package/dist/src/reply-dispatcher.js

@@ -39,17 +39,23 @@ function buildCrossTaskExecuteResultCommand(code, message, sentFiles = []) {
 async function sendRunCrossTaskResult(params) {
     const { config, sessionId, taskId, messageId, context, resultCode, resultMessage } = params;
     const sentFiles = Array.isArray(context.sentFiles) ? context.sentFiles : [];
+    const fileCardCount = sentFiles.length;
     const statusCommand = buildDistributionStatusCommand(context);
     const resultCommand = buildCrossTaskExecuteResultCommand(resultCode, resultMessage, sentFiles);
-    await sendCommand({
-        config,
-        sessionId,
-        taskId,
-        messageId,
-        commands: [statusCommand, resultCommand],
-    });
-    clearRunCrossTaskSentFiles(context);
-    logger.log(`${RUN_CROSS_TASK_LOG_TAG} sent cross-task result, sessionId=${sessionId}, taskId=${taskId}, code=${resultCode}, sentFileCount=${sentFiles.length}, clearedSentFileCount=${sentFiles.length}, messageLength=${resultMessage.length}`);
+    try {
+        await sendCommand({
+            config,
+            sessionId,
+            taskId,
+            messageId,
+            commands: [statusCommand, resultCommand],
+        });
+        logger.log(`${RUN_CROSS_TASK_LOG_TAG} sent cross-task result, sessionId=${sessionId}, taskId=${taskId}, code=${resultCode}, fileCardCount=${fileCardCount}, messageLength=${resultMessage.length}`);
+    }
+    finally {
+        clearRunCrossTaskSentFiles(context);
+        logger.log(`${RUN_CROSS_TASK_LOG_TAG} cleared cross-task sentFiles, sessionId=${sessionId}, taskId=${taskId}, clearedFileCardCount=${fileCardCount}`);
+    }
 }
 /**
  * 清理 /tmp/xy_channel 目录中超过 24 小时的旧文件
@@ -116,6 +122,7 @@ export function createXYReplyDispatcher(params) {
     let hasSentResponse = false;
     let finalSent = false;
     let accumulatedText = "";
+    let finalReplyText = "";
     const initialRunCrossTaskContext = getCurrentSessionContext()?.runCrossTaskContext;
     const getRunCrossTaskContext = () => {
         return getCurrentSessionContext()?.runCrossTaskContext ?? initialRunCrossTaskContext;
@@ -172,6 +179,10 @@ export function createXYReplyDispatcher(params) {
                     scopedLog().log(`[DELIVER SKIP] Empty text, skipping`);
                     return;
                 }
+                if (info?.kind === "final") {
+                    finalReplyText = text;
+                    scopedLog().log(`[DELIVER] Captured final reply text, length=${finalReplyText.length}`);
+                }
                 // 🔑 如果 onPartialReply 已经流式发送过文本，deliver 不再重复发送
                 if (hasSentResponse) {
                     scopedLog().log(`[DELIVER SKIP] Already sent via onPartialReply`);
@@ -232,7 +243,11 @@ export function createXYReplyDispatcher(params) {
             }
             // 正常模式（或未被steer的dispatch）
             if (hasSentResponse && !finalSent) {
-                scopedLog().log(`[ON-IDLE] Sending accumulated text, length=${accumulatedText.length}`);
+                const trimmedFinalReplyText = finalReplyText.trim();
+                const trimmedAccumulatedText = accumulatedText.trim();
+                const crossTaskResultMessage = trimmedFinalReplyText || trimmedAccumulatedText;
+                const crossTaskResultSource = trimmedFinalReplyText ? "final" : "accumulated";
+                scopedLog().log(`[ON-IDLE] [SendCrossResult]Sending cross-task result, source=${crossTaskResultSource}, resultMessage.length=${crossTaskResultMessage.length}`);
                 try {
                     const runCrossTaskContext = getRunCrossTaskContext();
                     if (runCrossTaskContext) {
@@ -243,7 +258,7 @@ export function createXYReplyDispatcher(params) {
                             messageId: currentMessageId,
                             context: runCrossTaskContext,
                             resultCode: "0",
-                            resultMessage: accumulatedText,
+                            resultMessage: crossTaskResultMessage,
                         });
                     }
                     // 🔑 使用动态taskId发送完成状态
@@ -402,7 +417,6 @@ export function createXYReplyDispatcher(params) {
                 if (lines[0]?.trim() === "Reasoning:") {
                     text = lines.slice(1).join("\n").trim();
                 }
-                scopedLog().log(`[REASONING-STREAM] ${text.substring(0, 100)}`);
                 try {
                     if (text.length > 0) {
                         await sendReasoningTextUpdate({

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

@@ -17,6 +17,10 @@ import { createGetCollectionToolSchemaTool } from "./get-collection-tool-schema.
 // import { createGetEmailToolSchemaTool } from "./get-email-tool-schema.js";
 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 { createCheckPluginPrivilegeTool } from "./check-plugin-privilege-tool.js";
 import { logger } from "../utils/logger.js";
 /**
  * Create all XY channel tools for the given session context.
@@ -32,9 +36,9 @@ export function createAllTools(ctx) {
     logger.log(`[CREATE-ALL-TOOLS] creating tools`);
     return [
         createLocationTool(ctx),
-        // createDiscoverCrossDevicesTool(ctx),
-        // createSendCrossDeviceTaskTool(ctx),
-        // createDisplayA2UICardTool(ctx),
+        createDiscoverCrossDevicesTool(ctx),
+        createSendCrossDeviceTaskTool(ctx),
+        createDisplayA2UICardTool(ctx),
         createCallDeviceTool(ctx),
         createGetNoteToolSchemaTool(ctx),
         createGetCalendarToolSchemaTool(ctx),
@@ -53,6 +57,6 @@ export function createAllTools(ctx) {
         createSaveSelfEvolutionSkillTool(ctx),
         createLoginTokenTool(ctx),
         createAgentAsSkillTool(ctx),
-        // createCheckPluginPrivilegeTool(ctx),
+        createCheckPluginPrivilegeTool(ctx),
     ];
 }

package/dist/src/tools/device-tool-map.d.ts

@@ -1,4 +1,4 @@
 /** Known device type enum. */
-export declare const DEVICE_TYPES: readonly ["car", "2in1", "phone", "web"];
+export declare const DEVICE_TYPES: readonly ["car", "2in1", "phone", "web", "pad"];
 export type DeviceType = (typeof DEVICE_TYPES)[number];
 export declare function filterToolsByDevice(tools: any[], deviceType?: string): any[];

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

@@ -4,7 +4,7 @@
 //   - denylist: listed tools are blocked, everything else is available (used for permissive devices like pc)
 // Tools NOT listed in any device entry → available to all devices (no restriction).
 /** Known device type enum. */
-export const DEVICE_TYPES = ["car", "2in1", "phone", "web"];
+export const DEVICE_TYPES = ["car", "2in1", "phone", "web", "pad"];
 const DEVICE_TOOL_POLICY = {
     "2in1": {
         allowlist: false,
@@ -15,6 +15,13 @@ const DEVICE_TOOL_POLICY = {
             "search_message",
             "search_contact",
             "get_contact_tool_schema",
+            "send_html_card"
+        ],
+    },
+    "pad": {
+        allowlist: false,
+        tools: [
+            "xiaoyi_gui_agent"
         ],
     },
     "web": {

package/dist/src/tools/modify-alarm-tool.js

@@ -75,6 +75,23 @@ export function createModifyAlarmTool(ctx) {
             required: ["entityId"],
         },
         async execute(toolCallId, params) {
+            // Coerce numeric string params to actual numbers
+            // The model may produce "1" instead of 1, which would fail typeof checks
+            const numericParams = [
+                "alarmState",
+                "alarmSnoozeDuration",
+                "alarmSnoozeTotal",
+                "alarmRingDuration",
+                "daysOfWakeType",
+            ];
+            for (const key of numericParams) {
+                if (typeof params[key] === "string") {
+                    const num = Number(params[key]);
+                    if (!isNaN(num)) {
+                        params[key] = num;
+                    }
+                }
+            }
             // ===== Validate required parameter: entityId =====
             if (!params.entityId || typeof params.entityId !== "string") {
                 throw new Error("Missing required parameter: entityId must be a string obtained from search_alarm or create_alarm");

package/dist/src/tools/send-cross-device-task-tool.js

@@ -1,7 +1,6 @@
 import { sendCommand, sendStatusUpdate } from "../formatter.js";
 import { getXYWebSocketManager } from "../client.js";
 import { getCurrentMessageId, getCurrentTaskId } from "../task-manager.js";
-import { createSendFileToUserTool } from "./send-file-to-user-tool.js";
 import { logger } from "../utils/logger.js";
 const LOG_TAG = "[SendPcDeviceTask]";
 const SEND_CROSS_RESULT_LOG_TAG = "[SendCrossResult]";
@@ -28,7 +27,7 @@ function buildModelToolResult(result) {
     let message = `跨端任务执行结果：${baseMessage}`;
     if (resultStatus === "对端设备执行任务成功且返回有文件") {
         if (result.autoSendFileToUser?.success) {
-            message += "\n\n对端设备返回了文件，系统已自动通过 send_file_to_user 将文件卡片发送给用户。请你基于跨端任务结果生成最终回复，告知用户任务已完成且文件已发送。";
+            message += "\n\n对端设备返回了文件，系统已自动将文件卡片发送给用户。请你基于跨端任务结果生成最终回复，告知用户任务已完成且文件已发送。";
         }
         else {
             const errorMessage = result.autoSendFileToUser?.error || "未知错误";
@@ -56,22 +55,92 @@ function buildCrossDeviceResult(params) {
     };
     return result;
 }
+function collectSentFileCards(sentFiles) {
+    const cardsByFileId = new Map();
+    for (const card of sentFiles) {
+        const fileId = typeof card.fileId === "string" ? card.fileId.trim() : "";
+        const fileName = typeof card.fileName === "string" ? card.fileName.trim() : "";
+        const mimeType = typeof card.mimeType === "string" ? card.mimeType.trim() : "";
+        if (!fileId || !fileName || cardsByFileId.has(fileId)) {
+            continue;
+        }
+        cardsByFileId.set(fileId, {
+            fileId,
+            fileName,
+            ...(mimeType ? { mimeType } : {}),
+        });
+    }
+    return Array.from(cardsByFileId.values());
+}
+function countSentFileCards(sentFiles) {
+    return collectSentFileCards(sentFiles).length;
+}
+async function sendFileCardsToUser(ctx, fileCards) {
+    const { config, sessionId, taskId, messageId } = ctx;
+    const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
+    const currentMessageId = getCurrentMessageId(sessionId) ?? messageId;
+    const wsManager = getXYWebSocketManager(config);
+    const sentFileCards = [];
+    for (const card of fileCards) {
+        const agentResponse = {
+            msgType: "agent_response",
+            agentId: config.agentId,
+            sessionId,
+            taskId: currentTaskId,
+            msgDetail: JSON.stringify({
+                jsonrpc: "2.0",
+                id: currentMessageId,
+                result: {
+                    kind: "artifact-update",
+                    append: true,
+                    lastChunk: false,
+                    final: false,
+                    artifact: {
+                        artifactId: currentTaskId,
+                        parts: [
+                            {
+                                kind: "file",
+                                file: {
+                                    name: card.fileName,
+                                    mimeType: card.mimeType,
+                                    fileId: card.fileId,
+                                },
+                            },
+                        ],
+                    },
+                },
+                error: { code: 0 },
+            }),
+        };
+        logger.log(`${SEND_CROSS_RESULT_LOG_TAG} sending file card by fileId, fileName=${card.fileName}`);
+        await wsManager.sendMessage(sessionId, agentResponse);
+        sentFileCards.push({ fileName: card.fileName, fileId: card.fileId });
+    }
+    return sentFileCards;
+}
 async function autoSendFileToUserIfNeeded(result, ctx) {
     const sentFiles = Array.isArray(result.sentFiles) ? result.sentFiles : [];
     if (sentFiles.length === 0) {
         return result;
     }
-    logger.log(`${SEND_CROSS_RESULT_LOG_TAG} auto sending ${sentFiles.length} cross-device file(s) to user`);
+    const fileCards = collectSentFileCards(sentFiles);
+    if (fileCards.length === 0) {
+        const errorMessage = "Cross-device result contains no valid fileCards.";
+        logger.error(`${SEND_CROSS_RESULT_LOG_TAG} auto file card send skipped, error=${errorMessage}`);
+        return {
+            ...result,
+            autoSendFileToUser: {
+                success: false,
+                error: errorMessage,
+            },
+        };
+    }
+    logger.log(`${SEND_CROSS_RESULT_LOG_TAG} auto sending cross-device file cards, fileCardCount=${fileCards.length}`);
     try {
-        const sendFileTool = createSendFileToUserTool(ctx);
-        const sendFileResult = await (async () => {
-            const results = [];
-            for (const sentFileParams of sentFiles) {
-                results.push(await sendFileTool.execute("auto_send_cross_device_file", sentFileParams));
-            }
-            return results;
-        })();
-        logger.log(`${SEND_CROSS_RESULT_LOG_TAG} auto send_file_to_user completed`);
+        const sendFileResult = {
+            fileCards: await sendFileCardsToUser(ctx, fileCards),
+        };
+        logger.log(`${SEND_CROSS_RESULT_LOG_TAG} auto file card send completed, fileCardCount=${sendFileResult.fileCards.length}`);
         return {
             ...result,
             autoSendFileToUser: {
@@ -82,7 +151,7 @@ async function autoSendFileToUserIfNeeded(result, ctx) {
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
-        logger.error(`${SEND_CROSS_RESULT_LOG_TAG} auto send_file_to_user failed, error=${errorMessage}`);
+        logger.error(`${SEND_CROSS_RESULT_LOG_TAG} auto file card send failed, error=${errorMessage}`);
         return {
             ...result,
             autoSendFileToUser: {
@@ -218,7 +287,7 @@ export function createSendCrossDeviceTaskTool(ctx) {
                     }
                     settled = true;
                     const modelResult = buildModelToolResult(result);
-                    logger.log(`${LOG_TAG} completed, success=${result.success}, code=${result.code}, sentFileCount=${result.sentFiles.length}`);
+                    logger.log(`${LOG_TAG} completed, success=${result.success}, code=${result.code}, fileCardCount=${countSentFileCards(result.sentFiles)}`);
                     cleanup();
                     resolve(buildResultText(modelResult));
                 };
@@ -226,7 +295,7 @@ export function createSendCrossDeviceTaskTool(ctx) {
                     if (event.sessionId && event.sessionId !== sessionId && event.sessionId !== distributionSessionId) {
                         return;
                     }
-                    logger.log(`${SEND_CROSS_RESULT_LOG_TAG} received result, status=${event.status}, code=${event.code}, sentFileCount=${event.sentFiles.length}`);
+                    logger.log(`${SEND_CROSS_RESULT_LOG_TAG} received result, status=${event.status}, code=${event.code}, fileCardCount=${countSentFileCards(event.sentFiles)}`);
                     void (async () => {
                         if (resultHandlingStarted) {
                             return;

package/dist/src/tools/send-file-to-user-tool.js

@@ -174,16 +174,6 @@ b. 操作超时时间为2分钟（120秒），请勿重复调用此工具，如
                         throw new Error(`fileNames length (${fileNames.length}) must match fileRemoteUrls length (${fileRemoteUrls.length})`);
                     }
                 }
-                if (ctx.runCrossTaskContext && (fileLocalUrls.length > 0 || fileRemoteUrls.length > 0)) {
-                    const cachedSentFiles = appendRunCrossTaskSentFiles([
-                        {
-                            ...(fileLocalUrls.length > 0 ? { fileLocalUrls } : {}),
-                            ...(fileRemoteUrls.length > 0 ? { fileRemoteUrls } : {}),
-                            ...(fileNames.length > 0 ? { fileNames } : {}),
-                        },
-                    ], ctx.runCrossTaskContext);
-                    logger.log(`[RunCrossTask] cached ${cachedSentFiles.length} send_file_to_user input(s) for cross-task result`);
-                }
                 // Get WebSocket manager
                 const wsManager = getXYWebSocketManager(config);
                 // Create upload service
@@ -237,6 +227,7 @@ b. 操作超时时间为2分钟（120秒），请勿重复调用此工具，如
                 }
                 // Build and send agent_response messages for each file
                 const sentFiles = [];
+                let cachedSentFilesForReturn = [];
                 for (const uploadedFile of uploadedFiles) {
                     const { fileName, fileId, mimeType } = uploadedFile;
                     const agentResponse = {
@@ -273,6 +264,12 @@ b. 操作超时时间为2分钟（120秒），请勿重复调用此工具，如
                     // Send WebSocket message
                     await wsManager.sendMessage(sessionId, agentResponse);
                     logger.log(`[SEND-FILE-TO-USER] send ${fileName} file to user success`);
+                    if (ctx.runCrossTaskContext) {
+                        const sentFileCard = { fileName, fileId, mimeType };
+                        const cachedSentFiles = appendRunCrossTaskSentFiles([sentFileCard], ctx.runCrossTaskContext);
+                        cachedSentFilesForReturn = cachedSentFiles;
+                        logger.log(`[RunCrossTask] cached file card for cross-task result, fileName=${fileName}, cachedFileCardCount=${cachedSentFiles.length}`);
+                    }
                     sentFiles.push({ fileName, fileId });
                 }
                 return {
@@ -282,7 +279,8 @@ b. 操作超时时间为2分钟（120秒），请勿重复调用此工具，如
                             text: JSON.stringify({
                                 sentFiles,
                                 count: sentFiles.length,
-                                message: `成功发送 ${sentFiles.length} 个文件到用户设备`
+                                message: `成功发送 ${sentFiles.length} 个文件到用户设备`,
+                                cachedSentFiles: cachedSentFilesForReturn
                             }),
                         },
                     ],

package/dist/src/tools/session-manager.d.ts

@@ -1,5 +1,5 @@
 import { AsyncLocalStorage } from "async_hooks";
-import type { RunCrossTaskContext, SentFileParams, XYChannelConfig } from "../types.js";
+import type { RunCrossTaskContext, SentFileCard, XYChannelConfig } from "../types.js";
 export interface SessionContext {
     config: XYChannelConfig;
     sessionId: string;
@@ -27,6 +27,12 @@ export declare function markCronToolCall(toolCallId: string): void;
 export declare function isCronToolCall(toolCallId?: string): boolean;
 /** Clean up a cron tool call marker after use. */
 export declare function clearCronToolCall(toolCallId: string): void;
+/** 把 fire 期解析出的 jobId 绑定到当前 cron run 的合成 sessionId。 */
+export declare function setCurrentCronJobId(cronSessionId: string, jobId: string): void;
+/** 凭合成 cron sessionId 取本次 run 的 jobId（供 sendCommand 反查 pushId）。 */
+export declare function getCurrentCronJobId(cronSessionId?: string): string | undefined;
+/** cron run 结束后清理。 */
+export declare function clearCronJobId(cronSessionId: string): void;
 export declare const asyncLocalStorage: AsyncLocalStorage<SessionContext>;
 /**
  * Register a session context for tool access.
@@ -79,6 +85,6 @@ export declare function cleanupStaleSessions(): number;
  * Get the current number of active sessions (for diagnostics).
  */
 export declare function getActiveSessionCount(): number;
-export declare function appendRunCrossTaskSentFiles(sentFiles: SentFileParams[], explicitRunCrossTaskContext?: RunCrossTaskContext): SentFileParams[];
+export declare function appendRunCrossTaskSentFiles(sentFiles: SentFileCard[], explicitRunCrossTaskContext?: RunCrossTaskContext): SentFileCard[];
 export declare function clearRunCrossTaskSentFiles(explicitRunCrossTaskContext?: RunCrossTaskContext): void;
 export {};

package/dist/src/tools/session-manager.js

@@ -48,6 +48,32 @@ export function isCronToolCall(toolCallId) {
 export function clearCronToolCall(toolCallId) {
     cronToolCallMap.delete(toolCallId);
 }
+// ── Cron session ↔ jobId bridge ────────────────────────────────────
+// fire 期 jobId 传递桥。provider.ts 在 isCron 分支从首条消息
+// `[cron:<jobId> ...]` 解析出真实 jobId，写入合成 cron sessionId；
+// sendCommand/formatter 凭同一合成 sessionId 反查 jobId，再去
+// cron-push-map 取对应设备的 pushId。同一 cron run 内 ALS 上下文共享，
+// 合成 sessionId 在 provider 与 sendCommand 之间一致。
+if (!_g.__xyCronSessionJobId) {
+    _g.__xyCronSessionJobId = new Map();
+}
+const cronSessionJobIdMap = _g.__xyCronSessionJobId;
+/** 把 fire 期解析出的 jobId 绑定到当前 cron run 的合成 sessionId。 */
+export function setCurrentCronJobId(cronSessionId, jobId) {
+    if (cronSessionId && jobId) {
+        cronSessionJobIdMap.set(cronSessionId, jobId);
+    }
+}
+/** 凭合成 cron sessionId 取本次 run 的 jobId（供 sendCommand 反查 pushId）。 */
+export function getCurrentCronJobId(cronSessionId) {
+    if (!cronSessionId)
+        return undefined;
+    return cronSessionJobIdMap.get(cronSessionId);
+}
+/** cron run 结束后清理。 */
+export function clearCronJobId(cronSessionId) {
+    cronSessionJobIdMap.delete(cronSessionId);
+}
 // AsyncLocalStorage for thread-safe session context isolation
 export const asyncLocalStorage = new AsyncLocalStorage();
 // Export AsyncLocalStorage to globalThis so logger.ts can access it
@@ -64,9 +90,17 @@ export function registerSession(sessionKey, context) {
     setLastRegisteredKey(sessionKey);
     const existing = activeSessions.get(sessionKey);
     if (existing) {
-        // 更新上下文，增加引用计数，刷新存活时间
+        // 更新上下文（全量同步所有字段，避免 global Map 残留旧值，
+        // 当 ALS 丢失回退到 Map 时拿到过期的 modelName / deviceType）
+        existing.config = context.config;
+        existing.sessionId = context.sessionId;
+        existing.distributionSessionId = context.distributionSessionId;
         existing.taskId = context.taskId;
         existing.messageId = context.messageId;
+        existing.agentId = context.agentId;
+        existing.deviceType = context.deviceType;
+        existing.modelName = context.modelName;
+        existing.runCrossTaskContext = context.runCrossTaskContext;
         existing.refCount++;
         existing.createdAt = Date.now(); // 刷新存活时间，长对话不受 TTL 影响
     }
@@ -237,36 +271,49 @@ export function cleanupStaleSessions() {
 export function getActiveSessionCount() {
     return activeSessions.size;
 }
-function normalizeSentFileParams(params) {
-    const fileLocalUrls = Array.isArray(params.fileLocalUrls)
-        ? params.fileLocalUrls.filter((url) => typeof url === "string" && url.length > 0)
-        : [];
-    const fileRemoteUrls = Array.isArray(params.fileRemoteUrls)
-        ? params.fileRemoteUrls.filter((url) => typeof url === "string" && url.length > 0)
-        : [];
-    const fileNames = Array.isArray(params.fileNames)
-        ? params.fileNames.filter((name) => typeof name === "string" && name.length > 0)
-        : [];
-    if (fileLocalUrls.length === 0 && fileRemoteUrls.length === 0) {
+function normalizeSentFileCard(card) {
+    if (!card || typeof card !== "object") {
+        return null;
+    }
+    const fileName = typeof card.fileName === "string" ? card.fileName.trim() : "";
+    const fileId = typeof card.fileId === "string" ? card.fileId.trim() : "";
+    const mimeType = typeof card.mimeType === "string" ? card.mimeType.trim() : "";
+    if (!fileName || !fileId) {
         return null;
     }
     return {
-        ...(fileLocalUrls.length > 0 ? { fileLocalUrls } : {}),
-        ...(fileRemoteUrls.length > 0 ? { fileRemoteUrls } : {}),
-        ...(fileNames.length > 0 && fileNames.length === fileRemoteUrls.length ? { fileNames } : {}),
+        fileName,
+        fileId,
+        ...(mimeType ? { mimeType } : {}),
     };
 }
+function dedupeSentFilesByFileId(existing, incoming) {
+    const knownFileIds = new Set();
+    for (const card of existing) {
+        if (card.fileId) {
+            knownFileIds.add(card.fileId);
+        }
+    }
+    return incoming.filter((card) => {
+        if (knownFileIds.has(card.fileId)) {
+            return false;
+        }
+        knownFileIds.add(card.fileId);
+        return true;
+    });
+}
 export function appendRunCrossTaskSentFiles(sentFiles, explicitRunCrossTaskContext) {
     const context = asyncLocalStorage.getStore() ?? null;
     const runCrossTaskContext = explicitRunCrossTaskContext ?? context?.runCrossTaskContext;
     const normalizedSentFiles = sentFiles
-        .map((params) => normalizeSentFileParams(params))
-        .filter((params) => params !== null);
+        .map((card) => normalizeSentFileCard(card))
+        .filter((card) => card !== null);
     if (!runCrossTaskContext || normalizedSentFiles.length === 0) {
         return runCrossTaskContext?.sentFiles ?? [];
     }
     const existing = Array.isArray(runCrossTaskContext.sentFiles) ? runCrossTaskContext.sentFiles : [];
-    const merged = [...existing, ...normalizedSentFiles];
+    const dedupedSentFiles = dedupeSentFilesByFileId(existing, normalizedSentFiles);
+    const merged = [...existing, ...dedupedSentFiles];
     runCrossTaskContext.sentFiles = merged;
     const sessionWithRef = Array.from(activeSessions.values()).find((session) => session.runCrossTaskContext === runCrossTaskContext);
     if (sessionWithRef?.runCrossTaskContext) {

package/dist/src/types.d.ts

@@ -68,7 +68,7 @@ export interface CrossDeviceTaskResultEvent {
     sessionId: string;
     code: string;
     message: string;
-    sentFiles: SentFileParams[];
+    sentFiles: SentFileCard[];
     status: "success" | "failed";
     rawEvent: any;
 }
@@ -78,13 +78,13 @@ export interface RunCrossTaskContext {
     isDistributed: boolean;
     networkId: string;
     isSupportAgent: boolean;
-    sentFiles: SentFileParams[];
+    sentFiles: SentFileCard[];
     rawContext: any;
 }
-export interface SentFileParams {
-    fileLocalUrls?: string[];
-    fileRemoteUrls?: string[];
-    fileNames?: string[];
+export interface SentFileCard {
+    fileName: string;
+    fileId: string;
+    mimeType?: string;
 }
 export interface A2ATaskArtifactUpdateEvent {
     taskId: string;

package/dist/src/utils/cron-push-map.d.ts

@@ -0,0 +1,26 @@
+/** 映射来源，区分两种创建路径。 */
+export type CronPushMapSource = "conversation" | "cron-query";
+export interface CronPushMapEntry {
+    pushId: string;
+    /** 创建该 cron 时的 xy sessionId，便于同进程兜底。 */
+    sessionId?: string;
+    /** 冗余记录设备类型，fire 时可按设备类型做差异化处理。 */
+    deviceType?: string;
+    source?: CronPushMapSource;
+    createdAt: number;
+}
+export interface CronPushMapFile {
+    version: 1;
+    entries: Record<string, CronPushMapEntry>;
+}
+/** 写入/更新一条 jobId → pushId 映射。 */
+export declare function setJobPushId(jobId: string, entry: Omit<CronPushMapEntry, "createdAt">): Promise<void>;
+/** fire 时主查询：按 jobId 取 pushId。 */
+export declare function getPushIdByJobId(jobId: string): Promise<{
+    pushId: string;
+    entry: CronPushMapEntry;
+} | null>;
+/** 删除一条映射（cron job 被移除时清理）。 */
+export declare function removeJob(jobId: string): Promise<void>;
+/** 对账：删除 openclaw 里已不存在的 job，避免映射无限增长。 */
+export declare function pruneStale(existingJobIds: Set<string>): Promise<void>;

package/dist/src/utils/cron-push-map.js

@@ -0,0 +1,131 @@
+// Cron job ↔ pushId 持久化映射
+//
+// 背景：cron 定时任务触发时，工具调用走 push 通道（sendCommandViaPush），
+// 需要正确的 pushId 才能推到"创建该任务的那台设备"。pushIdList.json 是
+// 扁平去重数组，无法区分设备；本文件按真实 jobId 保存创建时的 pushId，
+// fire 时通过 jobId 反查即可定位到正确设备。
+//
+// jobId 的两端来源（均为真实 jobId，无需规范化反解）：
+//   - 写入：after_tool_call 拦 cron/add → event.result.id；
+//           cron-query-handler inline → result.id
+//   - 读取：provider.ts extractCronUuid(context.messages) → "[cron:<jobId> ...]"
+import { promises as fs } from "fs";
+import * as path from "path";
+import { logger } from "./logger.js";
+const CRON_PUSH_MAP_FILE = "/home/sandbox/.openclaw/cron-push-map.json";
+async function ensureDirectoryExists(filePath) {
+    const dir = path.dirname(filePath);
+    try {
+        await fs.mkdir(dir, { recursive: true });
+    }
+    catch (error) {
+        logger.error(`[CronPushMap] Failed to create directory ${dir}:`, error);
+    }
+}
+async function readMap() {
+    try {
+        await ensureDirectoryExists(CRON_PUSH_MAP_FILE);
+        const content = await fs.readFile(CRON_PUSH_MAP_FILE, "utf-8");
+        const parsed = JSON.parse(content);
+        if (parsed &&
+            typeof parsed === "object" &&
+            parsed.version === 1 &&
+            parsed.entries &&
+            typeof parsed.entries === "object") {
+            return parsed;
+        }
+        logger.warn(`[CronPushMap] Unexpected file shape, returning empty map`);
+        return { version: 1, entries: {} };
+    }
+    catch (error) {
+        if (error.code === "ENOENT") {
+            return { version: 1, entries: {} };
+        }
+        logger.error(`[CronPushMap] Failed to read map:`, error);
+        return { version: 1, entries: {} };
+    }
+}
+async function writeMap(map) {
+    try {
+        await ensureDirectoryExists(CRON_PUSH_MAP_FILE);
+        await fs.writeFile(CRON_PUSH_MAP_FILE, JSON.stringify(map, null, 2), "utf-8");
+    }
+    catch (error) {
+        logger.error(`[CronPushMap] Failed to write map:`, error);
+        throw error;
+    }
+}
+/** 写入/更新一条 jobId → pushId 映射。 */
+export async function setJobPushId(jobId, entry) {
+    if (!jobId || typeof jobId !== "string") {
+        logger.warn(`[CronPushMap] Invalid jobId: ${jobId}`);
+        return;
+    }
+    if (!entry.pushId || typeof entry.pushId !== "string") {
+        logger.warn(`[CronPushMap] Skipping setJobPushId: missing pushId for jobId=${jobId}`);
+        return;
+    }
+    try {
+        const map = await readMap();
+        map.entries[jobId] = { ...entry, createdAt: Date.now() };
+        await writeMap(map);
+        logger.log(`[CronPushMap] Saved jobId=${jobId}, source=${entry.source ?? "?"}, pushId=${entry.pushId.substring(0, 20)}...`);
+    }
+    catch (error) {
+        logger.error(`[CronPushMap] Failed to setJobPushId:`, error);
+        // 不抛出，避免影响主流程
+    }
+}
+/** fire 时主查询：按 jobId 取 pushId。 */
+export async function getPushIdByJobId(jobId) {
+    if (!jobId)
+        return null;
+    try {
+        const map = await readMap();
+        const entry = map.entries[jobId];
+        if (entry && entry.pushId) {
+            return { pushId: entry.pushId, entry };
+        }
+        return null;
+    }
+    catch (error) {
+        logger.error(`[CronPushMap] Failed to getPushIdByJobId:`, error);
+        return null;
+    }
+}
+/** 删除一条映射（cron job 被移除时清理）。 */
+export async function removeJob(jobId) {
+    if (!jobId)
+        return;
+    try {
+        const map = await readMap();
+        if (map.entries[jobId]) {
+            delete map.entries[jobId];
+            await writeMap(map);
+            logger.log(`[CronPushMap] Removed jobId=${jobId}`);
+        }
+    }
+    catch (error) {
+        logger.error(`[CronPushMap] Failed to removeJob:`, error);
+    }
+}
+/** 对账：删除 openclaw 里已不存在的 job，避免映射无限增长。 */
+export async function pruneStale(existingJobIds) {
+    try {
+        const map = await readMap();
+        let removed = 0;
+        for (const key of Object.keys(map.entries)) {
+            if (!existingJobIds.has(key)) {
+                delete map.entries[key];
+                removed++;
+            }
+        }
+        if (removed > 0) {
+            await writeMap(map);
+            logger.log(`[CronPushMap] Pruned ${removed} stale entries`);
+        }
+    }
+    catch (error) {
+        logger.error(`[CronPushMap] Failed to pruneStale:`, error);
+    }
+}

package/dist/src/websocket.js

@@ -7,6 +7,7 @@ import { HeartbeatManager } from "./heartbeat.js";
 import { MessageQueue } from "./message-queue.js";
 import { v4 as uuidv4 } from "uuid";
 const RUN_CROSS_TASK_LOG_TAG = "[RunCrossTask]";
+const SEND_CROSS_RESULT_LOG_TAG = "[SendCrossResult]";
 const RUN_CROSS_TASK_QUERY_PREFIX = `# 跨设备协作接收模式<br/><br/>你当前正在接收来自其他设备的协作请求。请注意以下角色转换规则：<br/><br/>## 角色转换规则<br/><br/>- 指令中的"我" = 发送请求的远程用户<br/>- 你是执行协作任务的本地智能体<br/>- 任务完成后结果会自动回传给请求来源设备<br/><br/>## 核心执行规则<br/><br/>### ✅ 正确行为<br/>1. **识别本机任务**：当指令提到你所在的设备类型（PC/手机/平板），理解为"我自己"<br/>2. **本地执行**：直接使用本地工具完成任务，不要转发<br/>3. **结果回传**：执行完成后，结果会通过软总线自动回传给请求来源设备<br/><br/>### <span class="emoji emoji2716"></span> 禁止行为<br/>1. 禁止再次调用 \`send_cross_device_task\`（你已经是目标设备）<br/>2. 禁止设备澄清（指令已明确指定目标设备）<br/>3. 禁止无限循环（只能执行或回复，不能转发）<br/><br/>## 📁 文件操作规范（核心）<br/><br/>### 强制使用 search_file 的场景<br/>**以下场景必须先使用 \`search_file\` 工具确认文件路径：**<br/><br/>1. **指令包含设备关键词**：PC、电脑、手机、平板、Pad、笔记本等<br/>2. **涉及文件操作**：读取、编辑、删除、移动、复制、查找文件<br/><br/>### 执行流程<br/>\`\`\`<br/>收到文件操作指令<br/>    ↓<br/>检测设备关键词（PC/电脑/手机/平板/Pad等）<br/>    ↓<br/>使用 search_file 搜索文件 ← 必须步骤<br/>    ↓<br/>确认文件实际路径<br/>    ↓<br/>执行文件操作<br/>    ↓<br/>返回结果<br/>\`\`\`<br/><br/>### 禁止行为<br/>- <span class="emoji emoji2716"></span> 禁止猜测文件路径<br/>- <span class="emoji emoji2716"></span> 禁止假设文件位置<br/>- <span class="emoji emoji2716"></span> 禁止跳过 search_file 步骤<br/><br/>## 示例<br/><br/>### 示例1：文件操作<br/>**指令**："帮我到PC上下载昨天晚上写的PPT"<br/><br/>**执行流程**：<br/>1. ✅ 检测到"PC" → 使用 \`search_file\` 搜索 "*.ppt" 或 "*.pptx"<br/>2. 确认文件路径（如：D:\\Documents\\报告.pptx）<br/>3. 执行下载操作<br/><br/>### 示例2：文件编辑<br/>**指令**："帮我修改电脑上的配置文件config.json"<br/><br/>**执行流程**：<br/>1. ✅ 检测到"电脑" → 使用 \`search_file\` 搜索 "config.json"<br/>2. 确认文件路径（如：C:\\Project\\config.json）<br/>3. 读取并修改文件<br/><br/>### 示例3：文件查找<br/>**指令**："在平板上找一下我的PDF文档"<br/><br/>**执行流程**：<br/>1. ✅ 检测到"平板" → 使用 \`search_file\` 搜索 "*.pdf"<br/>2. 列出搜索结果供用户选择<br/><br/>## 判断流程<br/><br/>\`\`\`<br/>收到协作指令<br/>    ↓<br/>检查目标设备<br/>    ↓<br/>目标设备 == 本机？<br/>    ↓<br/>是 → 本地执行（禁止send_cross_device_task）<br/>    ↓<br/>    涉及文件？ → 先用search_file确认路径<br/>    ↓<br/>否 → 检查是否需要转发<br/>    ↓<br/>需要转发 → 调用send_cross_device_task<br/>不需要 → 回复"无法处理"<br/>\`\`\``;
 /**
  * Manages single WebSocket connection to XY server.
@@ -397,26 +398,23 @@ export class XYWebSocketManager extends EventEmitter {
                 if (!entry || typeof entry !== "object") {
                     return null;
                 }
-                const fileLocalUrls = Array.isArray(entry.fileLocalUrls)
-                    ? entry.fileLocalUrls.filter((url) => typeof url === "string" && url.length > 0)
-                    : [];
-                const fileRemoteUrls = Array.isArray(entry.fileRemoteUrls)
-                    ? entry.fileRemoteUrls.filter((url) => typeof url === "string" && url.length > 0)
-                    : [];
-                const fileNames = Array.isArray(entry.fileNames)
-                    ? entry.fileNames.filter((name) => typeof name === "string" && name.length > 0)
-                    : [];
-                if (fileLocalUrls.length === 0 && fileRemoteUrls.length === 0) {
+                const candidate = entry;
+                const fileName = typeof candidate.fileName === "string" ? candidate.fileName.trim() : "";
+                const fileId = typeof candidate.fileId === "string" ? candidate.fileId.trim() : "";
+                const mimeType = typeof candidate.mimeType === "string" ? candidate.mimeType.trim() : "";
+                if (!fileName || !fileId) {
                     return null;
                 }
                 return {
-                    ...(fileLocalUrls.length > 0 ? { fileLocalUrls } : {}),
-                    ...(fileRemoteUrls.length > 0 ? { fileRemoteUrls } : {}),
-                    ...(fileNames.length > 0 && fileNames.length === fileRemoteUrls.length ? { fileNames } : {}),
+                    fileName,
+                    fileId,
+                    ...(mimeType ? { mimeType } : {}),
                 };
             }).filter((entry) => entry !== null)
             : [];
         const status = code === "0" ? "success" : "failed";
+        const fileCardCount = sentFiles.length;
+        this.log(`${SEND_CROSS_RESULT_LOG_TAG} normalized CrossTaskExecuteResult, sessionId=${sessionId}, status=${status}, code=${code}, fileCardCount=${fileCardCount}, messageLength=${message.length}`);
         const event = {
             sessionId,
             code,

package/package.json

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