@ynhcj/xiaoyi 2.0.2 → 2.0.4

package/dist/channel.js

@@ -197,6 +197,7 @@ exports.xiaoyiPlugin = {
             console.log("XiaoYi: startAccount() called - START");
             const runtime = (0, runtime_1.getXiaoYiRuntime)();
             const resolvedAccount = ctx.account;
+            const config = ctx.cfg;
             // Start WebSocket connection (single account mode)
             await runtime.start(resolvedAccount.config);
             // Setup message handler IMMEDIATELY after connection is established
@@ -214,39 +215,64 @@ exports.xiaoyiPlugin = {
                 runtime.setTaskIdForSession(message.sessionId, message.id);
                 // Get PluginRuntime from our runtime wrapper
                 const pluginRuntime = runtime.getPluginRuntime();
-                console.log(`XiaoYi: PluginRuntime type: ${typeof pluginRuntime}`);
-                console.log(`XiaoYi: PluginRuntime.channel type: ${typeof pluginRuntime?.channel}`);
-                console.log(`XiaoYi: PluginRuntime.channel.reply type: ${typeof pluginRuntime?.channel?.reply}`);
-                console.log(`XiaoYi: PluginRuntime.channel.reply.handleInboundMessage type: ${typeof pluginRuntime?.channel?.reply?.handleInboundMessage}`);
-                if (!pluginRuntime || !pluginRuntime.channel?.reply?.handleInboundMessage) {
-                    console.error("handleInboundMessage not available in PluginRuntime");
-                    console.error(`PluginRuntime exists: ${!!pluginRuntime}`);
-                    console.error(`PluginRuntime.channel exists: ${!!pluginRuntime?.channel}`);
-                    console.error(`PluginRuntime.channel.reply exists: ${!!pluginRuntime?.channel?.reply}`);
-                    console.error(`PluginRuntime.channel.reply.handleInboundMessage exists: ${!!pluginRuntime?.channel?.reply?.handleInboundMessage}`);
-                    // Log the actual structure
-                    if (pluginRuntime?.channel?.reply) {
-                        console.error(`PluginRuntime.channel.reply keys: ${Object.keys(pluginRuntime.channel.reply).join(', ')}`);
-                    }
+                if (!pluginRuntime) {
+                    console.error("PluginRuntime not available");
                     return;
                 }
-                // Convert A2A message to OpenClaw inbound message format
-                await pluginRuntime.channel.reply.handleInboundMessage({
-                    channel: "xiaoyi",
-                    accountId: resolvedAccount.accountId,
-                    from: message.sender.id,
-                    text: message.content.text || "",
-                    messageId: message.messageId,
-                    timestamp: message.timestamp,
-                    peer: {
-                        kind: "dm",
-                        id: message.sessionId, // Use sessionId as peer id for routing responses
-                    },
-                    meta: {
-                        sessionId: message.sessionId,
-                        taskId: message.id,
-                    },
-                });
+                // Build MsgContext for OpenClaw's message pipeline
+                const msgContext = {
+                    Body: message.content.text || "",
+                    From: message.sender.id,
+                    To: message.sessionId,
+                    SessionKey: `xiaoyi:${resolvedAccount.accountId}:${message.sessionId}`,
+                    AccountId: resolvedAccount.accountId,
+                    MessageSid: message.messageId,
+                    Timestamp: message.timestamp,
+                    Provider: "xiaoyi",
+                    Surface: "xiaoyi",
+                    ChatType: "direct",
+                    SenderName: message.sender.name,
+                    SenderId: message.sender.id,
+                    OriginatingChannel: "xiaoyi",
+                };
+                // Use the correct API to dispatch the message
+                try {
+                    await pluginRuntime.channel.reply.dispatchReplyWithBufferedBlockDispatcher({
+                        ctx: msgContext,
+                        cfg: config,
+                        dispatcherOptions: {
+                            deliver: async (payload) => {
+                                console.log("XiaoYi: Delivering response:", payload);
+                                // Send response back through WebSocket
+                                const taskId = runtime.getTaskIdForSession(message.sessionId) || `task_${Date.now()}`;
+                                const response = {
+                                    sessionId: message.sessionId,
+                                    messageId: `msg_${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: "success",
+                                };
+                                const conn = runtime.getConnection();
+                                if (conn) {
+                                    await conn.sendResponse(response, taskId, message.sessionId);
+                                    console.log("XiaoYi: Response sent successfully");
+                                }
+                            },
+                        },
+                    });
+                }
+                catch (error) {
+                    console.error("Error dispatching message:", error);
+                }
             });
             // Setup cancel handler
             connection.on("cancel", async (data) => {

package/package.json

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