@ynhcj/xiaoyi 2.1.7 → 2.1.8

package/dist/channel.js

@@ -365,19 +365,95 @@ exports.xiaoyiPlugin = {
             });
             // Setup cancel handler
             connection.on("cancel", async (data) => {
-                console.log(`Handling cancel request for task: ${data.taskId}`);
+                console.log("\n" + "=".repeat(60));
+                console.log(`XiaoYi: [CANCEL] Received cancel request`);
+                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();
-                // 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,
-                    });
+                // 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 {
+                    // 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`);
+                        }
+                        else {
+                            console.warn(`XiaoYi: [CANCEL] ⚠ No active run found for session: ${data.sessionId}\n`);
+                        }
+                    }
+                    else {
+                        console.warn(`XiaoYi: [CANCEL] ⚠ No session entry found for key: ${sessionKey}\n`);
+                    }
+                }
+                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();

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.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;
         }
@@ -373,11 +381,15 @@ class XiaoYiWebSocketManager extends events_1.EventEmitter {
      * Reference: https://developer.huawei.com/consumer/cn/doc/service/tasks-cancel-0000002537561193
      */
     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(`Received tasks/cancel message for task: ${effectiveTaskId}`);
+        console.log(`  Session: ${message.sessionId}`);
+        console.log(`  Message ID: ${message.id}`);
         // Emit cancel event for application to handle
         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

package/package.json

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