@ynhcj/xiaoyi 2.3.6 → 2.3.7

package/dist/websocket.d.ts

@@ -50,6 +50,14 @@ export declare class XiaoYiWebSocketManager extends EventEmitter {
      * Setup WebSocket event handlers for specific server
      */
     private setupWebSocketHandlers;
+    /**
+     * Extract sessionId from message based on method type
+     * Different methods have sessionId in different locations:
+     * - message/stream: sessionId in params
+     * - tasks/cancel: sessionId at top level
+     * - clearContext: sessionId at top level
+     */
+    private extractSessionId;
     /**
      * Handle incoming message from specific server
      */

package/dist/websocket.js

@@ -303,6 +303,26 @@ class XiaoYiWebSocketManager extends events_1.EventEmitter {
             }
         });
     }
+    /**
+     * Extract sessionId from message based on method type
+     * Different methods have sessionId in different locations:
+     * - message/stream: sessionId in params
+     * - tasks/cancel: sessionId at top level
+     * - clearContext: sessionId at top level
+     */
+    extractSessionId(message) {
+        // For message/stream, sessionId is in params
+        if (message.method === "message/stream") {
+            return message.params?.sessionId;
+        }
+        // For tasks/cancel and clearContext, sessionId is at top level
+        if (message.method === "tasks/cancel" ||
+            message.method === "clearContext" ||
+            message.action === "clear") {
+            return message.sessionId;
+        }
+        return undefined;
+    }
     /**
      * Handle incoming message from specific server
      */
@@ -319,10 +339,12 @@ class XiaoYiWebSocketManager extends events_1.EventEmitter {
                 console.warn(`[${sourceServer}] Mismatched agentId: ${message.agentId}, expected: ${this.config.agentId}. Discarding.`);
                 return;
             }
+            // Extract sessionId based on method type
+            const sessionId = this.extractSessionId(message);
             // Record session → server mapping
-            if (message.params.sessionId) {
-                this.sessionServerMap.set(message.params.sessionId, sourceServer);
-                console.log(`[MAP] Session ${message.params.sessionId} -> ${sourceServer}`);
+            if (sessionId) {
+                this.sessionServerMap.set(sessionId, sourceServer);
+                console.log(`[MAP] Session ${sessionId} -> ${sourceServer}`);
             }
             // Handle special messages (clearContext, tasks/cancel)
             if (message.method === "clearContext") {
@@ -476,16 +498,21 @@ class XiaoYiWebSocketManager extends events_1.EventEmitter {
      * Handle clearContext method
      */
     handleClearContext(message, sourceServer) {
-        console.log(`[${sourceServer}] Received clearContext for session: ${message.params.sessionId}`);
-        this.sendClearContextResponse(message.id, message.params.sessionId, true, sourceServer)
+        const sessionId = this.extractSessionId(message);
+        if (!sessionId) {
+            console.error(`[${sourceServer}] Failed to extract sessionId from clearContext message`);
+            return;
+        }
+        console.log(`[${sourceServer}] Received clearContext for session: ${sessionId}`);
+        this.sendClearContextResponse(message.id, sessionId, true, sourceServer)
             .catch(error => console.error(`[${sourceServer}] Failed to send clearContext response:`, error));
         this.emit("clear", {
-            sessionId: message.params.sessionId,
+            sessionId: sessionId,
             id: message.id,
             serverId: sourceServer,
         });
         // Remove session mapping
-        this.sessionServerMap.delete(message.params.sessionId);
+        this.sessionServerMap.delete(sessionId);
     }
     /**
      * Handle clear message (legacy format)
@@ -505,16 +532,21 @@ class XiaoYiWebSocketManager extends events_1.EventEmitter {
      * Handle tasks/cancel message
      */
     handleTasksCancelMessage(message, sourceServer) {
+        const sessionId = this.extractSessionId(message);
+        if (!sessionId) {
+            console.error(`[${sourceServer}] Failed to extract sessionId from tasks/cancel message`);
+            return;
+        }
         const effectiveTaskId = message.taskId || message.id;
         console.log("\n" + "=".repeat(60));
         console.log(`[${sourceServer}] Received cancel request`);
-        console.log(`  Session: ${message.sessionId}`);
+        console.log(`  Session: ${sessionId}`);
         console.log(`  Task ID: ${effectiveTaskId}`);
         console.log("=".repeat(60) + "\n");
-        this.sendTasksCancelResponse(message.id, message.sessionId, true, sourceServer)
+        this.sendTasksCancelResponse(message.id, sessionId, true, sourceServer)
             .catch(error => console.error(`[${sourceServer}] Failed to send cancel response:`, error));
         this.emit("cancel", {
-            sessionId: message.sessionId,
+            sessionId: sessionId,
             taskId: effectiveTaskId,
             id: message.id,
             serverId: sourceServer,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ynhcj/xiaoyi",
-  "version": "2.3.6",
+  "version": "2.3.7",
   "description": "XiaoYi channel plugin for OpenClaw",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",