@ynhcj/xiaoyi 2.3.5 → 2.3.7

package/dist/channel.js

@@ -315,6 +315,10 @@ exports.xiaoyiPlugin = {
                     const taskId = runtime.getTaskIdForSession(message.params.sessionId) || `task_${Date.now()}`;
                     const startTime = Date.now();
                     let accumulatedText = "";
+                    // ==================== CREATE ABORT CONTROLLER ====================
+                    // Create AbortController for this session to allow cancelation
+                    const { controller: abortController, signal: abortSignal } = runtime.createAbortControllerForSession(message.params.sessionId);
+                    // ================================================================
                     // ==================== START TIMEOUT PROTECTION ====================
                     // Start 60-second timeout timer
                     const timeoutConfig = runtime.getTimeoutConfig();
@@ -366,6 +370,16 @@ exports.xiaoyiPlugin = {
                                 const elapsed = Date.now() - startTime;
                                 const completeText = payload.text || "";
                                 accumulatedText = completeText;
+                                // Check if session was aborted
+                                if (runtime.isSessionAborted(message.params.sessionId)) {
+                                    console.log("\n" + "=".repeat(60));
+                                    console.log(`[ABORT] Response received AFTER abort`);
+                                    console.log(`  Session: ${message.params.sessionId}`);
+                                    console.log(`  Elapsed: ${elapsed}ms`);
+                                    console.log(`  Action: DISCARDING (session was canceled)`);
+                                    console.log("=".repeat(60) + "\n");
+                                    return;
+                                }
                                 // ==================== CHECK TIMEOUT ====================
                                 // If timeout already sent, discard this response
                                 if (runtime.isSessionTimeout(message.params.sessionId)) {
@@ -433,6 +447,7 @@ exports.xiaoyiPlugin = {
                                 // If empty, keep timeout running to handle session conflict
                                 if (accumulatedText.length > 0) {
                                     runtime.markSessionCompleted(message.params.sessionId);
+                                    runtime.clearAbortControllerForSession(message.params.sessionId);
                                     console.log(`[TIMEOUT] Timeout cleared (valid response)\n`);
                                 }
                                 else {
@@ -441,7 +456,9 @@ exports.xiaoyiPlugin = {
                                 console.log("=".repeat(60) + "\n");
                             },
                         },
-                        replyOptions: undefined,
+                        replyOptions: {
+                            abortSignal: abortSignal, // Pass abort signal to allow cancellation
+                        },
                         images: images.length > 0 ? images : undefined,
                     });
                 }
@@ -449,18 +466,29 @@ exports.xiaoyiPlugin = {
                     console.error("XiaoYi: [ERROR] Error dispatching message:", error);
                     // Clear timeout on error
                     runtime.clearSessionTimeout(message.params.sessionId);
+                    // Clear abort controller on error
+                    runtime.clearAbortControllerForSession(message.params.sessionId);
                 }
             });
             // Setup cancel handler
-            // Note: The response is already sent in websocket.ts, this is just for logging
+            // When tasks/cancel is received, abort the current session's agent run
             connection.on("cancel", async (data) => {
+                const { sessionId } = data;
                 console.log("\n" + "=".repeat(60));
-                console.log(`XiaoYi: [CANCEL] Cancel event received (response already sent)`);
-                console.log(`  Session: ${data.sessionId}`);
+                console.log(`XiaoYi: [CANCEL] Cancel event received`);
+                console.log(`  Session: ${sessionId}`);
                 console.log(`  Task ID: ${data.taskId || "N/A"}`);
                 console.log("=".repeat(60) + "\n");
-                // NOTE: The cancel response has already been sent to XiaoYi in websocket.ts.
-                // Actual cancellation of the agent run depends on OpenClaw's internal mechanisms.
+                // Abort the session's agent run
+                const aborted = runtime.abortSession(sessionId);
+                if (aborted) {
+                    console.log(`[CANCEL] Successfully triggered abort for session ${sessionId}`);
+                }
+                else {
+                    console.log(`[CANCEL] No active agent run found for session ${sessionId}`);
+                }
+                // Clear timeout as the session is being canceled
+                runtime.markSessionCompleted(sessionId);
             });
             console.log("XiaoYi: Event handlers registered");
             console.log("XiaoYi: startAccount() completed - END");

package/dist/runtime.d.ts

