@ynhcj/xiaoyi-channel 0.0.122-beta → 0.0.124-beta

package/dist/src/channel.js

@@ -1,24 +1,9 @@
 import { resolveXYConfig, listXYAccountIds, getDefaultXYAccountId } from "./config.js";
 import { xyConfigSchema } from "./config-schema.js";
 import { xyOutbound } from "./outbound.js";
-import { locationTool } from "./tools/location-tool.js";
-import { xiaoyiGuiTool } from "./tools/xiaoyi-gui-tool.js";
-import { sendFileToUserTool } from "./tools/send-file-to-user-tool.js";
-import { viewPushResultTool } from "./tools/view-push-result-tool.js";
-import { imageReadingTool } from "./tools/image-reading-tool.js";
-import { timestampToUtc8Tool } from "./tools/timestamp-to-utc8-tool.js";
-import { saveSelfEvolutionSkillTool } from "./tools/save-self-evolution-skill-tool.js";
-import { callDeviceTool } from "./tools/call-device-tool.js";
-import { getNoteToolSchemaTool } from "./tools/get-note-tool-schema.js";
-import { getCalendarToolSchemaTool } from "./tools/get-calendar-tool-schema.js";
-import { getContactToolSchemaTool } from "./tools/get-contact-tool-schema.js";
-import { getPhotoToolSchemaTool } from "./tools/get-photo-tool-schema.js";
-import { getDeviceFileToolSchemaTool } from "./tools/get-device-file-tool-schema.js";
-import { getAlarmToolSchemaTool } from "./tools/get-alarm-tool-schema.js";
-import { getCollectionToolSchemaTool } from "./tools/get-collection-tool-schema.js";
-import { loginTokenTool } from "./tools/login-token-tool.js";
 import { filterToolsByDevice } from "./tools/device-tool-map.js";
 import { getCurrentSessionContext } from "./tools/session-manager.js";
+import { createAllTools } from "./tools/create-all-tools.js";
 import { logger } from "./utils/logger.js";
 /**
  * Xiaoyi Channel Plugin for OpenClaw.
@@ -59,8 +44,8 @@ export const xyPlugin = {
     },
     outbound: xyOutbound,
     agentTools: () => {
-        const allTools = [locationTool, callDeviceTool, getNoteToolSchemaTool, getCalendarToolSchemaTool, getContactToolSchemaTool, getPhotoToolSchemaTool, xiaoyiGuiTool, getDeviceFileToolSchemaTool, getAlarmToolSchemaTool, getCollectionToolSchemaTool, sendFileToUserTool, viewPushResultTool, imageReadingTool, timestampToUtc8Tool, saveSelfEvolutionSkillTool, loginTokenTool];
         const ctx = getCurrentSessionContext();
+        const allTools = createAllTools(ctx);
         const filtered = filterToolsByDevice(allTools, ctx?.deviceType);
         logger.log(`[DEVICE-FILTER] deviceType=${ctx?.deviceType ?? "(none)"}, tools: ${allTools.length} → ${filtered.length} (${filtered.map(t => t.name).join(", ")})`);
         return filtered;

package/dist/src/client.js

@@ -12,8 +12,14 @@ export function setClientRuntime(rt) {
 /**
  * Global cache for WebSocket managers.
  * Key format: `${apiKey}-${agentId}`
+ * Uses globalThis to ensure a single cache across all module copies
+ * (same fix as session-manager.ts for openclaw multi-instance loading).
  */
