@ynhcj/xiaoyi 2.1.7 → 2.1.9

package/dist/channel.js

@@ -364,26 +364,44 @@ exports.xiaoyiPlugin = {
                 }
             });
             // Setup cancel handler
+            // Note: The response is already sent in websocket.ts, this is just for additional handling
             connection.on("cancel", async (data) => {
-                console.log(`Handling cancel request for task: ${data.taskId}`);
-                // CRITICAL: Use dynamic require to get the latest runtime module after hot-reload
-                const { getXiaoYiRuntime } = require("./runtime");
-                const runtime = getXiaoYiRuntime();
-                // Get PluginRuntime and emit cancel event
-                const pluginRuntime = runtime.getPluginRuntime();
-                if (pluginRuntime) {
-                    pluginRuntime.emit("task:cancel", {
-                        channel: "xiaoyi",
-                        accountId: resolvedAccount.accountId,
-                        taskId: data.taskId,
-                        sessionId: data.sessionId,
-                    });
+                console.log("\n" + "=".repeat(60));
+                console.log(`XiaoYi: [CANCEL] Cancel event received (response already sent)`);
+                console.log(`  Session: ${data.sessionId}`);
+                console.log(`  Task ID: ${data.taskId || "N/A"}`);
+                console.log("=".repeat(60) + "\n");
+                // Try to abort the running agent by clearing session queues
+                // This prevents new messages from being queued and may interrupt streaming
+                try {
+                    const sessionKey = `xiaoyi:${resolvedAccount.accountId}:${data.sessionId}`;
+                    // Try to load and use clearSessionQueues from OpenClaw at runtime
+                    // Use require() instead of import to avoid TypeScript compilation errors
+                    const clearSessionQueues = (() => {
+                        try {
+                            // Try direct require first (works when openclaw is installed as dependency)
+                            const queueModule = require("openclaw/dist/auto-reply/reply/queue.js");
+                            return queueModule.clearSessionQueues;
+                        }
+                        catch {
+                            return null;
+                        }
+                    })();
+                    if (clearSessionQueues) {
+                        const cleared = clearSessionQueues([sessionKey]);
+                        console.log(`XiaoYi: [CANCEL] Cleared session queues:`, cleared);
+                    }
+                    else {
+                        console.log(`XiaoYi: [CANCEL] clearSessionQueues not available, skipping queue cleanup`);
+                    }
                 }
-                // Send success response
-                const connection = runtime.getConnection();
-                if (connection) {
-                    await connection.sendCancelSuccessResponse(data.sessionId, data.taskId, data.id);
+                catch (error) {
+                    console.log(`XiaoYi: [CANCEL] Could not clear session queues:`, error);
                 }
+                // NOTE: True cancellation of the in-progress agent run requires OpenClaw's internal
+                // abortEmbeddedPiRun function, which needs the internal sessionId from session store.
+                // This channel plugin acknowledges the cancel request, but actual agent interruption
+                // depends on OpenClaw's internal mechanisms.
             });
             console.log("XiaoYi: Event handlers registered");
             console.log("XiaoYi: startAccount() completed - END");

package/dist/types.d.ts

@@ -104,6 +104,7 @@ export interface A2AClearContextResult {
     };
 }
 export interface A2ATasksCancelResult {
+    id: string;
     status: {
         state: "canceled" | "failed" | "unknown";
     };
@@ -131,9 +132,12 @@ export interface A2ATasksCancelMessage {
     agentId: string;
     sessionId: string;
     id: string;
-    action: "tasks/cancel";
-    taskId: string;
-    timestamp: number;
+    action?: "tasks/cancel";
+    method?: "tasks/cancel";
+    taskId?: string;
+    jsonrpc?: "2.0";
+    conversationId?: string;
+    timestamp?: number;
 }
 export interface XiaoYiChannelConfig {
     enabled: boolean;

package/dist/websocket.d.ts

@@ -78,6 +78,10 @@ export declare class XiaoYiWebSocketManager extends EventEmitter {
     /**
      * Handle A2A tasks/cancel message
      * Reference: https://developer.huawei.com/consumer/cn/doc/service/tasks-cancel-0000002537561193
+     *
+     * Simplified implementation similar to clearContext:
+     * 1. Send success response immediately
+     * 2. Emit cancel event for application to handle
      */
     private handleTasksCancelMessage;
     /**

package/dist/websocket.js

@@ -165,10 +165,18 @@ class XiaoYiWebSocketManager extends events_1.EventEmitter {
             jsonrpc: "2.0",
             id: requestId,
             result: {
+                id: requestId, // 使用请求中的该字段返回
                 status: {
                     state: success ? "canceled" : "failed"
                 }
             },
+            error: success ? {
+                code: 0,
+                message: ""
+            } : {
+                code: -1,
+                message: "Failed to cancel task"
+            },
         };
         const message = {
             msgType: "agent_response",
@@ -334,8 +342,8 @@ class XiaoYiWebSocketManager extends events_1.EventEmitter {
             this.handleClearMessage(message);
             return;
         }
-        // Check if it's a tasks/cancel message
-        if (message.action === "tasks/cancel") {
+        // Check if it's a tasks/cancel message (支持 method 和 action 两种格式)
+        if (message.method === "tasks/cancel" || message.action === "tasks/cancel") {
             this.handleTasksCancelMessage(message);
             return;
         }
@@ -371,17 +379,33 @@ class XiaoYiWebSocketManager extends events_1.EventEmitter {
     /**
      * Handle A2A tasks/cancel message
      * Reference: https://developer.huawei.com/consumer/cn/doc/service/tasks-cancel-0000002537561193
+     *
+     * Simplified implementation similar to clearContext:
+     * 1. Send success response immediately
+     * 2. Emit cancel event for application to handle
      */
     handleTasksCancelMessage(message) {
-        console.log(`Received tasks/cancel message for task: ${message.taskId}`);
+        // Use taskId if available, otherwise use id as the task identifier
+        const effectiveTaskId = message.taskId || message.id;
+        console.log(`\n============================================================`);
+        console.log(`XiaoYi: [CANCEL] Received cancel request`);
+        console.log(`  Session: ${message.sessionId}`);
+        console.log(`  Task ID: ${effectiveTaskId}`);
+        console.log(`  Message ID: ${message.id}`);
+        console.log(`===========================================================\n`);
+        // Send success response immediately (similar to clearContext)
+        this.sendTasksCancelResponse(message.id, message.sessionId, true).catch(error => {
+            console.error("Failed to send tasks/cancel response:", error);
+        });
         // Emit cancel event for application to handle
+        // The application can decide how to handle the cancellation
         this.emit("cancel", {
             sessionId: message.sessionId,
-            taskId: message.taskId,
+            taskId: effectiveTaskId,
             id: message.id,
         });
-        // Note: We'll send the success response after OpenClaw confirms cancellation
-        // This will be handled by the channel plugin
+        // Remove from active tasks
+        this.activeTasks.delete(effectiveTaskId);
     }
     /**
      * Send tasks/cancel success response

package/package.json

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