@ynhcj/xiaoyi-channel 0.0.199-beta → 0.0.200-beta

package/dist/index.js

@@ -3,7 +3,10 @@ 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 { getAllPushIds } from "./src/utils/pushid-manager.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 +28,145 @@ 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) {
+    // 两条创建路径都要捕获：
+    //   1) cron agent 工具：toolName==="cron", params.action==="add"
+    //   2) exec 跑 CLI：toolName==="exec", params.command 含 "cron add"
+    //      （agent 实际用的是这条：openclaw cron add --name ... --cron ... --message ...）
+    const isCronAddTool = event.toolName === "cron" &&
+        (event.params?.action === "add" || event.params?.action === "create");
+    const isExecCronAdd = event.toolName === "exec" && isExecCronAddCommand(event.params?.command);
+    if (!isCronAddTool && !isExecCronAdd)
+        return;
+    console.log(`[CRONMAP] after_tool_call path=${event.toolName}, resultType=${typeof event.result}`);
+    const jobId = readJobIdFromResult(event.result);
+    if (!jobId) {
+        console.log(`[CRONMAP] skip: could not extract jobId. preview=${preview(event.result)}`);
+        return;
+    }
+    console.log(`[CRONMAP] extracted jobId=${jobId}`);
+    const sessionCtx = ctx.sessionKey ? getSessionContext(ctx.sessionKey) : null;
+    const sessionId = sessionCtx?.sessionId;
+    if (!sessionId) {
+        console.log(`[CRONMAP] skip: no sessionId (sessionKey=${ctx.sessionKey}, ctxFound=${!!sessionCtx})`);
+        return;
+    }
+    const pushId = await resolvePushId(sessionId);
+    if (!pushId) {
+        console.log(`[CRONMAP] skip: no pushId available for sessionId=${sessionId} (no session match, no global, no file)`);
+        return;
+    }
+    console.log(`[CRONMAP] writing map: jobId=${jobId}, sessionId=${sessionId}, pushId=${pushId.substring(0, 16)}...`);
+    await setJobPushId(jobId, {
+        pushId,
+        sessionId,
+        deviceType: sessionCtx?.deviceType,
+        source: event.toolName === "exec" ? "exec-cli" : "conversation",
+    });
+    console.log(`[CRONMAP] map written OK`);
+}
+/** 回退链取 pushId：当前会话 → 全局兜底 → 本地文件首个（保底）。 */
+async function resolvePushId(sessionId) {
+    // 1. 同会话
+    const session = configManager.getPushId(sessionId);
+    if (session)
+        return session;
+    // 2. 全局（任何会话注册过的）
+    const global = configManager.getPushId();
+    if (global)
+        return global;
+    // 3. 文件兜底
+    try {
+        const all = await getAllPushIds();
+        if (all.length > 0)
+            return all[0];
+    }
+    catch {
+        // ignore
+    }
+    return null;
+}
+/** 判断 exec 命令是否为 cron add（匹配 "openclaw cron add" 或裸 "cron add"，排除 list/remove 等）。 */
+function isExecCronAddCommand(command) {
+    if (typeof command !== "string")
+        return false;
+    return /\bcron\s+add\b/.test(command);
+}
+/** 取结果的短预览，用于诊断。 */
+function preview(value) {
+    if (value == null)
+        return String(value);
+    const s = typeof value === "string" ? value : JSON.stringify(value);
+    return s.length > 200 ? s.slice(0, 200) + "…" : s;
+}
+/** 防御性地从 cron add 结果中取 job id。
+ *  覆盖：裸 job 对象、JSON 字符串、exec 输出文本、
+ *  {content:[{text}]} / {stdout} / data/result/job 嵌套。 */
+function readJobIdFromResult(result) {
+    if (!result)
+        return undefined;
+    // {content: [{type:"text", text: "..."}]} — exec 工具的输出信封
+    if (result && typeof result === "object") {
+        const contentArr = result.content;
+        if (Array.isArray(contentArr)) {
+            for (const item of contentArr) {
+                if (item && typeof item === "object") {
+                    const text = item.text;
+                    if (typeof text === "string" && text.trim()) {
+                        const fromContent = readJobIdFromResult(text);
+                        if (fromContent)
+                            return fromContent;
+                    }
+                }
+            }
+        }
+    }
+    // {stdout} — 备选 exec 输出信封
+    if (result && typeof result === "object") {
+        const stdout = result.stdout;
+        if (typeof stdout === "string" && stdout.trim()) {
+            const fromStdout = readJobIdFromResult(stdout);
+            if (fromStdout)
+                return fromStdout;
+        }
+    }
+    let obj = result;
+    if (typeof result === "string") {
+        try {
+            obj = JSON.parse(result);
+        }
+        catch {
+            // 纯文本：可能含 stderr 前缀行 + JSON。用正则抓 "id":"..."。
+            const m = result.match(/"id"\s*:\s*"([^"]+)"/);
+            if (m)
+                return m[1];
+            return undefined;
+        }
+    }
+    if (obj && typeof obj === "object") {
+        const id = obj.id;
+        if (typeof id === "string" && id.trim())
+            return id.trim();
+        for (const k of ["data", "result", "job"]) {
+            const inner = obj[k];
+            if (inner && typeof inner === "object") {
+                const innerId = inner.id;
+                if (typeof innerId === "string" && innerId.trim())
+                    return innerId.trim();
+            }
+        }
+    }
+    return undefined;
+}
 function registerFullHooks(api) {
     // SKILL RETRIEVER HOOK: before_prompt_build hook
     const pluginConfig = api.pluginConfig || {};

package/dist/src/bot.js

@@ -1,7 +1,7 @@
 import { updateSessionStoreEntry, updateSessionStore, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { getXYRuntime } from "./runtime.js";
 import { createXYReplyDispatcher } from "./reply-dispatcher.js";
-import { parseA2AMessage, extractTextFromParts, extractFileParts, extractPushId, extractDeviceType, extractModelName, extractTriggerData, extractRunCrossTaskContext } from "./parser.js";
+import { parseA2AMessage, extractTextFromParts, extractFileParts, extractPushId, extractDeviceType, extractAppVer, extractSdkApiVersion, extractModelName, extractTriggerData, extractRunCrossTaskContext } from "./parser.js";
 import { downloadFilesFromParts } from "./file-download.js";
 import { resolveXYConfig } from "./config.js";
 import { sendStatusUpdate, sendClearContextResponse, sendTasksCancelResponse, sendA2AResponse } from "./formatter.js";
@@ -139,6 +139,15 @@ export async function handleXYMessage(params) {
         if (deviceType) {
             log.log(`[BOT] Extracted deviceType: ${deviceType}`);
         }
+        // Extract app_ver and sdk_api_version if present
+        const appVer = extractAppVer(parsed.parts);
+        if (appVer) {
+            log.log(`[BOT] Extracted app_ver: ${appVer}`);
+        }
+        const sdkApiVersion = extractSdkApiVersion(parsed.parts);
+        if (sdkApiVersion) {
+            log.log(`[BOT] Extracted sdk_api_version: ${sdkApiVersion}`);
+        }
         // Extract modelName if present (used by provider.ts to override model.id)
         const modelName = extractModelName(parsed.parts);
         if (modelName) {
@@ -170,6 +179,8 @@ export async function handleXYMessage(params) {
                 messageId: parsed.messageId,
                 agentId: route.accountId,
                 deviceType,
+                appVer: appVer ?? undefined,
+                sdkApiVersion: sdkApiVersion ?? undefined,
                 modelName,
                 runCrossTaskContext: runCrossTaskContext ?? undefined,
             });

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";
@@ -39,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 }, {
@@ -106,6 +113,35 @@ export async function handleCronQueryEvent(context, cfg) {
         log.warn(`[CRON-QUERY] Missing cfg/sessionId/taskId/messageId, skipping sendCommand`);
     }
 }
+/**
+ * 从 cron.add 结果中提取 jobId，配合 sessionId 对应的 pushId 写入映射。
+ */
+async function persistCronPushMap(sessionId, result) {
+    logger.log(`[CRONMAP] cron-query persist: sessionId=${sessionId ?? "(none)"}, resultType=${typeof result}`);
+    if (!sessionId) {
+        logger.log(`[CRONMAP] cron-query skip: no sessionId in context`);
+        return;
+    }
+    let jobId;
+    if (result && typeof result === "object") {
+        const id = result.id;
+        if (typeof id === "string" && id.trim())
+            jobId = id.trim();
+    }
+    if (!jobId) {
+        const preview = typeof result === "string" ? result.slice(0, 200) : JSON.stringify(result)?.slice(0, 200);
+        logger.log(`[CRONMAP] cron-query skip: no jobId in result. preview=${preview ?? "(empty)"}`);
+        return;
+    }
+    const pushId = configManager.getPushId(sessionId);
+    if (!pushId) {
+        logger.log(`[CRONMAP] cron-query skip: configManager has no pushId for sessionId=${sessionId}`);
+        return;
+    }
+    logger.log(`[CRONMAP] cron-query writing map: jobId=${jobId}, pushId=${pushId.substring(0, 16)}...`);
+    await setJobPushId(jobId, { pushId, sessionId, source: "cron-query" });
+    logger.log(`[CRONMAP] cron-query map written OK`);
+}
 /**
  * Read local cron folder directly (bypassing openclaw RPC) and return
  * run records from the last 7 days, grouped by date and sorted by time.

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.d.ts

@@ -44,6 +44,18 @@ export declare function isTasksCancelMessage(method: string): boolean;
  * Looks for push_id in data parts under variables.systemVariables.push_id
  */
 export declare function extractPushId(parts: A2AMessagePart[]): string | null;
+/**
+ * Extract app_ver from message parts.
+ * Looks for app_ver in data parts under variables.systemVariables.app_ver
+ * (same level as push_id).
+ */
+export declare function extractAppVer(parts: A2AMessagePart[]): string | null;
+/**
+ * Extract sdk_api_version from message parts.
+ * Looks for sdk_api_version in data parts under variables.systemVariables.sdk_api_version
+ * (same level as push_id).
+ */
+export declare function extractSdkApiVersion(parts: A2AMessagePart[]): string | null;
 /**
  * Extract deviceType from message parts.
  * Looks for deviceType in data parts under variables.systemVariables.deviceType

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);
@@ -127,6 +121,38 @@ export function extractPushId(parts) {
     }
     return null;
 }
+/**
+ * Extract app_ver from message parts.
+ * Looks for app_ver in data parts under variables.systemVariables.app_ver
+ * (same level as push_id).
+ */
+export function extractAppVer(parts) {
+    for (const part of parts) {
+        if (part.kind === "data" && part.data) {
+            const appVer = part.data.variables?.systemVariables?.app_ver;
+            if (appVer && typeof appVer === "string") {
+                return appVer;
+            }
+        }
+    }
+    return null;
+}
+/**
+ * Extract sdk_api_version from message parts.
+ * Looks for sdk_api_version in data parts under variables.systemVariables.sdk_api_version
+ * (same level as push_id).
+ */
+export function extractSdkApiVersion(parts) {
+    for (const part of parts) {
+        if (part.kind === "data" && part.data) {
+            const sdkApiVersion = part.data.variables?.systemVariables?.sdk_api_version;
+            if (sdkApiVersion && typeof sdkApiVersion === "string") {
+                return sdkApiVersion;
+            }
+        }
+    }
+    return null;
+}
 /**
  * Extract deviceType from message parts.
  * Looks for deviceType in data parts under variables.systemVariables.deviceType

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 ──────────────────────────────────────────────
@@ -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()}`;
@@ -556,6 +564,15 @@ export const xiaoyiProvider = {
             // then ALS fallback.
             const deviceType = extractedDeviceType
                 ?? getCurrentSessionContext()?.deviceType;
+            // app_ver and sdk_api_version from session context (ALS)
+            const appVer = sessionCtx?.appVer;
+            const sdkApiVersion = sessionCtx?.sdkApiVersion;
+            if (appVer) {
+                logger.log(`[xiaoyiprovider] app_ver: ${appVer}`);
+            }
+            if (sdkApiVersion) {
+                logger.log(`[xiaoyiprovider] sdk_api_version: ${sdkApiVersion}`);
+            }
             // 在发送给模型前，优化 systemPrompt 结构
             if (context.systemPrompt) {
                 let sp = context.systemPrompt;
@@ -591,9 +608,19 @@ export const xiaoyiProvider = {
             logger.log(`[selfEvolution] selfEvolution flag: ${selfEvolutionEnabled}`);
             context.systemPrompt = applySelfEvolutionPrompt(context.systemPrompt, selfEvolutionEnabled);
             // Append device context to systemPrompt
-            if (deviceType) {
+            if (deviceType || appVer || sdkApiVersion) {
                 const displayDevice = (deviceType === "2in1") ? "鸿蒙PC" : deviceType;
-                const deviceSection = `\n\n## Current User Device Context\nThe current user is using the following device: ${displayDevice}\nYou need to be aware of the user's current device and provide guidance accordingly. If the response involves device-related tools or actions, you must tailor the reply based on the user's current device, using device-specific references such as "saved to the Notes/Calendar on your {deviceType}.\n"`;
+                let deviceSection = `\n\n## Current User Device Context\n`;
+                if (deviceType) {
+                    deviceSection += `The current user is using the following device: ${displayDevice}\n`;
+                }
+                if (appVer) {
+                    deviceSection += `当前用户小艺APP版本是${appVer}\n`;
+                }
+                if (sdkApiVersion) {
+                    deviceSection += `当前用户系统Rom版本是${sdkApiVersion}\n`;
+                }
+                deviceSection += `You need to be aware of the user's current device and provide guidance accordingly. If the response involves device-related tools or actions, you must tailor the reply based on the user's current device, using device-specific references such as "saved to the Notes/Calendar on your {deviceType}.\n"`;
                 context.systemPrompt = (context.systemPrompt ?? "") + deviceSection;
             }
             // ── Trim user message metadata ──────────────────────

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发送完成状态

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

@@ -53,11 +53,7 @@ export function createAgentAsSkillTool(ctx) {
                             },
                             fileUrl: {
                                 type: "string",
-                                description: "文件可访问下载链接（完整HTTP/HTTPS地址）",
-                            },
-                            fileUrlLocal: {
-                                type: "string",
-                                description: "文件本地路径，如果提供此字段，工具会自动上传文件并将公网URL填入fileUrl",
+                                description: "文件可访问下载链接（完整HTTP/HTTPS地址）或文件本地路径。若为本地路径，工具会自动上传文件并替换为公网URL",
                             },
                         },
                     },
@@ -103,23 +99,22 @@ export function createAgentAsSkillTool(ctx) {
             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) {
+                    if (fileInfo.fileUrl && !/^https?:\/\//i.test(fileInfo.fileUrl)) {
+                        const localPath = fileInfo.fileUrl;
                         try {
-                            const publicUrl = await uploadService.uploadFileAndGetUrl(fileInfo.fileUrlLocal, "TEMPORARY_MATERIAL_DOC");
+                            const publicUrl = await uploadService.uploadFileAndGetUrl(localPath, "TEMPORARY_MATERIAL_DOC");
                             if (publicUrl) {
                                 fileInfo.fileUrl = publicUrl;
                             }
                             else {
-                                logger.warn("[AGENT-AS-SKILL] 上传文件未返回公网URL", { fileUrlLocal: fileInfo.fileUrlLocal });
+                                logger.warn("[AGENT-AS-SKILL] 上传文件未返回公网URL", { localPath });
                             }
                         }
                         catch (uploadError) {
-                            logger.error("[AGENT-AS-SKILL] 上传本地文件失败", { fileUrlLocal: fileInfo.fileUrlLocal, error: uploadError });
-                            throw new Error(`上传本地文件失败 (${fileInfo.fileUrlLocal}): ${uploadError instanceof Error ? uploadError.message : String(uploadError)}`);
+                            logger.error("[AGENT-AS-SKILL] 上传本地文件失败", { localPath, error: uploadError });
+                            throw new Error(`上传本地文件失败 (${localPath}): ${uploadError instanceof Error ? uploadError.message : String(uploadError)}`);
                         }
                     }
-                    // Remove fileUrlLocal from the final payload
-                    delete fileInfo.fileUrlLocal;
                 }
             }
             // Get WebSocket manager

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

@@ -16,6 +16,12 @@ import { createGetAlarmToolSchemaTool } from "./get-alarm-tool-schema.js";
 import { createGetCollectionToolSchemaTool } from "./get-collection-tool-schema.js";
 // 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 { createDisplayA2UICardByPathTool } from "./display-a2ui-card-bypath-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.
@@ -31,9 +37,10 @@ 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),
+        createDisplayA2UICardByPathTool(ctx),
         createCallDeviceTool(ctx),
         createGetNoteToolSchemaTool(ctx),
         createGetCalendarToolSchemaTool(ctx),
@@ -51,7 +58,7 @@ export function createAllTools(ctx) {
         timestampToUtc8Tool,
         createSaveSelfEvolutionSkillTool(ctx),
         createLoginTokenTool(ctx),
-        // createAgentAsSkillTool(ctx),
-        // createCheckPluginPrivilegeTool(ctx),
+        createAgentAsSkillTool(ctx),
+        createCheckPluginPrivilegeTool(ctx),
     ];
 }

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

@@ -33,6 +33,7 @@ const DEVICE_TOOL_POLICY = {
             "convert_time_to_utc8_time",
             "save_self_evolution_skill",
             "displayA2UICard",
+            "display-a2ui-card-bypath",
         ],
     },
 };

package/dist/src/tools/display-a2ui-card-bypath-tool.d.ts

@@ -0,0 +1,2 @@
+import type { SessionContext } from "./session-manager.js";
+export declare function createDisplayA2UICardByPathTool(ctx: SessionContext): any;

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

@@ -0,0 +1,68 @@
+import fs from "fs/promises";
+import { sendA2AResponse } from "../formatter.js";
+import { getCurrentMessageId, getCurrentTaskId } from "../task-manager.js";
+import { logger } from "../utils/logger.js";
+class ToolInputError extends Error {
+    status = 400;
+    constructor(message) {
+        super(message);
+        this.name = "ToolInputError";
+    }
+}
+export function createDisplayA2UICardByPathTool(ctx) {
+    const { config, sessionId, taskId, messageId } = ctx;
+    return {
+        name: "display-a2ui-card-bypath",
+        label: "Display A2UI Card By Path",
+        description: "当三方 MCP 返回的数据已经保存到本地文件时，传入 cardDSLPath，读取文件内容并作为 A2UI 卡片 DSL 内容下发给端侧。",
+        parameters: {
+            type: "object",
+            properties: {
+                cardDSLPath: {
+                    type: "string",
+                    description: "保存三方 MCP 返回数据的本地文件路径。工具会读取该文件内容并下发给端侧。",
+                },
+            },
+            required: ["cardDSLPath"],
+        },
+        async execute(_toolCallId, params) {
+            const cardDSLPath = typeof params?.cardDSLPath === "string" ? params.cardDSLPath.trim() : "";
+            if (!cardDSLPath) {
+                throw new ToolInputError("缺少必填参数: cardDSLPath");
+            }
+            const currentTaskId = getCurrentTaskId(sessionId) ?? taskId;
+            const currentMessageId = getCurrentMessageId(sessionId) ?? messageId;
+            logger.log(`[DISPLAY-A2UI-CARD-BYPATH] reading card DSL file, path=${cardDSLPath}`);
+            let cardDSLContent;
+            try {
+                cardDSLContent = await fs.readFile(cardDSLPath, "utf8");
+            }
+            catch (error) {
+                throw new Error(`读取 cardDSLPath 文件失败: ${error instanceof Error ? error.message : String(error)}`);
+            }
+            await sendA2AResponse({
+                config,
+                sessionId,
+                taskId: currentTaskId,
+                messageId: currentMessageId,
+                text: cardDSLContent,
+                append: true,
+                final: false,
+            });
+            logger.log(`[DISPLAY-A2UI-CARD-BYPATH] card DSL sent, path=${cardDSLPath}, length=${cardDSLContent.length}`);
+            return {
+                content: [
+                    {
+                        type: "text",
+                        text: JSON.stringify({
+                            success: true,
+                            cardDSLPath,
+                            length: cardDSLContent.length,
+                            message: "A2UI card DSL content sent successfully.",
+                        }),
+                    },
+                ],
+            };
+        },
+    };
+}

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;
@@ -8,6 +8,10 @@ export interface SessionContext {
     messageId: string;
     agentId: string;
     deviceType?: string;
+    /** App version extracted from A2A systemVariables (variables.systemVariables.app_ver). */
+    appVer?: string;
+    /** SDK API version extracted from A2A systemVariables (variables.systemVariables.sdk_api_version). */
+    sdkApiVersion?: string;
     /** Model name extracted from A2A user variables (variables.clientVariables.modelName).
      *  When set, provider.ts replaces model.id in the OpenAI request body. */
     modelName?: string;
@@ -27,6 +31,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 +89,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
@@ -245,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/config-manager.d.ts

@@ -3,8 +3,9 @@
  * Specifically handles pushId which can be updated per-session.
  */
 declare class ConfigManager {
-    private sessionPushIds;
-    private globalPushId;
+    private get sessionPushIds();
+    private get globalPushId();
+    private set globalPushId(value);
     /**
      * Update push ID for a specific session.
      */

package/dist/src/utils/config-manager.js

@@ -1,12 +1,32 @@
 // Dynamic configuration manager for runtime updates
+//
+// NOTE: xy_channel is loaded from multiple module resolution paths
+// (plugin entry vs tool registration), which duplicates class instances.
+// sessionPushIds and globalPushId must live on globalThis so all copies
+// share the same Map — same reason activeSessions is on globalThis in
+// session-manager.ts.
 import { logger } from "./logger.js";
+const _g = globalThis;
+if (!_g.__xyConfigSessionPushIds) {
+    _g.__xyConfigSessionPushIds = new Map();
+}
+if (!_g.__xyConfigGlobalPushId) {
+    _g.__xyConfigGlobalPushId = null;
+}
 /**
  * Manages dynamic configuration updates that can change at runtime.
  * Specifically handles pushId which can be updated per-session.
  */
 class ConfigManager {
-    sessionPushIds = new Map();
-    globalPushId = null;
+    get sessionPushIds() {
+        return _g.__xyConfigSessionPushIds;
+    }
+    get globalPushId() {
+        return _g.__xyConfigGlobalPushId;
+    }
+    set globalPushId(value) {
+        _g.__xyConfigGlobalPushId = value;
+    }
     /**
      * Update push ID for a specific session.
      */

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.199-beta",
+  "version": "0.0.200-beta",
   "description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
   "type": "module",
   "main": "./dist/index.js",