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

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/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/session-manager.d.ts

@@ -35,11 +35,9 @@ export declare function getLatestSessionContext(): SessionContext | null;
  */
 export declare function runWithSessionContext<T>(context: SessionContext, callback: () => Promise<T>): Promise<T>;
 /**
- * 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.
+ * Get the current session context.
+ * Prefers AsyncLocalStorage (correct for concurrent sessions).
+ * Falls back to the global activeSessions Map when AsyncLocalStorage
+ * context is lost (e.g., pi-agent framework tool execution boundary).
  */
 export declare function getCurrentSessionContext(): SessionContext | null;

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

@@ -4,8 +4,15 @@ import { AsyncLocalStorage } from "async_hooks";
 import { configManager } from "../utils/config-manager.js";
 import { toolCallNudgeManager } from "../utils/tool-call-nudge-manager.js";
 import { getCurrentTaskId, getCurrentMessageId } from "../task-manager.js";
-// Map of sessionKey -> SessionContextWithRef
-const activeSessions = new Map();
+// Use globalThis to ensure a single Map instance across all module copies.
+// The xy_channel plugin may be loaded by openclaw from different module resolution
+// paths (plugin entry vs tool registration), causing session-manager.ts to be
+// instantiated multiple times. globalThis guarantees all code shares the same Map.
+const _g = globalThis;
+if (!_g.__xyActiveSessions) {
+    _g.__xyActiveSessions = new Map();
+}
+const activeSessions = _g.__xyActiveSessions;
 // AsyncLocalStorage for thread-safe session context isolation
 const asyncLocalStorage = new AsyncLocalStorage();
 /**
@@ -82,31 +89,53 @@ export function runWithSessionContext(context, callback) {
     return asyncLocalStorage.run(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.
+ * Get the current session context.
+ * Prefers AsyncLocalStorage (correct for concurrent sessions).
+ * Falls back to the global activeSessions Map when AsyncLocalStorage
+ * context is lost (e.g., pi-agent framework tool execution boundary).
  */
 export function getCurrentSessionContext() {
-    // 1. Get base context from AsyncLocalStorage
-    const context = asyncLocalStorage.getStore() ?? null;
-    if (!context) {
+    // 1. Try AsyncLocalStorage first (correct for concurrent sessions)
+    const alsContext = asyncLocalStorage.getStore() ?? null;
+    if (alsContext) {
+        return enrichWithLatestTaskInfo(alsContext);
+    }
+    // 2. Fallback: look up from global activeSessions Map
+    if (activeSessions.size === 0) {
+        return null;
+    }
+    // 2a. Single active session — return it directly
+    if (activeSessions.size === 1) {
+        const entry = activeSessions.values().next().value;
+        if (entry) {
+            const { refCount, ...context } = entry;
+            return enrichWithLatestTaskInfo(context);
+        }
         return null;
     }
-    // 2. Get latest taskId and messageId from task-manager
+    // 2b. Multiple sessions — match by taskId currently being processed
+    for (const entry of activeSessions.values()) {
+        const latestTaskId = getCurrentTaskId(entry.sessionId);
+        if (latestTaskId) {
+            const { refCount, ...context } = entry;
+            return enrichWithLatestTaskInfo(context);
+        }
+    }
+    return null;
+}
+/**
+ * Enrich a base session context with the latest taskId/messageId
+ * from task-manager (supports interruption scenarios).
+ */
+function enrichWithLatestTaskInfo(context) {
     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) {
-        // 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
     return context;
 }

package/package.json

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