@ynhcj/xiaoyi 2.3.6 → 2.3.8

package/dist/channel.js

@@ -214,8 +214,10 @@ exports.xiaoyiPlugin = {
                 const { getXiaoYiRuntime } = require("./runtime");
                 const runtime = getXiaoYiRuntime();
                 console.log(`XiaoYi: [Message Handler] Using runtime instance: ${runtime.getInstanceId()}`);
+                // For message/stream, sessionId is ONLY in params
+                const sessionId = message.params.sessionId;
                 // Store sessionId -> taskId mapping in runtime (use params.id as taskId)
-                runtime.setTaskIdForSession(message.params.sessionId, message.params.id);
+                runtime.setTaskIdForSession(sessionId, message.params.id);
                 // Get PluginRuntime from our runtime wrapper
                 const pluginRuntime = runtime.getPluginRuntime();
                 if (!pluginRuntime) {
@@ -291,8 +293,8 @@ exports.xiaoyiPlugin = {
                 const msgContext = {
                     Body: bodyText,
                     From: senderId,
-                    To: message.params.sessionId,
-                    SessionKey: `xiaoyi:${resolvedAccount.accountId}:${message.params.sessionId}`,
+                    To: sessionId,
+                    SessionKey: `xiaoyi:${resolvedAccount.accountId}:${sessionId}`,
                     AccountId: resolvedAccount.accountId,
                     MessageSid: message.id, // Use top-level id as message sequence number
                     Timestamp: Date.now(), // Generate timestamp since new format doesn't include it
@@ -307,34 +309,34 @@ exports.xiaoyiPlugin = {
                 try {
                     console.log("\n" + "=".repeat(60));
                     console.log(`XiaoYi: [MESSAGE] Processing user message`);
-                    console.log(`  Session: ${message.params.sessionId}`);
+                    console.log(`  Session: ${sessionId}`);
                     console.log(`  Task ID: ${message.params.id}`);
                     console.log(`  User input: ${bodyText.substring(0, 50)}${bodyText.length > 50 ? "..." : ""}`);
                     console.log(`  Images: ${images.length}`);
                     console.log("=".repeat(60) + "\n");
-                    const taskId = runtime.getTaskIdForSession(message.params.sessionId) || `task_${Date.now()}`;
+                    const taskId = runtime.getTaskIdForSession(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);
+                    const { controller: abortController, signal: abortSignal } = runtime.createAbortControllerForSession(sessionId);
                     // ================================================================
                     // ==================== START TIMEOUT PROTECTION ====================
                     // Start 60-second timeout timer
                     const timeoutConfig = runtime.getTimeoutConfig();
-                    console.log(`[TIMEOUT] Starting ${timeoutConfig.duration}ms timeout protection for session ${message.params.sessionId}`);
-                    runtime.setTimeoutForSession(message.params.sessionId, async () => {
+                    console.log(`[TIMEOUT] Starting ${timeoutConfig.duration}ms timeout protection for session ${sessionId}`);
+                    runtime.setTimeoutForSession(sessionId, async () => {
                         // Timeout callback - send timeout message to user
                         const elapsed = Date.now() - startTime;
                         console.log("\n" + "=".repeat(60));
-                        console.log(`[TIMEOUT] Timeout triggered for session ${message.params.sessionId}`);
+                        console.log(`[TIMEOUT] Timeout triggered for session ${sessionId}`);
                         console.log(`  Elapsed: ${elapsed}ms`);
                         console.log(`  Task ID: ${taskId}`);
                         console.log("=".repeat(60) + "\n");
                         const conn = runtime.getConnection();
                         if (conn) {
                             const timeoutResponse = {
-                                sessionId: message.params.sessionId,
+                                sessionId: sessionId,
                                 messageId: `timeout_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`,
                                 timestamp: Date.now(),
                                 agentId: resolvedAccount.config.agentId,
@@ -350,8 +352,8 @@ exports.xiaoyiPlugin = {
                                 status: "success",
                             };
                             try {
-                                await conn.sendResponse(timeoutResponse, taskId, message.params.sessionId, true, false);
-                                console.log(`[TIMEOUT] Timeout message sent successfully to session ${message.params.sessionId}\n`);
+                                await conn.sendResponse(timeoutResponse, taskId, sessionId, true, false);
+                                console.log(`[TIMEOUT] Timeout message sent successfully to session ${sessionId}\n`);
                             }
                             catch (error) {
                                 console.error(`[TIMEOUT] Failed to send timeout message:`, error);
@@ -371,10 +373,10 @@ exports.xiaoyiPlugin = {
                                 const completeText = payload.text || "";
                                 accumulatedText = completeText;
                                 // Check if session was aborted
-                                if (runtime.isSessionAborted(message.params.sessionId)) {
+                                if (runtime.isSessionAborted(sessionId)) {
                                     console.log("\n" + "=".repeat(60));
                                     console.log(`[ABORT] Response received AFTER abort`);
-                                    console.log(`  Session: ${message.params.sessionId}`);
+                                    console.log(`  Session: ${sessionId}`);
                                     console.log(`  Elapsed: ${elapsed}ms`);
                                     console.log(`  Action: DISCARDING (session was canceled)`);
                                     console.log("=".repeat(60) + "\n");
@@ -382,10 +384,10 @@ exports.xiaoyiPlugin = {
                                 }
                                 // ==================== CHECK TIMEOUT ====================
                                 // If timeout already sent, discard this response
-                                if (runtime.isSessionTimeout(message.params.sessionId)) {
+                                if (runtime.isSessionTimeout(sessionId)) {
                                     console.log("\n" + "=".repeat(60));
                                     console.log(`[TIMEOUT] Response received AFTER timeout`);
-                                    console.log(`  Session: ${message.params.sessionId}`);
+                                    console.log(`  Session: ${sessionId}`);
                                     console.log(`  Elapsed: ${elapsed}ms`);
                                     console.log(`  Action: DISCARDING (timeout message already sent)`);
                                     console.log("=".repeat(60) + "\n");
@@ -396,7 +398,7 @@ exports.xiaoyiPlugin = {
                                 if (!completeText || completeText.length === 0) {
                                     console.log("\n" + "=".repeat(60));
                                     console.log(`[TIMEOUT] Empty response detected`);
-                                    console.log(`  Session: ${message.params.sessionId}`);
+                                    console.log(`  Session: ${sessionId}`);
                                     console.log(`  Elapsed: ${elapsed}ms`);
                                     console.log(`  Action: KEEPING TIMEOUT (session conflict detected)`);
                                     console.log("=".repeat(60) + "\n");
@@ -411,7 +413,7 @@ exports.xiaoyiPlugin = {
                                 console.log("-".repeat(60) + "\n");
                                 // Send final response to XiaoYi
                                 const response = {
-                                    sessionId: message.params.sessionId,
+                                    sessionId: sessionId,
                                     messageId: `msg_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`,
                                     timestamp: Date.now(),
                                     agentId: resolvedAccount.config.agentId,
@@ -428,14 +430,14 @@ exports.xiaoyiPlugin = {
                                 };
                                 const conn = runtime.getConnection();
                                 if (conn) {
-                                    await conn.sendResponse(response, taskId, message.params.sessionId, true, false);
+                                    await conn.sendResponse(response, taskId, sessionId, true, false);
                                     console.log(`✓ XiaoYi: Response sent successfully\n`);
                                 }
                                 else {
                                     console.error(`✗ XiaoYi: Connection not available\n`);
                                 }
                                 // Clear timeout as response was sent successfully
-                                runtime.markSessionCompleted(message.params.sessionId);
+                                runtime.markSessionCompleted(sessionId);
                             },
                             onIdle: async () => {
                                 const elapsed = Date.now() - startTime;
@@ -446,8 +448,8 @@ exports.xiaoyiPlugin = {
                                 // Only clear timeout if we have a valid response
                                 // If empty, keep timeout running to handle session conflict
                                 if (accumulatedText.length > 0) {
-                                    runtime.markSessionCompleted(message.params.sessionId);
-                                    runtime.clearAbortControllerForSession(message.params.sessionId);
+                                    runtime.markSessionCompleted(sessionId);
+                                    runtime.clearAbortControllerForSession(sessionId);
                                     console.log(`[TIMEOUT] Timeout cleared (valid response)\n`);
                                 }
                                 else {
@@ -465,9 +467,9 @@ exports.xiaoyiPlugin = {
                 catch (error) {
                     console.error("XiaoYi: [ERROR] Error dispatching message:", error);
                     // Clear timeout on error
-                    runtime.clearSessionTimeout(message.params.sessionId);
+                    runtime.clearSessionTimeout(sessionId);
                     // Clear abort controller on error
-                    runtime.clearAbortControllerForSession(message.params.sessionId);
+                    runtime.clearAbortControllerForSession(sessionId);
                 }
             });
             // Setup cancel handler

package/dist/types.d.ts

@@ -3,11 +3,14 @@ export interface A2ARequestMessage {
     jsonrpc: "2.0";
     id: string;
     method: "message/stream";
+    deviceId?: string;
     params: {
         id: string;
         sessionId: string;
         agentLoginSessionId?: string;
         message: {
+            kind?: string;
+            messageId?: string;
             role: "user" | "agent";
             parts: Array<{
                 kind: "text" | "file" | "data";

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 ONLY in params
+     * - tasks/cancel: sessionId at top level
+     * - clearContext: sessionId at top level
+     */
+    private extractSessionId;
     /**
      * Handle incoming message from specific server
      */
@@ -128,6 +136,7 @@ export declare class XiaoYiWebSocketManager extends EventEmitter {
     private clearStableConnectionCheck;
     /**
      * Type guard for A2A request messages
+     * For message/stream, sessionId MUST be in params
      */
     private isA2ARequestMessage;
     /**

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 ONLY in params
+     * - tasks/cancel: sessionId at top level
+     * - clearContext: sessionId at top level
+     */
+    extractSessionId(message) {
+        // For message/stream, sessionId is ONLY 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,
@@ -766,6 +798,7 @@ class XiaoYiWebSocketManager extends events_1.EventEmitter {
     }
     /**
      * Type guard for A2A request messages
+     * For message/stream, sessionId MUST be in params
      */
     isA2ARequestMessage(data) {
         return data &&
@@ -775,6 +808,7 @@ class XiaoYiWebSocketManager extends events_1.EventEmitter {
             data.method === "message/stream" &&
             data.params &&
             typeof data.params.id === "string" &&
+            // For message/stream, sessionId MUST be in params
             typeof data.params.sessionId === "string" &&
             data.params.message &&
             typeof data.params.message.role === "string" &&

package/package.json

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