@ynhcj/xiaoyi 2.0.6 → 2.0.8

package/dist/channel.js

@@ -211,39 +211,49 @@ exports.xiaoyiPlugin = {
                 const { getXiaoYiRuntime } = require("./runtime");
                 const runtime = getXiaoYiRuntime();
                 console.log(`XiaoYi: [Message Handler] Using runtime instance: ${runtime.getInstanceId()}`);
-                // Store sessionId -> taskId mapping in runtime
-                runtime.setTaskIdForSession(message.sessionId, message.id);
+                // Store sessionId -> taskId mapping in runtime (use params.id as taskId)
+                runtime.setTaskIdForSession(message.sessionId, message.params.id);
                 // Get PluginRuntime from our runtime wrapper
                 const pluginRuntime = runtime.getPluginRuntime();
                 if (!pluginRuntime) {
                     console.error("PluginRuntime not available");
                     return;
                 }
+                // Extract text content from parts array (ignore kind: "data" as per user request)
+                let bodyText = "";
+                for (const part of message.params.message.parts) {
+                    if (part.kind === "text" && part.text) {
+                        bodyText += part.text;
+                    }
+                    // TODO: Handle file parts if needed in the future
+                }
+                // Determine sender ID from role
+                const senderId = message.params.message.role === "user" ? "user" : message.agentId;
                 // Build MsgContext for OpenClaw's message pipeline
                 const msgContext = {
-                    Body: message.content.text || "",
-                    From: message.sender.id,
+                    Body: bodyText,
+                    From: senderId,
                     To: message.sessionId,
                     SessionKey: `xiaoyi:${resolvedAccount.accountId}:${message.sessionId}`,
                     AccountId: resolvedAccount.accountId,
-                    MessageSid: message.messageId,
-                    Timestamp: message.timestamp,
+                    MessageSid: message.id, // Use top-level id as message sequence number
+                    Timestamp: Date.now(), // Generate timestamp since new format doesn't include it
                     Provider: "xiaoyi",
                     Surface: "xiaoyi",
                     ChatType: "direct",
-                    SenderName: message.sender.name,
-                    SenderId: message.sender.id,
+                    SenderName: message.params.message.role, // Use role as sender name
+                    SenderId: senderId,
                     OriginatingChannel: "xiaoyi",
                 };
-                // Use the correct API to dispatch the message
+                // Use the correct API to dispatch the message (non-streaming mode)
                 try {
                     await pluginRuntime.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
                         ctx: msgContext,
                         cfg: config,
                         dispatcherOptions: {
                             deliver: async (payload) => {
-                                console.log("XiaoYi: Delivering final response:", payload);
-                                // Send final response back through WebSocket
+                                console.log("XiaoYi: Delivering final response:", payload.text?.substring(0, 100) + "...");
+                                // Send final response back through WebSocket (non-streaming, complete message)
                                 const taskId = runtime.getTaskIdForSession(message.sessionId) || `task_${Date.now()}`;
                                 const response = {
                                     sessionId: message.sessionId,
@@ -264,37 +274,13 @@ exports.xiaoyiPlugin = {
                                 const conn = runtime.getConnection();
                                 if (conn) {
                                     await conn.sendResponse(response, taskId, message.sessionId);
-                                    console.log("XiaoYi: Final response sent successfully");
+                                    console.log("XiaoYi: Final response sent successfully (non-streaming mode)");
                                 }
                             },
                         },
                         replyOptions: {
-                            // Enable streaming responses through onPartialReply callback
-                            onPartialReply: async (payload) => {
-                                console.log("XiaoYi: Streaming partial response:", payload.text?.substring(0, 50));
-                                // Send partial response back through WebSocket
-                                const taskId = runtime.getTaskIdForSession(message.sessionId) || `task_${Date.now()}`;
-                                const partialResponse = {
-                                    sessionId: message.sessionId,
-                                    messageId: `partial_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`,
-                                    timestamp: Date.now(),
-                                    agentId: resolvedAccount.config.agentId,
-                                    sender: {
-                                        id: resolvedAccount.config.agentId,
-                                        name: "OpenClaw Agent",
-                                        type: "agent",
-                                    },
-                                    content: {
-                                        type: "text",
-                                        text: payload.text || "",
-                                    },
-                                    status: "processing",
-                                };
-                                const conn = runtime.getConnection();
-                                if (conn) {
-                                    await conn.sendResponse(partialResponse, taskId, message.sessionId);
-                                }
-                            },
+                        // Disable streaming by removing onPartialReply callback
+                        // This ensures all responses are buffered and delivered only once at the end
                         },
                     });
                 }

package/dist/types.d.ts

@@ -1,26 +1,27 @@
 export interface A2ARequestMessage {
     agentId: string;
     sessionId: string;
+    jsonrpc: "2.0";
     id: string;
-    messageId: string;
-    timestamp: number;
-    sender: {
+    method: "message/stream";
+    params: {
         id: string;
-        name?: string;
-        type: "user" | "agent";
-    };
-    content: {
-        type: "text" | "image" | "audio" | "video" | "file";
-        text?: string;
-        mediaUrl?: string;
-        fileName?: string;
-        fileSize?: number;
-        mimeType?: string;
-    };
-    context?: {
-        conversationId?: string;
-        threadId?: string;
-        replyToMessageId?: string;
+        sessionId: string;
+        agentLoginSessionId?: string;
+        message: {
+            role: "user" | "agent";
+            parts: Array<{
+                kind: "text" | "file" | "data";
+                text?: string;
+                file?: {
+                    name: string;
+                    mimeType: string;
+                    bytes?: string;
+                    uri?: string;
+                };
+                data?: any;
+            }>;
+        };
     };
 }
 export interface A2AResponseMessage {

package/dist/websocket.d.ts

@@ -76,7 +76,7 @@ export declare class XiaoYiWebSocketManager extends EventEmitter {
      */
     sendCancelSuccessResponse(sessionId: string, taskId: string, requestId: string): Promise<void>;
     /**
-     * Type guard for A2A request messages
+     * Type guard for A2A request messages (JSON-RPC 2.0 format)
      */
     private isA2ARequestMessage;
     /**

package/dist/websocket.js

@@ -355,17 +355,21 @@ class XiaoYiWebSocketManager extends events_1.EventEmitter {
         this.activeTasks.delete(taskId);
     }
     /**
-     * Type guard for A2A request messages
+     * Type guard for A2A request messages (JSON-RPC 2.0 format)
      */
     isA2ARequestMessage(data) {
         return data &&
             typeof data.agentId === "string" &&
             typeof data.sessionId === "string" &&
+            data.jsonrpc === "2.0" &&
             typeof data.id === "string" &&
-            typeof data.messageId === "string" &&
-            typeof data.timestamp === "number" &&
-            data.sender &&
-            data.content;
+            data.method === "message/stream" &&
+            data.params &&
+            typeof data.params.id === "string" &&
+            typeof data.params.sessionId === "string" &&
+            data.params.message &&
+            typeof data.params.message.role === "string" &&
+            Array.isArray(data.params.message.parts);
     }
     /**
      * Start protocol-level heartbeat (ping/pong)

package/package.json

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