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

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.30-beta",
   "description": "OpenClaw Xiaoyi Channel plugin - Xiaoyi A2A protocol integration",
   "type": "module",
   "main": "./dist/index.js",