@ynhcj/xiaoyi-channel 0.0.167-next → 0.0.168-next

package/dist/src/reply-dispatcher.js

@@ -5,6 +5,7 @@ import { clearRunCrossTaskSentFiles, getCurrentSessionContext } from "./tools/se
 import fs from "fs/promises";
 import path from "path";
 import { logger } from "./utils/logger.js";
+import { getCurrentTaskId, getCurrentMessageId } from "./task-manager.js";
 const TEMP_FILE_TTL_MS = 24 * 60 * 60 * 1000; // 24 hours
 const RUN_CROSS_TASK_LOG_TAG = "[RunCrossTask]";
 function buildDistributionStatusCommand(context) {
@@ -99,8 +100,13 @@ export function createXYReplyDispatcher(params) {
     // 初始taskId和messageId（作为fallback）
     const initialTaskId = taskId;
     const initialMessageId = messageId;
-    const getActiveTaskId = () => initialTaskId;
-    const getActiveMessageId = () => initialMessageId;
+    // 跨链读取：steer 消息通过 registerTaskId 更新 Map，这里读取最新 taskId
+    const getActiveTaskId = () => {
+        return getCurrentTaskId(sessionId) ?? initialTaskId;
+    };
+    const getActiveMessageId = () => {
+        return getCurrentMessageId(sessionId) ?? initialMessageId;
+    };
     // Create a scoped logger that always uses this session's sessionId
     // and dynamically resolves the latest taskId
     const scopedLog = () => logger.withContext(sessionId, getActiveTaskId());
@@ -129,12 +135,13 @@ export function createXYReplyDispatcher(params) {
         scopedLog().log(`[STATUS-INTERVAL] Starting interval`);
         statusUpdateInterval = setInterval(() => {
             // 🔑 使用动态taskId
-            scopedLog().log(`[STATUS-INTERVAL] Triggering status update, taskId=${taskId}`);
+            const currentTaskId = getActiveTaskId();
+            scopedLog().log(`[STATUS-INTERVAL] Triggering status update, taskId=${currentTaskId}`);
             void sendStatusUpdate({
                 config,
                 sessionId,
-                taskId, // 🔑 动态taskId
-                messageId, // 🔑 动态messageId
+                taskId: currentTaskId,
+                messageId: getActiveMessageId(),
                 text: "任务正在处理中，请稍候~",
                 state: "working",
             }).catch((err) => {
@@ -184,8 +191,8 @@ export function createXYReplyDispatcher(params) {
                 await sendA2AResponse({
                     config,
                     sessionId,
-                    taskId,
-                    messageId,
+                    taskId: getActiveTaskId(),
+                    messageId: getActiveMessageId(),
                     text,
                     append: true,
                     final: false,
@@ -208,8 +215,8 @@ export function createXYReplyDispatcher(params) {
                     await sendStatusUpdate({
                         config,
                         sessionId,
-                        taskId,
-                        messageId,
+                        taskId: getActiveTaskId(),
+                        messageId: getActiveMessageId(),
                         text: "处理失败，请稍后重试",
                         state: "failed",
                     });
@@ -240,8 +247,8 @@ export function createXYReplyDispatcher(params) {
                         await sendRunCrossTaskResult({
                             config,
                             sessionId,
-                            taskId,
-                            messageId,
+                            taskId: getActiveTaskId(),
+                            messageId: getActiveMessageId(),
                             context: runCrossTaskContext,
                             resultCode: "0",
                             resultMessage: crossTaskResultMessage,
@@ -251,8 +258,8 @@ export function createXYReplyDispatcher(params) {
                     await sendStatusUpdate({
                         config,
                         sessionId,
-                        taskId,
-                        messageId,
+                        taskId: getActiveTaskId(),
+                        messageId: getActiveMessageId(),
                         text: "任务处理已完成~",
                         state: "completed",
                     });
@@ -261,8 +268,8 @@ export function createXYReplyDispatcher(params) {
                     await sendA2AResponse({
                         config,
                         sessionId,
-                        taskId,
-                        messageId,
+                        taskId: getActiveTaskId(),
+                        messageId: getActiveMessageId(),
                         text: "",
                         append: true,
                         final: true,
@@ -283,8 +290,8 @@ export function createXYReplyDispatcher(params) {
                         await sendRunCrossTaskResult({
                             config,
                             sessionId,
-                            taskId,
-                            messageId,
+                            taskId: getActiveTaskId(),
+                            messageId: getActiveMessageId(),
                             context: runCrossTaskContext,
                             resultCode: "1",
                             resultMessage: "任务执行异常，请重试",
@@ -293,8 +300,8 @@ export function createXYReplyDispatcher(params) {
                     await sendStatusUpdate({
                         config,
                         sessionId,
-                        taskId,
-                        messageId,
+                        taskId: getActiveTaskId(),
+                        messageId: getActiveMessageId(),
                         text: "任务处理中断了~",
                         state: "failed",
                     });
@@ -302,8 +309,8 @@ export function createXYReplyDispatcher(params) {
                     await sendA2AResponse({
                         config,
                         sessionId,
-                        taskId,
-                        messageId,
+                        taskId: getActiveTaskId(),
+                        messageId: getActiveMessageId(),
                         text: "任务执行异常，请重试~",
                         append: true,
                         final: true,
@@ -347,8 +354,8 @@ export function createXYReplyDispatcher(params) {
                         await sendStatusUpdate({
                             config,
                             sessionId,
-                            taskId,
-                            messageId,
+                            taskId: getActiveTaskId(),
+                            messageId: getActiveMessageId(),
                             text: `正在使用工具: ${toolName}...`,
                             state: "working",
                         });
@@ -373,8 +380,8 @@ export function createXYReplyDispatcher(params) {
                         await sendStatusUpdate({
                             config,
                             sessionId,
-                            taskId,
-                            messageId,
+                            taskId: getActiveTaskId(),
+                            messageId: getActiveMessageId(),
                             text: resultText,
                             state: "working",
                         });
@@ -401,8 +408,8 @@ export function createXYReplyDispatcher(params) {
                         await sendReasoningTextUpdate({
                             config,
                             sessionId,
-                            taskId,
-                            messageId,
+                            taskId: getActiveTaskId(),
+                            messageId: getActiveMessageId(),
                             text,
                             append: false,
                         });
@@ -425,8 +432,8 @@ export function createXYReplyDispatcher(params) {
                         await sendA2AResponse({
                             config,
                             sessionId,
-                            taskId,
-                            messageId,
+                            taskId: getActiveTaskId(),
+                            messageId: getActiveMessageId(),
                             text,
                             append: false,
                             final: false,

package/dist/src/task-manager.d.ts

@@ -13,6 +13,17 @@ export declare function registerTaskId(sessionId: string, taskId: string, messag
  * 移除session的活跃taskId（消息处理完成时调用）。
  */
 export declare function decrementTaskIdRef(sessionId: string): void;
+/**
+ * 获取session的当前活跃taskId。
+ * 仅供 reply-dispatcher 跨链读取 steer 更新后的 taskId。
+ * 工具和 sendCommand 应使用 ALS SessionContext.taskId。
+ */
+export declare function getCurrentTaskId(sessionId: string): string | null;
+/**
+ * 获取session的当前活跃messageId。
+ * 仅供 reply-dispatcher 跨链读取 steer 更新后的 messageId。
+ */
+export declare function getCurrentMessageId(sessionId: string): string | null;
 /**
  * 检查session是否有活跃的taskId
  */

package/dist/src/task-manager.js

@@ -43,6 +43,23 @@ export function decrementTaskIdRef(sessionId) {
     logger.log(`[TASK_MANAGER] Removing taskId`);
     activeTaskIds.delete(sessionId);
 }
+/**
+ * 获取session的当前活跃taskId。
+ * 仅供 reply-dispatcher 跨链读取 steer 更新后的 taskId。
+ * 工具和 sendCommand 应使用 ALS SessionContext.taskId。
+ */
+export function getCurrentTaskId(sessionId) {
+    const binding = activeTaskIds.get(sessionId);
+    return binding?.currentTaskId ?? null;
+}
+/**
+ * 获取session的当前活跃messageId。
+ * 仅供 reply-dispatcher 跨链读取 steer 更新后的 messageId。
+ */
+export function getCurrentMessageId(sessionId) {
+    const binding = activeTaskIds.get(sessionId);
+    return binding?.currentMessageId ?? null;
+}
 /**
  * 检查session是否有活跃的taskId
  */

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

@@ -1,6 +1,7 @@
 // Agent-as-skill tool implementation - invokes another agent as a skill
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentSessionContext } from './session-manager.js';
 import { logger } from "../utils/logger.js";
 import { XYFileUploadService } from "../file-upload.js";
 /**
@@ -9,7 +10,6 @@ import { XYFileUploadService } from "../file-upload.js";
  * forwards the request to the target agent via WebSocket, and returns the result.
  */
 export function createAgentAsSkillTool(ctx) {
-    const { config, sessionId, taskId, messageId } = ctx;
     return {
         name: "agent_as_a_tool",
         label: "Agent as Skill Tool",
@@ -65,6 +65,8 @@ export function createAgentAsSkillTool(ctx) {
             required: ["agentId", "query"],
         },
         async execute(toolCallId, params) {
+            const _c = getCurrentSessionContext() ?? ctx;
+            const { config, sessionId, taskId, messageId } = _c;
             // Dynamic lookup: use latest taskId from task-manager (handles steer/interrupt)
             // Validate parameters
             if (!params.agentId || typeof params.agentId !== "string") {

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

@@ -1,5 +1,6 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentSessionContext } from './session-manager.js';
 import { logger } from "../utils/logger.js";
 /**
  * XY calendar event tool - creates a calendar event on user's device.
@@ -7,7 +8,6 @@ import { logger } from "../utils/logger.js";
  * Time format must be: yyyy-mm-dd hh:mm:ss
  */
 export function createCalendarTool(ctx) {
-    const { config, sessionId, taskId, messageId } = ctx;
     return {
         name: "create_calendar_event",
         label: "Create Calendar Event",
@@ -35,6 +35,8 @@ export function createCalendarTool(ctx) {
             required: ["title", "dtStart", "dtEnd"],
         },
         async execute(toolCallId, params) {
+            const _c = getCurrentSessionContext() ?? ctx;
+            const { config, sessionId, taskId, messageId } = _c;
             // Validate parameters
             if (!params.title || !params.dtStart || !params.dtEnd) {
                 throw new Error("Missing required parameters: title, dtStart, and dtEnd are required");

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

@@ -23,12 +23,12 @@ import { createSaveFileToPhoneTool } from "./save-file-to-phone-tool.js";
 import { createSendEmailTool } from "./send-email-tool.js";
 import { createSearchEmailTool } from "./search-email-tool.js";
 import { sendStatusUpdate } from "../formatter.js";
+import { getCurrentSessionContext } from './session-manager.js';
 /**
  * call_device_tool - 通用端工具调度器。
  * LLM 必须先通过 get_xxx_tool_schema 获取具体工具 schema，再用本工具执行。
  */
 export function createCallDeviceTool(ctx) {
-    const { config, sessionId, taskId, messageId } = ctx;
     const noteTool = createNoteTool(ctx);
     const modifyNoteTool = createModifyNoteTool(ctx);
     const createAlarmTool = makeAlarmTool(ctx);
@@ -101,6 +101,8 @@ export function createCallDeviceTool(ctx) {
             required: ["toolName", "arguments"],
         },
         async execute(toolCallId, params) {
+            const _c = getCurrentSessionContext() ?? ctx;
+            const { config, sessionId, taskId, messageId } = _c;
             const { toolName, arguments: toolArgs } = params;
             // 向用户端发送具体工具名的状态更新
             try {

package/dist/src/tools/call-phone-tool.js

@@ -1,12 +1,12 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentSessionContext } from './session-manager.js';
 import { logger } from "../utils/logger.js";
 /**
  * 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 function createCallPhoneTool(ctx) {
-    const { config, sessionId, taskId, messageId } = ctx;
     return {
         name: "call_phone",
         label: "Call Phone",
@@ -27,6 +27,8 @@ export function createCallPhoneTool(ctx) {
             required: ["phoneNumber"],
         },
         async execute(toolCallId, params) {
+            const _c = getCurrentSessionContext() ?? ctx;
+            const { config, sessionId, taskId, messageId } = _c;
             // Validate phoneNumber parameter
             if (!params.phoneNumber || typeof params.phoneNumber !== "string" || params.phoneNumber.trim() === "") {
                 throw new Error("Missing required parameter: phoneNumber must be a non-empty string");

package/dist/src/tools/check-plugin-privilege-tool.js

@@ -1,6 +1,7 @@
 // Check plugin privilege tool implementation
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentSessionContext } from './session-manager.js';
 import { logger } from "../utils/logger.js";
 /**
  * Mapping from intent name to required permission IDs.
@@ -32,7 +33,6 @@ const INTENT_PERMISSION_MAP = {
  * used in scheduled tasks.
  */
 export function createCheckPluginPrivilegeTool(ctx) {
-    const { config, sessionId, taskId, messageId } = ctx;
     return {
         name: "check_plugin_privilege",
         label: "Check Plugin Privilege",
@@ -75,6 +75,8 @@ export function createCheckPluginPrivilegeTool(ctx) {
             required: ["checkIntentName"],
         },
         async execute(toolCallId, params) {
+            const _c = getCurrentSessionContext() ?? ctx;
+            const { config, sessionId, taskId, messageId } = _c;
             const { checkIntentName } = params;
             // Look up permission IDs for the given intent name
             const permissionId = INTENT_PERMISSION_MAP[checkIntentName];

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

@@ -1,5 +1,6 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentSessionContext } from './session-manager.js';
 import { logger } from "../utils/logger.js";
 // Enum definitions for alarm parameters
 const ALARM_SNOOZE_DURATION_VALUES = [5, 10, 15, 20, 25, 30];
@@ -14,7 +15,6 @@ const DAYS_OF_WEEK_VALUES = ["Mon", "Tues", "Wed", "Thur", "Fri", "Sat", "Sun"];
  * Time format: YYYYMMDD hhmmss (e.g., 20240315 143000)
  */
 export function makeAlarmTool(ctx) {
-    const { config, sessionId, taskId, messageId } = ctx;
     return {
         name: "create_alarm",
         label: "Create Alarm",
@@ -61,6 +61,8 @@ b. 使用该工具之前需获取当前真实时间
             required: ["alarmTime"],
         },
         async execute(toolCallId, params) {
+            const _c = getCurrentSessionContext() ?? ctx;
+            const { config, sessionId, taskId, messageId } = _c;
             // ===== Validate required parameter: alarmTime =====
             if (!params.alarmTime || typeof params.alarmTime !== "string") {
                 throw new Error("Missing required parameter: alarmTime must be a string in format YYYYMMDD hhmmss");

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

@@ -1,5 +1,6 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentSessionContext } from './session-manager.js';
 import { logger } from "../utils/logger.js";
 /**
  * XY delete alarm tool - deletes existing alarms on user's device.
@@ -12,7 +13,6 @@ import { logger } from "../utils/logger.js";
  * Supports deleting single or multiple alarms in one call.
  */
 export function createDeleteAlarmTool(ctx) {
-    const { config, sessionId, taskId, messageId } = ctx;
     return {
         name: "delete_alarm",
         label: "Delete Alarm",
@@ -40,6 +40,8 @@ export function createDeleteAlarmTool(ctx) {
             required: ["items"],
         },
         async execute(toolCallId, params) {
+            const _c = getCurrentSessionContext() ?? ctx;
+            const { config, sessionId, taskId, messageId } = _c;
             // ===== 参数规范化：兼容数组和 JSON 字符串 =====
             let items = null;
             if (!params.items) {

package/dist/src/tools/discover-cross-devices-tool.js

@@ -1,5 +1,6 @@
 import { sendCommand, sendStatusUpdate } from "../formatter.js";
 import { getXYWebSocketManager } from "../client.js";
+import { getCurrentSessionContext } from './session-manager.js';
 import { logger } from "../utils/logger.js";
 const DISCOVER_DEVICES_INTENT = "SearchAllDeviceInfo";
 const DISCOVER_DEVICES_BUNDLE = "com.huawei.hmos.vassistant";
@@ -97,7 +98,6 @@ function recommendDevices(query, devices) {
     };
 }
 export function createDiscoverCrossDevicesTool(ctx) {
-    const { config, sessionId, taskId, messageId } = ctx;
     return {
         name: "discover_cross_devices",
         label: "发现跨设备协作设备",
@@ -117,6 +117,8 @@ export function createDiscoverCrossDevicesTool(ctx) {
             required: ["query"],
         },
         async execute(_toolCallId, params) {
+            const _c = getCurrentSessionContext() ?? ctx;
+            const { config, sessionId, taskId, messageId } = _c;
             const query = typeof params.query === "string" ? params.query.trim() : "";
             logger.log(`${LOG_TAG} tool invoked`);
             if (!query) {

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

@@ -1,5 +1,6 @@
 import { sendCommand } from "../formatter.js";
 import { logger } from "../utils/logger.js";
+import { getCurrentSessionContext } from './session-manager.js';
 class ToolInputError extends Error {
     status = 400;
     constructor(message) {
@@ -11,7 +12,6 @@ function isJsonObjectOrArray(value) {
     return !!value && typeof value === "object";
 }
 export function createDisplayA2UICardTool(ctx) {
-    const { config, sessionId, taskId, messageId } = ctx;
     return {
         name: "displayA2UICard",
         label: "Display A2UI Card",
@@ -34,6 +34,8 @@ export function createDisplayA2UICardTool(ctx) {
             required: ["cardId", "cardData"],
         },
         async execute(toolCallId, params) {
+            const _c = getCurrentSessionContext() ?? ctx;
+            const { config, sessionId, taskId, messageId } = _c;
             const cardId = typeof params?.cardId === "string" ? params.cardId.trim() : "";
             const cardData = params?.cardData;
             if (!cardId) {

package/dist/src/tools/image-reading-tool.js

@@ -1,6 +1,7 @@
 // Image Reading tool implementation
 import { createHash } from "crypto";
 import { XYFileUploadService } from "../file-upload.js";
+import { getCurrentSessionContext } from './session-manager.js';
 import fetch from "node-fetch";
 import fs from "fs/promises";
 import { v4 as uuidv4 } from "uuid";
@@ -166,7 +167,6 @@ async function callImageUnderstandingAPI(imageUrls, text, apiKey, uid, fileUploa
  * Supports both local file paths and remote URLs, up to 10 images at once.
  */
 export function createImageReadingTool(ctx) {
-    const { config, sessionId } = ctx;
     return {
         name: "image_reading",
         label: "Image Reading",
@@ -187,6 +187,8 @@ export function createImageReadingTool(ctx) {
             required: ["images"],
         },
         async execute(toolCallId, params) {
+            const _c = getCurrentSessionContext() ?? ctx;
+            const { config, sessionId } = _c;
             // Normalize images param
             const images = params.images
                 ? (Array.isArray(params.images) ? params.images : [params.images])

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

@@ -1,12 +1,12 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentSessionContext } from './session-manager.js';
 import { logger } from "../utils/logger.js";
 /**
  * XY location tool - gets user's current location.
  * Returns WGS84 coordinates (latitude, longitude).
  */
 export function createLocationTool(ctx) {
-    const { config, sessionId, taskId, messageId } = ctx;
     return {
         name: "get_user_location",
         label: "Get User Location",
@@ -17,6 +17,8 @@ export function createLocationTool(ctx) {
             required: [],
         },
         async execute(toolCallId, params) {
+            const _c = getCurrentSessionContext() ?? ctx;
+            const { config, sessionId, taskId, messageId } = _c;
             // Get WebSocket manager
             const wsManager = getXYWebSocketManager(config);
             // Build GetCurrentLocation command

package/dist/src/tools/login-token-tool.js

@@ -1,6 +1,7 @@
 // Login Token tool - 自动获取用户授权信息
 import { v4 as uuidv4 } from "uuid";
 import { getXYWebSocketManager } from "../client.js";
+import { getCurrentSessionContext } from './session-manager.js';
 import { readFileSync, existsSync } from "fs";
 import { logger } from "../utils/logger.js";
 const TOKEN_FILE_PATH = "/home/sandbox/.openclaw/.xiaoyitoken.json";
@@ -12,7 +13,6 @@ const TOKEN_VALIDITY_MS = 5 * 60 * 1000; // 5 minutes
  * 当 skill 依赖用户获取鉴权信息时，此工具协助用户快速获取鉴权信息。
  */
 export function createLoginTokenTool(ctx) {
-    const { config, sessionId, taskId, messageId } = ctx;
     return {
         name: "huawei_id_tool",
         label: "Get Login Token",
@@ -32,6 +32,8 @@ export function createLoginTokenTool(ctx) {
             required: ["clientId", "skillName"],
         },
         async execute(toolCallId, params) {
+            const _c = getCurrentSessionContext() ?? ctx;
+            const { config, sessionId, taskId, messageId } = _c;
             const { clientId, skillName } = params;
             if (!clientId || typeof clientId !== "string" || clientId.trim() === "") {
                 throw new Error("Missing required parameter: clientId must be a non-empty string");

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

@@ -1,5 +1,6 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentSessionContext } from './session-manager.js';
 import { logger } from "../utils/logger.js";
 // Enum definitions for alarm parameters (same as create-alarm-tool)
 const ALARM_SNOOZE_DURATION_VALUES = [5, 10, 15, 20, 25, 30];
@@ -16,7 +17,6 @@ const DAYS_OF_WEEK_VALUES = ["Mon", "Tues", "Wed", "Thur", "Fri", "Sat", "Sun"];
  * 2. Use the entityId to identify which alarm to modify
  */
 export function createModifyAlarmTool(ctx) {
-    const { config, sessionId, taskId, messageId } = ctx;
     return {
         name: "modify_alarm",
         label: "Modify Alarm",
@@ -74,6 +74,8 @@ export function createModifyAlarmTool(ctx) {
             required: ["entityId"],
         },
         async execute(toolCallId, params) {
+            const _c = getCurrentSessionContext() ?? ctx;
+            const { config, sessionId, taskId, messageId } = _c;
             // Coerce numeric string params to actual numbers
             // The model may produce "1" instead of 1, which would fail typeof checks
             const numericParams = [

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

@@ -1,5 +1,6 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentSessionContext } from './session-manager.js';
 import { logger } from "../utils/logger.js";
 /**
  * XY modify note tool - appends content to an existing note on user's device.
@@ -10,7 +11,6 @@ import { logger } from "../utils/logger.js";
  * 2. Use the entityId to append content to that note
  */
 export function createModifyNoteTool(ctx) {
-    const { config, sessionId, taskId, messageId } = ctx;
     return {
         name: "modify_note",
         label: "Modify Note",
@@ -30,6 +30,8 @@ export function createModifyNoteTool(ctx) {
             required: ["entityId", "text"],
         },
         async execute(toolCallId, params) {
+            const _c = getCurrentSessionContext() ?? ctx;
+            const { config, sessionId, taskId, messageId } = _c;
             // Validate parameters
             if (!params.entityId || !params.text) {
                 throw new Error("Missing required parameters: entityId and text are required");

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

@@ -1,5 +1,6 @@
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentSessionContext } from './session-manager.js';
 import { logger } from "../utils/logger.js";
 /**
  * Duck-typed ToolInputError: openclaw 按 .name 字段匹配，不用 instanceof。
@@ -18,7 +19,6 @@ class ToolInputError extends Error {
  * Requires title and content parameters.
  */
 export function createNoteTool(ctx) {
-    const { config, sessionId, taskId, messageId } = ctx;
     return {
         name: "create_note",
         label: "Create Note",
@@ -45,6 +45,8 @@ export function createNoteTool(ctx) {
             required: ["title", "content"],
         },
         async execute(toolCallId, params) {
+            const _c = getCurrentSessionContext() ?? ctx;
+            const { config, sessionId, taskId, messageId } = _c;
             // Validate parameters — 抛 ToolInputError 而非普通 Error，
             // 让 openclaw 返回 400 而非 500，明确告知 LLM 这是参数错误，不应重试。
             if (typeof params.title !== "string" || !params.title) {

package/dist/src/tools/query-app-message-tool.js

@@ -1,6 +1,7 @@
 // QueryAppMessage tool implementation
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentSessionContext } from './session-manager.js';
 import { logger } from "../utils/logger.js";
 class ToolInputError extends Error {
     status = 400;
@@ -13,7 +14,6 @@ class ToolInputError extends Error {
  * 查询指定时间范围内的设备通知消息。
  */
 export function createQueryAppMessageTool(ctx) {
-    const { config, sessionId, taskId, messageId } = ctx;
     return {
         name: "query_app_message",
         label: "Query App Message",
@@ -47,6 +47,8 @@ c. 调用工具前需认真检查调用参数是否满足工具要求
             required: [],
         },
         async execute(toolCallId, params) {
+            const _c = getCurrentSessionContext() ?? ctx;
+            const { config, sessionId, taskId, messageId } = _c;
             const wsManager = getXYWebSocketManager(config);
             const intentParam = {};
             if (params.startTime !== undefined)

package/dist/src/tools/query-memory-data-tool.js

@@ -1,6 +1,7 @@
 // QueryMemoryData tool implementation
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentSessionContext } from './session-manager.js';
 import { logger } from "../utils/logger.js";
 class ToolInputError extends Error {
     status = 400;
@@ -27,7 +28,6 @@ const VALID_SUB_CATEGORIES = {
  * 查询存储在设备本地的结构化记忆数据。
  */
 export function createQueryMemoryDataTool(ctx) {
-    const { config, sessionId, taskId, messageId } = ctx;
     return {
         name: "query_memory_data",
         label: "Query Memory Data",
@@ -56,6 +56,8 @@ c. 调用工具前需认真检查调用参数是否满足工具要求
             required: [],
         },
         async execute(toolCallId, params) {
+            const _c = getCurrentSessionContext() ?? ctx;
+            const { config, sessionId, taskId, messageId } = _c;
             const { category, subCategory } = params;
             // Validate category
             if (category && !VALID_CATEGORIES.includes(category)) {

package/dist/src/tools/query-todo-task-tool.js

@@ -1,6 +1,7 @@
 // QueryTodoTask tool implementation
 import { getXYWebSocketManager } from "../client.js";
 import { sendCommand } from "../formatter.js";
+import { getCurrentSessionContext } from './session-manager.js';
 import { logger } from "../utils/logger.js";
 class ToolInputError extends Error {
     status = 400;
@@ -13,7 +14,6 @@ class ToolInputError extends Error {
  * 获取指定时间范围内的全局待办任务列表。
  */
 export function createQueryTodoTaskTool(ctx) {
-    const { config, sessionId, taskId, messageId } = ctx;
     return {
         name: "query_todo_task",
         label: "Query Todo Task",
@@ -44,6 +44,8 @@ d. 当只传入 startTime 时，返回该时间点之后的所有任务；当只
             required: [],
         },
         async execute(toolCallId, params) {
+            const _c = getCurrentSessionContext() ?? ctx;
+            const { config, sessionId, taskId, messageId } = _c;
             const { status } = params;
             if (status && !["all", "completed", "pending"].includes(status)) {
                 throw new ToolInputError('status 参数只能为 "all"、"completed" 或 "pending"');