@@ -21,6 +21,7 @@ export declare class XiaoYiRuntime {
     private sessionTimeoutMap;
     private sessionTimeoutSent;
     private timeoutConfig;
+    private sessionAbortControllerMap;
     constructor();
     getInstanceId(): string;
     /**
@@ -97,6 +98,36 @@ export declare class XiaoYiRuntime {
      * Clear taskId for a session
      */
     clearTaskIdForSession(sessionId: string): void;
+    /**
+     * Create and register an AbortController for a session
+     * @param sessionId - Session ID
+     * @returns The AbortController and its signal
+     */
+    createAbortControllerForSession(sessionId: string): {
+        controller: AbortController;
+        signal: AbortSignal;
+    };
+    /**
+     * Abort a session's agent run
+     * @param sessionId - Session ID
+     * @returns true if a controller was found and aborted, false otherwise
+     */
+    abortSession(sessionId: string): boolean;
+    /**
+     * Check if a session has been aborted
+     * @param sessionId - Session ID
+     * @returns true if the session's abort signal was triggered
+     */
+    isSessionAborted(sessionId: string): boolean;
+    /**
+     * Clear the AbortController for a session (call when agent completes successfully)
+     * @param sessionId - Session ID
+     */
+    clearAbortControllerForSession(sessionId: string): void;
+    /**
+     * Clear all AbortControllers
+     */
+    clearAllAbortControllers(): void;
 }
 export declare function getXiaoYiRuntime(): XiaoYiRuntime;
 export declare function setXiaoYiRuntime(runtime: any): void;

package/dist/runtime.js

@@ -26,6 +26,8 @@ class XiaoYiRuntime {
         this.sessionTimeoutMap = new Map();
         this.sessionTimeoutSent = new Set();
         this.timeoutConfig = DEFAULT_TIMEOUT_CONFIG;
+        // AbortController management for canceling agent runs
+        this.sessionAbortControllerMap = new Map();
         this.instanceId = `runtime_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
         console.log(`XiaoYi: Created new runtime instance: ${this.instanceId}`);
     }
@@ -100,6 +102,8 @@ class XiaoYiRuntime {
         this.sessionToTaskIdMap.clear();
         // Clear all timeouts
         this.clearAllTimeouts();
+        // Clear all abort controllers
+        this.clearAllAbortControllers();
     }
     /**
      * Set timeout configuration
@@ -220,6 +224,62 @@ class XiaoYiRuntime {
     clearTaskIdForSession(sessionId) {
         this.sessionToTaskIdMap.delete(sessionId);
     }
+    /**
+     * Create and register an AbortController for a session
+     * @param sessionId - Session ID
+     * @returns The AbortController and its signal
+     */
+    createAbortControllerForSession(sessionId) {
+        // Abort any existing controller for this session
+        this.abortSession(sessionId);
+        const controller = new AbortController();
+        this.sessionAbortControllerMap.set(sessionId, controller);
+        console.log(`[ABORT] Created AbortController for session ${sessionId}`);
+        return { controller, signal: controller.signal };
+    }
+    /**
+     * Abort a session's agent run
+     * @param sessionId - Session ID
+     * @returns true if a controller was found and aborted, false otherwise
+     */
+    abortSession(sessionId) {
+        const controller = this.sessionAbortControllerMap.get(sessionId);
+        if (controller) {
+            console.log(`[ABORT] Aborting session ${sessionId}`);
+            controller.abort();
+            this.sessionAbortControllerMap.delete(sessionId);
+            return true;
+        }
+        console.log(`[ABORT] No AbortController found for session ${sessionId}`);
+        return false;
+    }
+    /**
+     * Check if a session has been aborted
+     * @param sessionId - Session ID
+     * @returns true if the session's abort signal was triggered
+     */
+    isSessionAborted(sessionId) {
+        const controller = this.sessionAbortControllerMap.get(sessionId);
+        return controller ? controller.signal.aborted : false;
+    }
+    /**
+     * Clear the AbortController for a session (call when agent completes successfully)
+     * @param sessionId - Session ID
+     */
+    clearAbortControllerForSession(sessionId) {
+        const controller = this.sessionAbortControllerMap.get(sessionId);
+        if (controller) {
+            this.sessionAbortControllerMap.delete(sessionId);
+            console.log(`[ABORT] Cleared AbortController for session ${sessionId}`);
+        }
+    }
+    /**
+     * Clear all AbortControllers
+     */
+    clearAllAbortControllers() {
+        this.sessionAbortControllerMap.clear();
+        console.log("[ABORT] All AbortControllers cleared");
+    }
 }
 exports.XiaoYiRuntime = XiaoYiRuntime;
 // Global runtime instance - use global object to survive module reloads

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.5",
+  "version": "2.3.7",
   "description": "XiaoYi channel plugin for OpenClaw",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",