@wu529778790/open-im 1.10.6 → 1.10.7-beta.0

package/dist/codebuddy/cli-runner.d.ts

@@ -31,5 +31,10 @@ export declare function extractBufferedPayloads(state: {
 export declare function flushBufferedPayloads(state: {
     buffer: string;
 }): string[];
+/**
+ * CodeBuddy 会在工具调用前后发来多段 `assistant`：本轮内多为前缀增长的流式全文，
+ * 工具后的新轮次则是独立正文。不能每次 `accumulated = text`，否则只剩开场白。
+ */
+export declare function mergeAssistantReply(previous: string, incoming: string): string;
 export declare function runCodeBuddy(cliPath: string, prompt: string, sessionId: string | undefined, workDir: string, callbacks: CodeBuddyRunCallbacks, options?: CodeBuddyRunOptions): CodeBuddyRunHandle;
 export declare function checkCodeBuddyCliAvailable(cliPath: string): boolean;

package/dist/codebuddy/cli-runner.js

@@ -159,6 +159,29 @@ function extractToolUses(content) {
     }
     return toolUses;
 }
+/**
+ * CodeBuddy 会在工具调用前后发来多段 `assistant`：本轮内多为前缀增长的流式全文，
+ * 工具后的新轮次则是独立正文。不能每次 `accumulated = text`，否则只剩开场白。
+ */
+export function mergeAssistantReply(previous, incoming) {
+    const a = previous.trimEnd();
+    const b = incoming.trim();
+    if (!b)
+        return a;
+    if (!a)
+        return b;
+    if (a === b)
+        return a;
+    if (b.startsWith(a))
+        return b;
+    if (a.startsWith(b))
+        return a;
+    if (a.includes(b))
+        return a;
+    if (b.includes(a))
+        return b;
+    return `${a}\n\n${b}`;
+}
 export function runCodeBuddy(cliPath, prompt, sessionId, workDir, callbacks, options) {
     const normalizedCliPath = normalizeCliPath(cliPath);
     const args = buildCodeBuddyArgs(prompt, sessionId, {
@@ -186,6 +209,7 @@ export function runCodeBuddy(cliPath, prompt, sessionId, workDir, callbacks, opt
     let completed = false;
     let sessionReported = false;
     let currentModel;
+    let assistantMessageCount = 0;
     const toolStats = {};
     const startTime = Date.now();
     const stdoutState = { buffer: '' };
@@ -220,6 +244,7 @@ export function runCodeBuddy(cliPath, prompt, sessionId, workDir, callbacks, opt
                 : undefined;
             if (!message)
                 return;
+            assistantMessageCount += 1;
             if (typeof message.model === 'string')
                 currentModel = message.model;
             const { text, thinking } = extractTextBlocks(message.content);
@@ -228,11 +253,11 @@ export function runCodeBuddy(cliPath, prompt, sessionId, workDir, callbacks, opt
                 callbacks.onToolUse?.(toolUse.name, toolUse.input);
             }
             if (thinking) {
-                accumulatedThinking = thinking;
+                accumulatedThinking = mergeAssistantReply(accumulatedThinking, thinking);
                 callbacks.onThinking?.(accumulatedThinking);
             }
             if (text) {
-                accumulated = text;
+                accumulated = mergeAssistantReply(accumulated, text);
                 callbacks.onText(accumulated);
             }
             return;
@@ -240,11 +265,14 @@ export function runCodeBuddy(cliPath, prompt, sessionId, workDir, callbacks, opt
         if (type === 'result') {
             if (completed)
                 return;
-            completed = true;
             const isError = payload.is_error === true;
-            const resultText = typeof payload.result === 'string'
-                ? payload.result
-                : accumulated;
+            const rawResult = typeof payload.result === 'string' ? payload.result : undefined;
+            const resultText = rawResult !== undefined && rawResult.trim() !== '' ? rawResult : accumulated;
+            if (!isError && !resultText.trim()) {
+                log.debug('CodeBuddy: ignoring empty success result (waiting for more stream or process exit)');
+                return;
+            }
+            completed = true;
             if (isError) {
                 const errors = Array.isArray(payload.errors)
                     ? payload.errors.map((item) => String(item)).join('\n')
@@ -259,7 +287,7 @@ export function runCodeBuddy(cliPath, prompt, sessionId, workDir, callbacks, opt
                 cost: 0,
                 durationMs: Date.now() - startTime,
                 model: currentModel,
-                numTurns: 1,
+                numTurns: Math.max(1, assistantMessageCount),
                 toolStats,
             });
         }
@@ -310,7 +338,7 @@ export function runCodeBuddy(cliPath, prompt, sessionId, workDir, callbacks, opt
             cost: 0,
             durationMs: Date.now() - startTime,
             model: currentModel,
-            numTurns: accumulated ? 1 : 0,
+            numTurns: Math.max(accumulated ? 1 : 0, assistantMessageCount),
             toolStats,
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wu529778790/open-im",
-  "version": "1.10.6",
+  "version": "1.10.7-beta.0",
   "description": "Multi-platform IM bridge for AI CLI tools (Claude, Codex, CodeBuddy)",
   "type": "module",
   "main": "dist/index.js",