-const wsManagerCache = new Map();
+const _g = globalThis;
+if (!_g.__xyWsManagerCache) {
+    _g.__xyWsManagerCache = new Map();
+}
+const wsManagerCache = _g.__xyWsManagerCache;
 /**
  * Get or create a WebSocket manager for the given configuration.
  * Reuses existing managers if config matches.

package/dist/src/monitor.js

@@ -8,6 +8,7 @@ import { handleTriggerEvent } from "./trigger-handler.js";
 import { handleSelfEvolutionEvent, handleSelfEvolutionStateGetEvent } from "./self-evolution-handler.js";
 import { handleLoginTokenEvent } from "./login-token-handler.js";
 import { cleanupStaleTempFiles } from "./reply-dispatcher.js";
+import { cleanupStaleSessions, getActiveSessionCount, cleanupAllSessions } from "./tools/session-manager.js";
 /**
  * Per-session serial queue that ensures messages from the same session are processed
  * in arrival order while allowing different sessions to run concurrently.
@@ -198,9 +199,11 @@ export async function monitorXYProvider(opts = {}) {
             wsManager.disconnect();
             // ✅ Remove manager from cache to prevent reusing dirty state
             removeXYWebSocketManager(account);
+            // Clean up all active sessions
+            cleanupAllSessions();
             loggedServers.clear();
             activeMessages.clear();
-            log(`[MONITOR-HANDLER] 🧹 Cleanup complete, cleared active messages`);
+            log(`[MONITOR-HANDLER] 🧹 Cleanup complete, cleared active messages and sessions`);
             // 🔍 Diagnose after cleanup
             console.log("🔍 [DIAGNOSTICS] Checking WebSocket managers after cleanup...");
             diagnoseAllManagers();
@@ -264,6 +267,12 @@ export async function monitorXYProvider(opts = {}) {
             if (cleaned > 0) {
                 console.log(`🧹 [HEALTH CHECK] Auto-cleaned ${cleaned} manager(s) with orphan connections`);
             }
+            // Cleanup stale sessions (older than 10min TTL)
+            const cleanedSessions = cleanupStaleSessions();
+            const remainingSessions = getActiveSessionCount();
+            if (cleanedSessions > 0 || remainingSessions > 0) {
+                console.log(`🧹 [HEALTH CHECK] Sessions: cleaned=${cleanedSessions}, active=${remainingSessions}`);
+            }
             // Cleanup stale temp files (older than 24 hours)
             void cleanupStaleTempFiles();
         }, 6 * 60 * 60 * 1000); // 6 hours

package/dist/src/provider.js

@@ -230,6 +230,8 @@ const HEADER_SESSION_ID = "x-session-id";
 const HEADER_INTERACTION_ID = "x-interaction-id";
 /** Internal key for passing fallback uid prefix from prepareExtraParams to wrapStreamFn. */
 const FALLBACK_PREFIX_KEY = "_xiaoyi_fallback_prefix";
+/** Internal key for passing deviceType from prepareExtraParams to wrapStreamFn. */
+const DEVICE_TYPE_KEY = "_xiaoyi_device_type";
 const SELF_EVOLUTION_PROMPT_BEGIN = "<self_evolution_prompt>";
 const SELF_EVOLUTION_PROMPT_END = "</self_evolution_prompt>";
 const SELF_EVOLUTION_ENABLED_PROMPT_SECTION = `
@@ -413,6 +415,7 @@ export const xiaoyiProvider = {
                 [HEADER_TRACE_ID]: taskId,
                 [HEADER_SESSION_ID]: sessionId,
                 [HEADER_INTERACTION_ID]: interactionId,
+                [DEVICE_TYPE_KEY]: sessionCtx.deviceType ?? "",
             };
         }
         // Fallback: store uid prefix for lazy timestamp generation in wrapStreamFn.
@@ -486,7 +489,9 @@ export const xiaoyiProvider = {
             if (context.systemPrompt) {
                 console.log(`[xiaoyiprovider] system prompt length: ${context.systemPrompt.length}`);
             }
-            const sessionCtx = getCurrentSessionContext();
+            // Reuse deviceType from extraParams instead of calling getCurrentSessionContext()
+            // again (which may be ambiguous in multi-session or async scenarios).
+            const deviceType = ctx.extraParams?.[DEVICE_TYPE_KEY] || undefined;
             // 在发送给模型前，优化 systemPrompt 结构
             if (context.systemPrompt) {
                 let sp = context.systemPrompt;
@@ -519,10 +524,9 @@ export const xiaoyiProvider = {
             const selfEvolutionEnabled = await selfEvolutionManager.isEnabled();
             logger.log(`[selfEvolution] selfEvolution flag: ${selfEvolutionEnabled}`);
             context.systemPrompt = applySelfEvolutionPrompt(context.systemPrompt, selfEvolutionEnabled);
-            // Append device context to systemPrompt
-            if (sessionCtx?.deviceType) {
-                const rawDevice = sessionCtx.deviceType;
-                const displayDevice = (rawDevice === "2in1") ? "鸿蒙PC" : rawDevice;
+            // Append device context to systemPrompt (using pre-captured deviceType from prepareExtraParams)
+            if (deviceType) {
+                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"`;
                 context.systemPrompt = (context.systemPrompt ?? "") + deviceSection;
             }

package/dist/src/task-manager.js

@@ -5,8 +5,13 @@ import { logger } from "./utils/logger.js";
  * Session到活跃TaskId的映射
  * Key: sessionId (注意：这里用sessionId，不是sessionKey)
  * Value: TaskIdBinding
+ * Uses globalThis to ensure a single Map across all module copies.
  */
-const activeTaskIds = new Map();
+const _g = globalThis;
+if (!_g.__xyActiveTaskIds) {
+    _g.__xyActiveTaskIds = new Map();
+}
+const activeTaskIds = _g.__xyActiveTaskIds;
 /**
  * 注册或更新session的活跃taskId
  * 返回是否是更新（用于判断是否是第二条消息）

package/dist/src/tools/calendar-tool.d.ts

@@ -1,6 +1,7 @@
+import type { SessionContext } from "./session-manager.js";
 /**
  * XY calendar event tool - creates a calendar event on user's device.
  * Requires title, dtStart (start time), and dtEnd (end time) parameters.
  * Time format must be: yyyy-mm-dd hh:mm:ss
  */
