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

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/tools/xiaoyi-gui-tool.js

@@ -71,7 +71,7 @@ export function createXiaoyiGuiTool(ctx) {
                     wsManager.off("gui-agent-response", handler);
                     logger.error("超时: XiaoYi GUI Agent 操作超时（5分钟）", { toolCallId });
                     reject(new Error("XiaoYi GUI Agent 操作超时（5分钟）"));
-                }, 180000); // 5 minutes timeout
+                }, 300000); // 5 minutes timeout
                 // Listen for GUI agent response events
                 const handler = (event) => {
                     // Check if this is the InvokeJarvisGUIAgentResponse we're waiting for

package/dist/src/types.d.ts

@@ -13,8 +13,10 @@ export interface XYChannelConfig {
 export interface A2AJsonRpcRequest {
     jsonrpc: "2.0";
     method: string;
-    params: A2ARequestParams;
+    params?: A2ARequestParams;
     id: string;
+    /** Top-level sessionId for clearContext/tasks/cancel (no params field) */
+    sessionId?: string;
 }
 export interface A2AJsonRpcResponse {
     jsonrpc: "2.0";
@@ -66,7 +68,7 @@ export interface CrossDeviceTaskResultEvent {
     sessionId: string;
     code: string;
     message: string;
-    sentFiles: SentFileParams[];
+    sentFiles: SentFileCard[];
     status: "success" | "failed";
     rawEvent: any;
 }
@@ -76,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/utils/cron-push-map.d.ts

@@ -0,0 +1,26 @@
+/** 映射来源，区分两种创建路径。 */
+export type CronPushMapSource = "conversation" | "cron-query" | "exec-cli";
+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.166-beta",
+  "version": "0.0.166-next",
   "description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
   "type": "module",
   "main": "./dist/index.js",