@ynhcj/xiaoyi 2.1.8 → 2.1.9

package/dist/channel.js

@@ -364,102 +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("\n" + "=".repeat(60));
-                console.log(`XiaoYi: [CANCEL] Received cancel request`);
+                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");
-                // CRITICAL: Use dynamic require to get the latest runtime module after hot-reload
-                const { getXiaoYiRuntime } = require("./runtime");
-                const runtime = getXiaoYiRuntime();
-                // Build SessionKey to match the format used in message handler
-                const sessionKey = `xiaoyi:${resolvedAccount.accountId}:${data.sessionId}`;
-                // Try to abort the running agent using OpenClaw's internal API
+                // Try to abort the running agent by clearing session queues
+                // This prevents new messages from being queued and may interrupt streaming
                 try {
-                    // Try to load OpenClaw's internal abort function
-                    // Note: This requires the plugin to be run within OpenClaw's environment
-                    const abortEmbeddedPiRun = globalThis["__openclaw_abortEmbeddedPiRun"] ||
-                        (() => {
-                            try {
-                                const openclawPath = require.resolve("openclaw");
-                                const runsModule = require(`${openclawPath}/dist/agents/pi-embedded-runner/runs.js`);
-                                return runsModule.abortEmbeddedPiRun;
-                            }
-                            catch {
-                                return null;
-                            }
-                        })();
-                    if (!abortEmbeddedPiRun) {
-                        console.warn(`XiaoYi: [CANCEL] abortEmbeddedPiRun not available, falling back to event emission`);
-                        throw new Error("abortEmbeddedPiRun not available");
-                    }
-                    // Try to load session store functions
-                    const loadSessionStore = globalThis["__openclaw_loadSessionStore"] ||
-                        (() => {
-                            try {
-                                const openclawPath = require.resolve("openclaw");
-                                const sessionModule = require(`${openclawPath}/dist/config/sessions.js`);
-                                return sessionModule.loadSessionStore;
-                            }
-                            catch {
-                                return null;
-                            }
-                        })();
-                    const resolveStorePath = globalThis["__openclaw_resolveStorePath"] ||
-                        (() => {
-                            try {
-                                const openclawPath = require.resolve("openclaw");
-                                const sessionModule = require(`${openclawPath}/dist/config/sessions.js`);
-                                return sessionModule.resolveStorePath;
-                            }
-                            catch {
-                                return null;
-                            }
-                        })();
-                    if (!loadSessionStore || !resolveStorePath) {
-                        console.warn(`XiaoYi: [CANCEL] Session store functions not available`);
-                        throw new Error("Session store functions not available");
-                    }
-                    // Load session store and find the internal sessionId
-                    const agentId = resolvedAccount.config.agentId || "default";
-                    const storePath = resolveStorePath(config.session?.store, { agentId });
-                    const store = loadSessionStore(storePath);
-                    const sessionEntry = store[sessionKey];
-                    if (sessionEntry && sessionEntry.sessionId) {
-                        console.log(`XiaoYi: [CANCEL] Found session entry with internal sessionId: ${sessionEntry.sessionId}`);
-                        // Abort the running agent
-                        const aborted = abortEmbeddedPiRun(sessionEntry.sessionId);
-                        if (aborted) {
-                            console.log(`XiaoYi: [CANCEL] ✓ Successfully aborted agent run for session: ${data.sessionId}\n`);
+                    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;
                         }
-                        else {
-                            console.warn(`XiaoYi: [CANCEL] ⚠ No active run found for session: ${data.sessionId}\n`);
+                        catch {
+                            return null;
                         }
+                    })();
+                    if (clearSessionQueues) {
+                        const cleared = clearSessionQueues([sessionKey]);
+                        console.log(`XiaoYi: [CANCEL] Cleared session queues:`, cleared);
                     }
                     else {
-                        console.warn(`XiaoYi: [CANCEL] ⚠ No session entry found for key: ${sessionKey}\n`);
+                        console.log(`XiaoYi: [CANCEL] clearSessionQueues not available, skipping queue cleanup`);
                     }
                 }
                 catch (error) {
-                    console.error(`XiaoYi: [CANCEL] Error aborting agent:`, error);
-                    // Fallback: emit cancel event for any listeners
-                    const pluginRuntime = runtime.getPluginRuntime();
-                    if (pluginRuntime) {
-                        pluginRuntime.emit("task:cancel", {
-                            channel: "xiaoyi",
-                            accountId: resolvedAccount.accountId,
-                            taskId: data.taskId,
-                            sessionId: data.sessionId,
-                        });
-                        console.log(`XiaoYi: [CANCEL] Emitted task:cancel event as fallback\n`);
-                    }
-                }
-                // Send success response
-                const connection = runtime.getConnection();
-                if (connection) {
-                    await connection.sendCancelSuccessResponse(data.sessionId, data.taskId, data.id);
+                    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/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

@@ -379,21 +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) {
         // Use taskId if available, otherwise use id as the task identifier
         const effectiveTaskId = message.taskId || message.id;
-        console.log(`Received tasks/cancel message for task: ${effectiveTaskId}`);
+        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: 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.8",
+  "version": "2.1.9",
   "description": "XiaoYi channel plugin for OpenClaw",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",