-export declare const calendarTool: any;
+export declare function createCalendarTool(ctx: SessionContext): any;

package/dist/src/tools/calendar-tool.js

@@ -1,134 +1,130 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
-import { getCurrentSessionContext } from "./session-manager.js";
 /**
  * XY calendar event tool - creates a calendar event on user's device.
  * Requires title, dtStart (start time), and dtEnd (end time) parameters.
  * Time format must be: yyyy-mm-dd hh:mm:ss
  */
-export const calendarTool = {
-    name: "create_calendar_event",
-    label: "Create Calendar Event",
-    description: `在用户设备上创建日程。需要提供日程标题、开始时间和结束时间。时间格式必须为：yyyy-mm-dd hh:mm:ss（例如：2024-01-15 14:30:00）。注意：该工具执行时间较长（最多60秒），请勿重复调用，超时或失败时最多重试一次。
+export function createCalendarTool(ctx) {
+    const { config, sessionId, taskId, messageId } = ctx;
+    return {
+        name: "create_calendar_event",
+        label: "Create Calendar Event",
+        description: `在用户设备上创建日程。需要提供日程标题、开始时间和结束时间。时间格式必须为：yyyy-mm-dd hh:mm:ss（例如：2024-01-15 14:30:00）。注意：该工具执行时间较长（最多60秒），请勿重复调用，超时或失败时最多重试一次。
   注意事项：使用该工具之前需获取当前真实时间
 
   回复约束：如果工具返回没有授权或者其他报错，只需要完整描述没有授权或者其他报错内容即可，不需要主动给用户提供解决方案，例如告诉用户如何授权，如何解决报错等都是不需要的，请严格遵守。
   `,
-    parameters: {
-        type: "object",
-        properties: {
-            title: {
-                type: "string",
-                description: "日程标题/名称",
-            },
-            dtStart: {
-                type: "string",
-                description: "日程开始时间，格式必须为：yyyy-mm-dd hh:mm:ss（例如：2024-01-15 14:30:00）",
-            },
-            dtEnd: {
-                type: "string",
-                description: "日程结束时间，格式必须为：yyyy-mm-dd hh:mm:ss（例如：2024-01-15 17:30:00）",
+        parameters: {
+            type: "object",
+            properties: {
+                title: {
+                    type: "string",
+                    description: "日程标题/名称",
+                },
+                dtStart: {
+                    type: "string",
+                    description: "日程开始时间，格式必须为：yyyy-mm-dd hh:mm:ss（例如：2024-01-15 14:30:00）",
+                },
+                dtEnd: {
+                    type: "string",
+                    description: "日程结束时间，格式必须为：yyyy-mm-dd hh:mm:ss（例如：2024-01-15 17:30:00）",
+                },
             },
+            required: ["title", "dtStart", "dtEnd"],
         },
-        required: ["title", "dtStart", "dtEnd"],
-    },
-    async execute(toolCallId, params) {
-        // Validate parameters
-        if (!params.title || !params.dtStart || !params.dtEnd) {
-            throw new Error("Missing required parameters: title, dtStart, and dtEnd are required");
-        }
-        // Convert time strings to millisecond timestamps
-        const dtStartMs = new Date(params.dtStart).getTime();
-        const dtEndMs = new Date(params.dtEnd).getTime();
-        if (isNaN(dtStartMs) || isNaN(dtEndMs)) {
-            throw new Error("Invalid time format. Required format: yyyy-mm-dd hh:mm:ss (e.g., 2024-01-15 14:30:00)");
-        }
-        // Get session context
-        const sessionContext = getCurrentSessionContext();
-        if (!sessionContext) {
-            throw new Error("No active XY session found. Calendar tool can only be used during an active conversation.");
-        }
-        const { config, sessionId, taskId, messageId } = sessionContext;
-        // Get WebSocket manager
-        const wsManager = getXYWebSocketManager(config);
-        // Build CreateCalendarEvent command
-        const command = {
-            header: {
-                namespace: "Common",
-                name: "ActionAndResult",
-            },
-            payload: {
-                cardParam: {},
-                executeParam: {
-                    executeMode: "background",
-                    intentName: "CreateCalendarEvent",
-                    bundleName: "com.huawei.hmos.calendardata",
-                    dimension: "",
-                    needUnlock: true,
-                    actionResponse: true,
-                    timeOut: 5,
-                    intentParam: {
-                        title: params.title,
-                        dtStart: dtStartMs,
-                        dtEnd: dtEndMs,
-                    },
-                    achieveType: "INTENT",
+        async execute(toolCallId, params) {
+            // Validate parameters
+            if (!params.title || !params.dtStart || !params.dtEnd) {
+                throw new Error("Missing required parameters: title, dtStart, and dtEnd are required");
+            }
+            // Convert time strings to millisecond timestamps
+            const dtStartMs = new Date(params.dtStart).getTime();
+            const dtEndMs = new Date(params.dtEnd).getTime();
+            if (isNaN(dtStartMs) || isNaN(dtEndMs)) {
+                throw new Error("Invalid time format. Required format: yyyy-mm-dd hh:mm:ss (e.g., 2024-01-15 14:30:00)");
+            }
+            // Get WebSocket manager
+            const wsManager = getXYWebSocketManager(config);
+            // Build CreateCalendarEvent command
+            const command = {
+                header: {
+                    namespace: "Common",
+                    name: "ActionAndResult",
                 },
-                responses: [
-                    {
-                        resultCode: "",
-                        displayText: "",
-                        ttsText: "",
+                payload: {
+                    cardParam: {},
+                    executeParam: {
+                        executeMode: "background",
+                        intentName: "CreateCalendarEvent",
+                        bundleName: "com.huawei.hmos.calendardata",
+                        dimension: "",
+                        needUnlock: true,
+                        actionResponse: true,
+                        timeOut: 5,
+                        intentParam: {
+                            title: params.title,
+                            dtStart: dtStartMs,
+                            dtEnd: dtEndMs,
+                        },
+                        achieveType: "INTENT",
                     },
-                ],
-                needUploadResult: true,
-                noHalfPage: false,
-                pageControlRelated: false,
-            },
-        };
-        // Send command and wait for response (60 second timeout)
-        return new Promise((resolve, reject) => {
-            const timeout = setTimeout(() => {
-                wsManager.off("data-event", handler);
-                reject(new Error("创建日程超时（60秒）"));
-            }, 60000);
-            // Listen for data events from WebSocket
-            const handler = (event) => {
-                if (event.intentName === "CreateCalendarEvent") {
-                    clearTimeout(timeout);
+                    responses: [
+                        {
+                            resultCode: "",
+                            displayText: "",
+                            ttsText: "",
+                        },
+                    ],
+                    needUploadResult: true,
+                    noHalfPage: false,
+                    pageControlRelated: false,
+                },
+            };
+            // Send command and wait for response (60 second timeout)
+            return new Promise((resolve, reject) => {
+                const timeout = setTimeout(() => {
                     wsManager.off("data-event", handler);
-                    if (event.status === "success" && event.outputs) {
-                        resolve({
-                            content: [
-                                {
-                                    type: "text",
-                                    text: JSON.stringify(event.outputs),
-                                },
-                            ],
-                        });
-                    }
-                    else {
-                        reject(new Error(`创建日程失败: ${event.status}`));
+                    reject(new Error("创建日程超时（60秒）"));
+                }, 60000);
+                // Listen for data events from WebSocket
+                const handler = (event) => {
+                    if (event.intentName === "CreateCalendarEvent") {
+                        clearTimeout(timeout);
+                        wsManager.off("data-event", handler);
+                        if (event.status === "success" && event.outputs) {
+                            resolve({
+                                content: [
+                                    {
+                                        type: "text",
+                                        text: JSON.stringify(event.outputs),
+                                    },
+                                ],
+                            });
+                        }
+                        else {
+                            reject(new Error(`创建日程失败: ${event.status}`));
+                        }
                     }
-                }
-            };
-            // Register event handler
-            wsManager.on("data-event", handler);
-            // Send the command
-            sendCommand({
-                config,
-                sessionId,
-                taskId,
-                messageId,
-                command,
-            })
-                .then(() => {
-            })
-                .catch((error) => {
-                clearTimeout(timeout);
-                wsManager.off("data-event", handler);
-                reject(error);
+                };
+                // Register event handler
+                wsManager.on("data-event", handler);
+                // Send the command
+                sendCommand({
+                    config,
+                    sessionId,
+                    taskId,
+                    messageId,
+                    command,
+                })
+                    .then(() => {
+                })
+                    .catch((error) => {
+                    clearTimeout(timeout);
+                    wsManager.off("data-event", handler);
+                    reject(error);
+                });
             });
-        });
-    },
-};
+        },
+    };
+}

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

@@ -1,5 +1,6 @@
+import type { SessionContext } from "./session-manager.js";
 /**
  * call_device_tool - 通用端工具调度器。
  * LLM 必须先通过 get_xxx_tool_schema 获取具体工具 schema，再用本工具执行。
  */
-export declare const callDeviceTool: any;
+export declare function createCallDeviceTool(ctx: SessionContext): any;