@ynhcj/xiaoyi-channel 0.0.29-beta → 0.0.31-beta

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

@@ -2,6 +2,18 @@ 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。
+ * 抛出此错误会让 openclaw 返回 HTTP 400 而非 500，
+ * LLM 会将其识别为参数错误而非瞬时故障，不会触发重试。
+ */
+class ToolInputError extends Error {
+    status = 400;
+    constructor(message) {
+        super(message);
+        this.name = "ToolInputError";
+    }
+}
 /**
  * XY note tool - creates a note on user's device.
  * Requires title and content parameters.
@@ -9,26 +21,35 @@ import { logger } from "../utils/logger.js";
 export const noteTool = {
     name: "create_note",
     label: "Create Note",
-    description: "在用户设备上创建备忘录。需要提供备忘录标题和内容。注意:操作超时时间为60秒,请勿重复调用此工具,如果超时或失败,最多重试一次。",
+    description: `在用户设备上创建备忘录。需要提供备忘录标题和内容。
+  注意:
+  a. 操作超时时间为60秒,请勿重复调用此工具
+  b. 如果遇到各类调用失败场景,最多只能重试一次，不可以重复调用多次。
+  c. 调用工具前需认真检查调用参数是否满足工具要求
+  `,
     parameters: {
         type: "object",
         properties: {
             title: {
                 type: "string",
-                description: "备忘录标题",
+                description: "备忘录标题，必填",
             },
             content: {
                 type: "string",
-                description: "备忘录内容",
+                description: "备忘录内容，必填",
             },
         },
         required: ["title", "content"],
     },
     async execute(toolCallId, params) {
         logger.debug("Executing note tool, toolCallId:", toolCallId);
-        // Validate parameters
-        if (!params.title || !params.content) {
-            throw new Error("Missing required parameters: title and content are required");
+        // Validate parameters — 抛 ToolInputError 而非普通 Error，
+        // 让 openclaw 返回 400 而非 500，明确告知 LLM 这是参数错误，不应重试。
+        if (typeof params.title !== "string" || !params.title) {
+            throw new ToolInputError("缺少必填参数 title（备忘录标题）");
+        }
+        if (typeof params.content !== "string" || !params.content) {
+            throw new ToolInputError("缺少必填参数 content（备忘录内容）");
         }
         // Get session context
         const sessionContext = getCurrentSessionContext();

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

@@ -37,5 +37,8 @@ export declare function runWithSessionContext<T>(context: SessionContext, callba
  * Get the current session context from AsyncLocalStorage.
  * This is the recommended way to access session context in tools.
  * Returns null if not running within a session context.
+ *
+ * Enhanced version: Automatically fetches the latest taskId from task-manager
+ * to support interruption scenarios where a new message updates the taskId.
  */
 export declare function getCurrentSessionContext(): SessionContext | null;

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

@@ -3,6 +3,7 @@
 import { AsyncLocalStorage } from "async_hooks";
 import { logger } from "../utils/logger.js";
 import { configManager } from "../utils/config-manager.js";
+import { getCurrentTaskId, getCurrentMessageId } from "../task-manager.js";
 // Map of sessionKey -> SessionContextWithRef
 const activeSessions = new Map();
 // AsyncLocalStorage for thread-safe session context isolation
@@ -116,16 +117,39 @@ export function runWithSessionContext(context, callback) {
  * Get the current session context from AsyncLocalStorage.
  * This is the recommended way to access session context in tools.
  * Returns null if not running within a session context.
+ *
+ * Enhanced version: Automatically fetches the latest taskId from task-manager
+ * to support interruption scenarios where a new message updates the taskId.
  */
 export function getCurrentSessionContext() {
+    // 1. Get base context from AsyncLocalStorage
     const context = asyncLocalStorage.getStore() ?? null;
-    if (context) {
-        logger.log(`[SESSION_MANAGER] ✅ Got current session context from AsyncLocalStorage`);
-        logger.log(`[SESSION_MANAGER]   - sessionId: ${context.sessionId}`);
-        logger.log(`[SESSION_MANAGER]   - taskId: ${context.taskId}`);
-    }
-    else {
+    if (!context) {
         logger.warn(`[SESSION_MANAGER] ⚠️  No session context in AsyncLocalStorage`);
+        return null;
+    }
+    // 2. Get latest taskId and messageId from task-manager
+    const latestTaskId = getCurrentTaskId(context.sessionId);
+    const latestMessageId = getCurrentMessageId(context.sessionId);
+    // 3. If task-manager has a newer taskId, use the latest value
+    if (latestTaskId && latestTaskId !== context.taskId) {
+        logger.log(`[SESSION_MANAGER] 🔄 TaskId updated (interruption detected)`);
+        logger.log(`[SESSION_MANAGER]   - sessionId: ${context.sessionId}`);
+        logger.log(`[SESSION_MANAGER]   - Old taskId: ${context.taskId}`);
+        logger.log(`[SESSION_MANAGER]   - New taskId: ${latestTaskId}`);
+        logger.log(`[SESSION_MANAGER]   - Old messageId: ${context.messageId}`);
+        logger.log(`[SESSION_MANAGER]   - New messageId: ${latestMessageId ?? context.messageId}`);
+        // Return updated context (create new object, don't modify original)
+        return {
+            ...context,
+            taskId: latestTaskId,
+            messageId: latestMessageId ?? context.messageId,
+        };
     }
+    // 4. No update needed, return original context
+    logger.log(`[SESSION_MANAGER] ✅ Got current session context from AsyncLocalStorage`);
+    logger.log(`[SESSION_MANAGER]   - sessionId: ${context.sessionId}`);
+    logger.log(`[SESSION_MANAGER]   - taskId: ${context.taskId}`);
+    logger.log(`[SESSION_MANAGER]   - messageId: ${context.messageId}`);
     return context;
 }

package/package.json

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