@ynhcj/xiaoyi 2.3.9 → 2.4.1

package/dist/channel.js

@@ -214,8 +214,13 @@ exports.xiaoyiPlugin = {
                 const { getXiaoYiRuntime } = require("./runtime");
                 const runtime = getXiaoYiRuntime();
                 console.log(`XiaoYi: [Message Handler] Using runtime instance: ${runtime.getInstanceId()}`);
-                // For message/stream, prioritize params.sessionId, fallback to top-level sessionid
-                const sessionId = message.params.sessionId || message.sessionid;
+                // For message/stream, prioritize params.sessionId, fallback to top-level sessionId
+                const sessionId = message.params?.sessionId || message.sessionId;
+                // Validate sessionId exists
+                if (!sessionId) {
+                    console.error("XiaoYi: Missing sessionId in message, cannot process");
+                    return;
+                }
                 // Store sessionId -> taskId mapping in runtime (use params.id as taskId)
                 runtime.setTaskIdForSession(sessionId, message.params.id);
                 // Get PluginRuntime from our runtime wrapper

package/dist/types.d.ts

@@ -4,9 +4,11 @@ export interface A2ARequestMessage {
     id: string;
     method: "message/stream";
     deviceId?: string;
+    conversationId?: string;
+    sessionId?: string;
     params: {
         id: string;
-        sessionId: string;
+        sessionId?: string;
         agentLoginSessionId?: string;
         message: {
             kind?: string;

package/dist/websocket.d.ts

@@ -53,7 +53,7 @@ export declare class XiaoYiWebSocketManager extends EventEmitter {
     /**
      * Extract sessionId from message based on method type
      * Different methods have sessionId in different locations:
-     * - message/stream: sessionId ONLY in params
+     * - message/stream: sessionId in params, fallback to top-level sessionId
      * - tasks/cancel: sessionId at top level
      * - clearContext: sessionId at top level
      */
@@ -136,7 +136,7 @@ export declare class XiaoYiWebSocketManager extends EventEmitter {
     private clearStableConnectionCheck;
     /**
      * Type guard for A2A request messages
-     * For message/stream, sessionId MUST be in params
+     * sessionId can be in params OR at top level (fallback)
      */
     private isA2ARequestMessage;
     /**

package/dist/websocket.js

@@ -306,14 +306,14 @@ 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
+     * - message/stream: sessionId in params, fallback to top-level sessionId
      * - tasks/cancel: sessionId at top level
      * - clearContext: sessionId at top level
      */
     extractSessionId(message) {
-        // For message/stream, sessionId is ONLY in params
+        // For message/stream, prioritize params.sessionId, fallback to top-level sessionId
         if (message.method === "message/stream") {
-            return message.params?.sessionId;
+            return message.params?.sessionId || message.sessionId;
         }
         // For tasks/cancel and clearContext, sessionId is at top level
         if (message.method === "tasks/cancel" ||
@@ -361,9 +361,10 @@ class XiaoYiWebSocketManager extends events_1.EventEmitter {
             }
             // Handle regular A2A request
             if (this.isA2ARequestMessage(message)) {
-                // Store task for potential cancellation
+                // Store task for potential cancellation (support params.sessionId or top-level sessionId)
+                const sessionId = message.params?.sessionId || message.sessionId;
                 this.activeTasks.set(message.id, {
-                    sessionId: message.params.sessionId,
+                    sessionId: sessionId,
                     timestamp: Date.now(),
                 });
                 // Emit with server info
@@ -798,7 +799,7 @@ class XiaoYiWebSocketManager extends events_1.EventEmitter {
     }
     /**
      * Type guard for A2A request messages
-     * For message/stream, sessionId MUST be in params
+     * sessionId can be in params OR at top level (fallback)
      */
     isA2ARequestMessage(data) {
         return data &&
@@ -808,8 +809,8 @@ 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" &&
+            // sessionId can be in params OR at top level
+            (typeof data.params.sessionId === "string" || typeof data.sessionId === "string") &&
             data.params.message &&
             typeof data.params.message.role === "string" &&
             Array.isArray(data.params.message.parts);

package/package.json

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