@ynhcj/xiaoyi-channel 0.0.105-next → 0.0.106-next

package/dist/src/channel.js

@@ -44,18 +44,20 @@ export const xyPlugin = {
     },
     outbound: xyOutbound,
     agentTools: () => {
-        // agentTools factory is called during agent run setup.
-        // ALS is still valid at this point — read sessionKey from it.
+        // agentTools factory may be called before ALS is active (e.g. during
+        // dispatcher setup).  Don't bail out — tools will resolve their
+        // session at execute time via requireSession() which falls back to ALS.
         const alsContext = xyAsyncLocalStorage.getStore();
         const sessionKey = alsContext?.openclawSessionKey;
-        if (!sessionKey) {
-            logger.log("[CHANNEL-TOOLS] no sessionKey in ALS, returning empty tools");
-            return [];
-        }
-        const session = getSession(sessionKey);
-        const allTools = createAllTools(sessionKey);
+        const allTools = createAllTools(sessionKey ?? undefined);
+        const session = sessionKey ? getSession(sessionKey) : null;
         const filtered = filterToolsByDevice(allTools, session?.deviceType);
-        logger.log(`[CHANNEL-TOOLS] sessionKey=${sessionKey} deviceType=${session?.deviceType ?? "(none)"}, tools: ${allTools.length} → ${filtered.length} (${filtered.map(t => t.name).join(", ")})`);
+        if (sessionKey) {
+            logger.log(`[CHANNEL-TOOLS] sessionKey=${sessionKey} deviceType=${session?.deviceType ?? "(none)"}, tools: ${allTools.length} → ${filtered.length}`);
+        }
+        else {
+            logger.log(`[CHANNEL-TOOLS] no ALS at factory time, created ${filtered.length} tools (will resolve session at execute time)`);
+        }
         return filtered;
     },
     messaging: {

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

@@ -3,4 +3,4 @@
  * Requires title, dtStart (start time), and dtEnd (end time) parameters.
  * Time format must be: yyyy-mm-dd hh:mm:ss
  */
-export declare function createCalendarTool(sessionKey: string): any;
+export declare function createCalendarTool(sessionKey: string | undefined): any;

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

@@ -2,4 +2,4 @@
  * call_device_tool - 通用端工具调度器。
  * LLM 必须先通过 get_xxx_tool_schema 获取具体工具 schema，再用本工具执行。
  */
-export declare function createCallDeviceTool(sessionKey: string): any;
+export declare function createCallDeviceTool(sessionKey: string | undefined): any;

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

@@ -2,4 +2,4 @@
  * XY call phone tool - makes a phone call on user's device.
  * Requires phoneNumber parameter and optional slotId (0 for primary SIM, 1 for secondary SIM).
  */
-export declare function createCallPhoneTool(sessionKey: string): any;
+export declare function createCallPhoneTool(sessionKey: string | undefined): any;

package/dist/src/tools/create-alarm-tool.d.ts

@@ -4,4 +4,4 @@
  *
  * Time format: YYYYMMDD hhmmss (e.g., 20240315 143000)
  */
-export declare function makeAlarmTool(sessionKey: string): any;
+export declare function makeAlarmTool(sessionKey: string | undefined): any;

package/dist/src/tools/create-all-tools.d.ts

@@ -12,4 +12,4 @@ import type { ChannelAgentTool } from "openclaw/plugin-sdk";
  * @param sessionKey - The OpenClaw session key for the current turn.
  *   Tools will look up the live session context at execute time.
  */
-export declare function createAllTools(sessionKey: string): ChannelAgentTool[];
+export declare function createAllTools(sessionKey: string | undefined): ChannelAgentTool[];

package/dist/src/tools/delete-alarm-tool.d.ts

@@ -8,4 +8,4 @@
  *
  * Supports deleting single or multiple alarms in one call.
  */
-export declare function createDeleteAlarmTool(sessionKey: string): any;
+export declare function createDeleteAlarmTool(sessionKey: string | undefined): any;

package/dist/src/tools/get-alarm-tool-schema.d.ts

@@ -1,4 +1,4 @@
-export declare function createGetAlarmToolSchemaTool(sessionKey: string): {
+export declare function createGetAlarmToolSchemaTool(sessionKey: string | undefined): {
     name: string;
     label: string;
     description: string;

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

@@ -1,4 +1,4 @@
-export declare function createGetCalendarToolSchemaTool(sessionKey: string): {
+export declare function createGetCalendarToolSchemaTool(sessionKey: string | undefined): {
     name: string;
     label: string;
     description: string;

package/dist/src/tools/get-collection-tool-schema.d.ts

@@ -1,4 +1,4 @@
-export declare function createGetCollectionToolSchemaTool(sessionKey: string): {
+export declare function createGetCollectionToolSchemaTool(sessionKey: string | undefined): {
     name: string;
     label: string;
     description: string;

package/dist/src/tools/get-contact-tool-schema.d.ts

@@ -1,4 +1,4 @@
-export declare function createGetContactToolSchemaTool(sessionKey: string): {
+export declare function createGetContactToolSchemaTool(sessionKey: string | undefined): {
     name: string;
     label: string;
     description: string;

package/dist/src/tools/get-device-file-tool-schema.d.ts

@@ -1,4 +1,4 @@
-export declare function createGetDeviceFileToolSchemaTool(sessionKey: string): {
+export declare function createGetDeviceFileToolSchemaTool(sessionKey: string | undefined): {
     name: string;
     label: string;
     description: string;

package/dist/src/tools/get-email-tool-schema.d.ts

@@ -1,4 +1,4 @@
-export declare function createGetEmailToolSchemaTool(sessionKey: string): {
+export declare function createGetEmailToolSchemaTool(sessionKey: string | undefined): {
     name: string;
     label: string;
     description: string;

package/dist/src/tools/get-note-tool-schema.d.ts

@@ -1,4 +1,4 @@
-export declare function createGetNoteToolSchemaTool(sessionKey: string): {
+export declare function createGetNoteToolSchemaTool(sessionKey: string | undefined): {
     name: string;
     label: string;
     description: string;

package/dist/src/tools/get-photo-tool-schema.d.ts

@@ -1,4 +1,4 @@
-export declare function createGetPhotoToolSchemaTool(sessionKey: string): {
+export declare function createGetPhotoToolSchemaTool(sessionKey: string | undefined): {
     name: string;
     label: string;
     description: string;

package/dist/src/tools/image-reading-tool.d.ts

@@ -2,4 +2,4 @@
  * XY Image Reading tool - performs image understanding using local or remote image URLs.
  * Supports both local file paths and remote URLs, up to 10 images at once.
  */
-export declare function createImageReadingTool(sessionKey: string): any;
+export declare function createImageReadingTool(sessionKey: string | undefined): any;

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

@@ -2,4 +2,4 @@
  * XY location tool - gets user's current location.
  * Returns WGS84 coordinates (latitude, longitude).
  */
-export declare function createLocationTool(sessionKey: string): any;
+export declare function createLocationTool(sessionKey: string | undefined): any;

package/dist/src/tools/login-token-tool.d.ts

@@ -2,4 +2,4 @@
  * huawei_id_tool 工具
  * 当 skill 依赖用户获取鉴权信息时，此工具协助用户快速获取鉴权信息。
  */
-export declare function createLoginTokenTool(sessionKey: string): any;
+export declare function createLoginTokenTool(sessionKey: string | undefined): any;

package/dist/src/tools/modify-alarm-tool.d.ts

@@ -6,4 +6,4 @@
  * 1. Call search_alarm or create_alarm tool first to get entityId
  * 2. Use the entityId to identify which alarm to modify
  */
-export declare function createModifyAlarmTool(sessionKey: string): any;
+export declare function createModifyAlarmTool(sessionKey: string | undefined): any;

package/dist/src/tools/modify-note-tool.d.ts

@@ -6,4 +6,4 @@
  * 1. Call search_notes tool first to get the entityId of target note
  * 2. Use the entityId to append content to that note
  */
-export declare function createModifyNoteTool(sessionKey: string): any;
+export declare function createModifyNoteTool(sessionKey: string | undefined): any;

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

@@ -2,4 +2,4 @@
  * XY note tool - creates a note on user's device.
  * Requires title and content parameters.
  */
-export declare function createNoteTool(sessionKey: string): any;
+export declare function createNoteTool(sessionKey: string | undefined): any;

package/dist/src/tools/query-app-message-tool.d.ts

@@ -1,4 +1,4 @@
 /**
  * 查询指定时间范围内的设备通知消息。
  */
-export declare function createQueryAppMessageTool(sessionKey: string): any;
+export declare function createQueryAppMessageTool(sessionKey: string | undefined): any;

package/dist/src/tools/query-memory-data-tool.d.ts

@@ -1,4 +1,4 @@
 /**
  * 查询存储在设备本地的结构化记忆数据。
  */
-export declare function createQueryMemoryDataTool(sessionKey: string): any;
+export declare function createQueryMemoryDataTool(sessionKey: string | undefined): any;

package/dist/src/tools/query-todo-task-tool.d.ts

@@ -1,4 +1,4 @@
 /**
  * 获取指定时间范围内的全局待办任务列表。
  */
-export declare function createQueryTodoTaskTool(sessionKey: string): any;
+export declare function createQueryTodoTaskTool(sessionKey: string | undefined): any;

package/dist/src/tools/save-file-to-phone-tool.d.ts

@@ -2,4 +2,4 @@
  * XY save file to phone tool - saves files to user's device file manager.
  * Supports local file paths (auto-uploaded to get public URL) and public URLs.
  */
-export declare function createSaveFileToPhoneTool(sessionKey: string): any;
+export declare function createSaveFileToPhoneTool(sessionKey: string | undefined): any;

package/dist/src/tools/save-media-to-gallery-tool.d.ts

@@ -2,4 +2,4 @@
  * XY save media to gallery tool - saves image or video files to user's device gallery.
  * Supports local file paths (auto-uploaded to get public URL) and public URLs.
  */
-export declare function createSaveMediaToGalleryTool(sessionKey: string): any;
+export declare function createSaveMediaToGalleryTool(sessionKey: string | undefined): any;

package/dist/src/tools/save-self-evolution-skill-tool.d.ts

@@ -1 +1 @@
-export declare function createSaveSelfEvolutionSkillTool(sessionKey: string): any;
+export declare function createSaveSelfEvolutionSkillTool(sessionKey: string | undefined): any;

package/dist/src/tools/search-alarm-tool.d.ts

@@ -5,4 +5,4 @@
  * At least one search criterion must be provided.
  * Multiple criteria can be combined.
  */
-export declare function createSearchAlarmTool(sessionKey: string): any;
+export declare function createSearchAlarmTool(sessionKey: string | undefined): any;

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

@@ -9,4 +9,4 @@
  * - For evening: 18:00:00 to 24:00:00
  * - For a specific time: use ±1 hour range (e.g., for 3PM, use 14:00:00 to 16:00:00)
  */
-export declare function createSearchCalendarTool(sessionKey: string): any;
+export declare function createSearchCalendarTool(sessionKey: string | undefined): any;

package/dist/src/tools/search-contact-tool.d.ts

@@ -2,4 +2,4 @@
  * XY search contact tool - searches contacts on user's device.
  * Returns matching contact information based on name.
  */
-export declare function createSearchContactTool(sessionKey: string): any;
+export declare function createSearchContactTool(sessionKey: string | undefined): any;

package/dist/src/tools/search-email-tool.d.ts

@@ -2,4 +2,4 @@
  * XY search email tool - searches emails on user's device (花瓣邮箱).
  * Returns matching emails based on query text and search type.
  */
-export declare function createSearchEmailTool(sessionKey: string): any;
+export declare function createSearchEmailTool(sessionKey: string | undefined): any;

package/dist/src/tools/search-file-tool.d.ts

@@ -2,4 +2,4 @@
  * XY search file tool - searches files on user's device file system.
  * Returns matching files based on keyword search in file name or content.
  */
-export declare function createSearchFileTool(sessionKey: string): any;
+export declare function createSearchFileTool(sessionKey: string | undefined): any;

package/dist/src/tools/search-message-tool.d.ts

@@ -2,4 +2,4 @@
  * XY search message tool - searches SMS messages on user's device.
  * Returns matching messages based on content keyword search.
  */
-export declare function createSearchMessageTool(sessionKey: string): any;
+export declare function createSearchMessageTool(sessionKey: string | undefined): any;

package/dist/src/tools/search-note-tool.d.ts

@@ -2,4 +2,4 @@
  * XY search note tool - searches notes on user's device.
  * Returns matching notes based on query string.
  */
-export declare function createSearchNoteTool(sessionKey: string): any;
+export declare function createSearchNoteTool(sessionKey: string | undefined): any;

package/dist/src/tools/search-photo-gallery-tool.d.ts

@@ -5,4 +5,4 @@
  * IMPORTANT: The returned mediaUris are LOCAL URIs that cannot be downloaded directly.
  * To get publicly accessible URLs, use the upload_photo tool with these URIs.
  */
-export declare function createSearchPhotoGalleryTool(sessionKey: string): any;
+export declare function createSearchPhotoGalleryTool(sessionKey: string | undefined): any;

package/dist/src/tools/send-email-tool.d.ts

@@ -1,4 +1,4 @@
 /**
  * XY send email tool - sends an email via 花瓣邮箱 on user's device.
  */
-export declare function createSendEmailTool(sessionKey: string): any;
+export declare function createSendEmailTool(sessionKey: string | undefined): any;

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

@@ -2,4 +2,4 @@
  * XY send file to user tool - sends local files or remote files to user's device.
  * Supports both local file paths and remote URLs.
  */
-export declare function createSendFileToUserTool(sessionKey: string): any;
+export declare function createSendFileToUserTool(sessionKey: string | undefined): any;

package/dist/src/tools/send-message-tool.d.ts

@@ -2,4 +2,4 @@
  * XY send message tool - sends SMS message on user's device.
  * Requires phoneNumber (with +86 prefix) and content parameters.
  */
-export declare function createSendMessageTool(sessionKey: string): any;
+export declare function createSendMessageTool(sessionKey: string | undefined): any;

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

@@ -2,12 +2,23 @@
  * Tool session helper — provides a simple API for tools to access
  * the current session context via sessionKey.
  *
- * Tools capture `sessionKey` at creation time and call `requireSession()`
- * at execute time to get the live XYSession (with latest taskId).
+ * Tools capture `sessionKey` at creation time (may be empty if ALS
+ * was not available at agentTools factory time) and call
+ * `requireSession()` at execute time. If the captured sessionKey
+ * doesn't resolve, we fall back to ALS — the agent run is always
+ * within the ALS context set by bot.ts.
  */
 import { type XYSession } from "../xy-session-store.js";
 /**
  * Get the session for a sessionKey, throwing if not found.
- * Used at the top of every tool's execute() to get live context.
+ *
+ * Resolution order:
+ *   1. Closure-captured sessionKey (set at agentTools factory time)
+ *   2. ALS (set by bot.ts before the agent run)
+ *   3. Store enumeration — safe only when a single session is active
+ *
+ * Layers 1 and 2 can both fail: agentTools may be called before ALS is
+ * active, and pi-agent-core tool execute may cross async boundaries that
+ * lose the ALS context.  Layer 3 is the ultimate fallback.
  */
-export declare function requireSession(sessionKey: string): XYSession;
+export declare function requireSession(sessionKey?: string | null): XYSession;

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

@@ -2,18 +2,44 @@
  * Tool session helper — provides a simple API for tools to access
  * the current session context via sessionKey.
  *
- * Tools capture `sessionKey` at creation time and call `requireSession()`
- * at execute time to get the live XYSession (with latest taskId).
+ * Tools capture `sessionKey` at creation time (may be empty if ALS
+ * was not available at agentTools factory time) and call
+ * `requireSession()` at execute time. If the captured sessionKey
+ * doesn't resolve, we fall back to ALS — the agent run is always
+ * within the ALS context set by bot.ts.
  */
-import { getSession } from "../xy-session-store.js";
+import { getSession, xyAsyncLocalStorage, getAllActiveSessions } from "../xy-session-store.js";
 /**
  * Get the session for a sessionKey, throwing if not found.
- * Used at the top of every tool's execute() to get live context.
+ *
+ * Resolution order:
+ *   1. Closure-captured sessionKey (set at agentTools factory time)
+ *   2. ALS (set by bot.ts before the agent run)
+ *   3. Store enumeration — safe only when a single session is active
+ *
+ * Layers 1 and 2 can both fail: agentTools may be called before ALS is
+ * active, and pi-agent-core tool execute may cross async boundaries that
+ * lose the ALS context.  Layer 3 is the ultimate fallback.
  */
 export function requireSession(sessionKey) {
-    const session = getSession(sessionKey);
-    if (!session) {
-        throw new Error(`XY session not found for key: ${sessionKey}`);
+    // Layer 1: closure-captured sessionKey
+    if (sessionKey) {
+        const session = getSession(sessionKey);
+        if (session)
+            return session;
+    }
+    // Layer 2: ALS (works when the async chain preserves the context)
+    const alsContext = xyAsyncLocalStorage.getStore();
+    const alsKey = alsContext?.openclawSessionKey;
+    if (alsKey) {
+        const session = getSession(alsKey);
+        if (session)
+            return session;
+    }
+    // Layer 3: store enumeration — reliable when only one session is active
+    const allSessions = getAllActiveSessions();
+    if (allSessions.length === 1) {
+        return allSessions[0].session;
     }
-    return session;
+    throw new Error(`XY session not found (sessionKey=${sessionKey ?? "none"}, alsKey=${alsKey ?? "none"}, activeSessions=${allSessions.length})`);
 }

package/dist/src/tools/upload-file-tool.d.ts

@@ -10,4 +10,4 @@
  * - After getting public URLs, if further processing is needed, download the file first
  * - URLs returned are publicly accessible
  */
-export declare function createUploadFileTool(sessionKey: string): any;
+export declare function createUploadFileTool(sessionKey: string | undefined): any;

package/dist/src/tools/upload-photo-tool.d.ts

@@ -6,4 +6,4 @@
  * 1. Call search_photo_gallery tool first to get mediaUris of photos
  * 2. Use the mediaUris (maximum 5 at a time) to get public URLs
  */
-export declare function createUploadPhotoTool(sessionKey: string): any;
+export declare function createUploadPhotoTool(sessionKey: string | undefined): any;

package/dist/src/tools/xiaoyi-add-collection-tool.d.ts

@@ -1,4 +1,4 @@
 /**
  * XY add collection tool - adds data to user's XiaoYi collection.
  */
-export declare function createXiaoyiAddCollectionTool(sessionKey: string): any;
+export declare function createXiaoyiAddCollectionTool(sessionKey: string | undefined): any;

package/dist/src/tools/xiaoyi-collection-tool.d.ts

@@ -2,4 +2,4 @@
  * XY collection tool - retrieves user's collection data from XiaoYi.
  * Returns personalized knowledge data saved in user's collection.
  */
-export declare function createXiaoyiCollectionTool(sessionKey: string): any;
+export declare function createXiaoyiCollectionTool(sessionKey: string | undefined): any;

package/dist/src/tools/xiaoyi-delete-collection-tool.d.ts

@@ -1,4 +1,4 @@
 /**
  * XY delete collection tool - deletes data from user's XiaoYi collection.
  */
-export declare function createXiaoyiDeleteCollectionTool(sessionKey: string): any;
+export declare function createXiaoyiDeleteCollectionTool(sessionKey: string | undefined): any;

package/dist/src/tools/xiaoyi-gui-tool.d.ts

@@ -3,4 +3,4 @@
  * Simulates user interactions on phone screen (click, swipe, input, navigation, etc.)
  * to complete tasks that cannot be done through internet APIs.
  */
-export declare function createXiaoyiGuiTool(sessionKey: string): any;
+export declare function createXiaoyiGuiTool(sessionKey: string | undefined): any;

package/package.json

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