@ynhcj/xiaoyi 2.4.6 → 2.4.8

package/dist/channel.js

@@ -323,6 +323,7 @@ exports.xiaoyiPlugin = {
                     const startTime = Date.now();
                     let accumulatedText = "";
                     let sentTextLength = 0; // Track sent text length for streaming
+                    let hasSentFinal = false; // Track if final content has been sent (to prevent duplicate isFinal=true)
                     // ==================== CREATE ABORT CONTROLLER ====================
                     // Create AbortController for this session to allow cancelation
                     const { controller: abortController, signal: abortSignal } = runtime.createAbortControllerForSession(sessionId);
@@ -479,8 +480,16 @@ exports.xiaoyiPlugin = {
                                     console.log(`  Session: ${sessionId}`);
                                     console.log(`  Elapsed: ${elapsed}ms`);
                                     console.log(`  Total length: ${completeText.length} chars`);
+                                    console.log(`  Has already sent final: ${hasSentFinal}`);
                                     console.log(`  Preview: "${completeText.substring(0, 100)}..."`);
                                     console.log("=".repeat(60) + "\n");
+                                    // Check if we've already sent final content - prevent duplicate isFinal=true
+                                    if (hasSentFinal) {
+                                        console.log(`XiaoYi: [STREAM] Skipping duplicate final response (already sent)\n`);
+                                        // Don't send anything, but clear timeout to prevent timeout warnings
+                                        runtime.clearSessionTimeout(sessionId);
+                                        return;
+                                    }
                                     const response = {
                                         sessionId: sessionId,
                                         messageId: `msg_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`,
@@ -497,13 +506,16 @@ exports.xiaoyiPlugin = {
                                         },
                                         status: "success",
                                     };
-                                    // Send complete text as FINAL, NOT append
-                                    await conn.sendResponse(response, taskId, sessionId, true, false);
-                                    console.log(`✓ XiaoYi: Final response sent (${completeText.length} chars)\n`);
-                                    // Clear timeout and abort controller on final
-                                    runtime.markSessionCompleted(sessionId);
-                                    // Note: Don't clear abort controller here, let onIdle handle it
-                                    // This ensures we can still abort if there's any pending cleanup
+                                    // Send complete text but NOT as final yet - use append mode to keep stream alive
+                                    // The true isFinal=true will be sent in onIdle callback
+                                    await conn.sendResponse(response, taskId, sessionId, false, true);
+                                    console.log(`✓ XiaoYi: Final response content sent (${completeText.length} chars, stream kept alive)\n`);
+                                    // Mark that we've sent the final content
+                                    hasSentFinal = true;
+                                    // Clear timeout to prevent timeout warnings, but don't mark session as completed yet
+                                    runtime.clearSessionTimeout(sessionId);
+                                    // Note: We DON'T call markSessionCompleted here
+                                    // The session will be marked completed in onIdle when we send isFinal=true
                                 }
                                 else if (kind === "tool") {
                                     // Tool results - typically not sent as messages
@@ -520,15 +532,44 @@ exports.xiaoyiPlugin = {
                                 console.log(`XiaoYi: [IDLE] Processing complete`);
                                 console.log(`  Total time: ${elapsed}ms`);
                                 console.log(`  Final length: ${accumulatedText.length} chars`);
-                                // Only clear timeout if we have a valid response
-                                // If empty, keep timeout running to handle session conflict
+                                console.log(`  Has sent final: ${hasSentFinal}`);
+                                // Only send final close message if we have valid content
                                 if (accumulatedText.length > 0) {
+                                    const conn = runtime.getConnection();
+                                    if (conn) {
+                                        try {
+                                            // Send the true final response with isFinal=true to properly close the stream
+                                            const finalResponse = {
+                                                sessionId: 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: accumulatedText,
+                                                },
+                                                status: "success",
+                                            };
+                                            // Send with isFinal=true to properly close the A2A communication stream
+                                            await conn.sendResponse(finalResponse, taskId, sessionId, true, false);
+                                            console.log(`✓ XiaoYi: True isFinal=true sent to close stream\n`);
+                                        }
+                                        catch (error) {
+                                            console.error(`✗ XiaoYi: Failed to send final close message:`, error);
+                                        }
+                                    }
+                                    // Now mark session as completed and clean up
                                     runtime.markSessionCompleted(sessionId);
                                     runtime.clearAbortControllerForSession(sessionId);
-                                    console.log(`[TIMEOUT] Timeout cleared (valid response)\n`);
+                                    console.log(`[TIMEOUT] Session completed and cleaned up\n`);
                                 }
                                 else {
-                                    console.log(`[TIMEOUT] Keeping timeout (no valid response)\n`);
+                                    console.log(`[TIMEOUT] No valid response, keeping timeout active\n`);
                                 }
                                 console.log("=".repeat(60) + "\n");
                             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ynhcj/xiaoyi",
-  "version": "2.4.6",
+  "version": "2.4.8",
   "description": "XiaoYi channel plugin for OpenClaw",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -20,6 +20,11 @@
     "extensions": ["xiaoyi.js"],
     "channels": ["xiaoyi"],
     "installDependencies": true,
+    "install": {
+      "npmSpec": "@ynhcj/xiaoyi",
+      "localPath": ".",
+      "defaultChoice": "npm"
+    },
     "channel": {
       "id": "xiaoyi",
       "label": "XiaoYi",
@@ -29,11 +34,6 @@
       "blurb": "小艺 A2A 协议支持，通过 WebSocket 连接。",
       "order": 80,
       "aliases": ["xy"]
-    },
-    "install": {
-      "npmSpec": "@ynhcj/xiaoyi",
-      "localPath": ".",
-      "defaultChoice": "npm"
     }
   },
   "peerDependencies": {