deepccc 0.2.10 → 0.2.12

package/README.md

@@ -8,6 +8,8 @@ DeepCCC 是一个本地优先的开源 Coding Agent，同时提供浏览器多
 
 ## 安装与快速开始
 
+模型原生流未收到完成事件、返回错误结束原因或达到输出长度限制时，会报告异常并保留已经输出的内容，不将不完整回复判为成功。没有回复且没有工具执行的空结果也会明确报错。用户主动取消仍按中断处理。
+
 全局安装：
 
 ```bash

package/dist/context.js

@@ -392,38 +392,35 @@ function replayStructuredAssistantMessage(message, messageIndex) {
         ];
     const messages = [];
     let assistantParts = [];
-    let toolParts = [];
-    const pendingCalls = new Map();
-    const knownNames = new Map();
+    const batchCalls = new Map();
+    const batchResults = new Map();
     const emittedCallIds = new Set();
-    const flushAssistant = () => {
-        if (!assistantParts.length)
+    const completeToolBatch = () => {
+        if (assistantParts.length > 0) {
+            messages.push({ role: "assistant", content: assistantParts });
+            assistantParts = [];
+        }
+        if (batchCalls.size === 0) {
+            batchResults.clear();
             return;
-        messages.push({ role: "assistant", content: assistantParts });
-        assistantParts = [];
-    };
-    const completeToolStep = () => {
-        // OpenAI/LiteLLM requires every tool message to immediately follow the
-        // assistant message that declared all matching tool_calls for that step.
-        flushAssistant();
-        for (const [toolCallId, toolName] of pendingCalls) {
-            toolParts.push({
+        }
+        const toolParts = [];
+        for (const [toolCallId, toolName] of batchCalls) {
+            toolParts.push(batchResults.get(toolCallId) ?? {
                 type: "tool-result",
                 toolCallId,
                 toolName,
                 output: { type: "text", value: "[tool execution interrupted; result unavailable]" },
             });
         }
-        pendingCalls.clear();
-        if (!toolParts.length)
-            return;
         messages.push({ role: "tool", content: toolParts });
-        toolParts = [];
+        batchCalls.clear();
+        batchResults.clear();
     };
     for (const entry of timeline) {
         if (entry.type === "text") {
-            if (pendingCalls.size > 0 || toolParts.length > 0)
-                completeToolStep();
+            if (batchCalls.size > 0 || batchResults.size > 0)
+                completeToolBatch();
             const previous = assistantParts[assistantParts.length - 1];
             if (previous?.type === "text")
                 previous.text += entry.text;
@@ -431,12 +428,13 @@ function replayStructuredAssistantMessage(message, messageIndex) {
                 assistantParts.push({ type: "text", text: entry.text });
         }
         else if (entry.type === "tool_use") {
-            // Consecutive tool calls belong to one assistant step. Only close the
-            // previous step after at least one result has arrived.
-            if (toolParts.length > 0)
-                completeToolStep();
-            knownNames.set(entry.id, entry.name);
-            pendingCalls.set(entry.id, entry.name);
+            // Providers may interleave parallel tool results with later tool-call
+            // events from the same assistant step. Keep the whole contiguous tool
+            // segment together until text resumes; closing on the first result can
+            // emit a later real result as an orphaned `role: tool` message.
+            if (emittedCallIds.has(entry.id))
+                continue;
+            batchCalls.set(entry.id, entry.name);
             emittedCallIds.add(entry.id);
             assistantParts.push({
                 type: "tool-call",
@@ -446,14 +444,12 @@ function replayStructuredAssistantMessage(message, messageIndex) {
             });
         }
         else {
-            if (!emittedCallIds.has(entry.tool_use_id))
+            if (!batchCalls.has(entry.tool_use_id))
                 continue;
-            const toolName = entry.name ?? knownNames.get(entry.tool_use_id);
+            const toolName = entry.name ?? batchCalls.get(entry.tool_use_id);
             if (!toolName)
                 continue;
-            flushAssistant();
-            pendingCalls.delete(entry.tool_use_id);
-            toolParts.push({
+            batchResults.set(entry.tool_use_id, {
                 type: "tool-result",
                 toolCallId: entry.tool_use_id,
                 toolName,
@@ -461,10 +457,7 @@ function replayStructuredAssistantMessage(message, messageIndex) {
             });
         }
     }
-    if (pendingCalls.size > 0 || toolParts.length > 0)
-        completeToolStep();
-    else
-        flushAssistant();
+    completeToolBatch();
     return messages;
 }
 function serializeMessagesForCompaction(messages) {

package/dist/index.js

@@ -478,16 +478,25 @@ export class ChatSession {
                     messages: attemptMessages,
                 };
                 let stream;
+                let requiresFinish = false;
+                let receivedFinish = false;
+                let finishReason;
                 if (this.streaming) {
                     const result = streamText(generationOptions);
+                    requiresFinish = result.fullStream != null;
                     stream = result.fullStream ?? textStreamToFullStream(result.textStream);
                 }
                 else {
                     const result = await generateText(generationOptions);
+                    finishReason = result.finishReason;
                     stream = generateResultToFullStream(result);
                 }
                 for await (const part of stream) {
                     rawLog?.writeLine(safeRawStreamJson(part));
+                    if (part.type === "finish") {
+                        receivedFinish = true;
+                        finishReason = part.finishReason;
+                    }
                     if (part.type === "reasoning-start" || part.type === "reasoning-delta") {
                         // Reasoning content remains private. A throttled heartbeat is enough
                         // for ChatCCC to distinguish active inference from a stalled stream.
@@ -561,6 +570,14 @@ export class ChatSession {
                         throw new Error(message);
                     }
                 }
+                if (!signal?.aborted) {
+                    if (requiresFinish && !receivedFinish)
+                        throw new Error("DeepCCC 输出流中断：未收到模型完成事件，回复可能不完整");
+                    if (finishReason === "error" || finishReason === "length")
+                        throw new Error(`DeepCCC 未正常完成：finishReason=${finishReason}，回复可能不完整`);
+                    if (!fullText.trim() && toolCallOrder.length === 0)
+                        throw new Error("DeepCCC 本轮未产生有效回复");
+                }
                 if (hasMalformedToolProtocolText(fullText)) {
                     console.warn(`[DeepCCC] malformed tool protocol text detected for ${this.context.sessionId} `
                         + `(attempt ${attempt + 1}/2, structuredToolCalls=${toolCallOrder.length})`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepccc",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "description": "A lightweight coding agent with OpenAI-compatible and Anthropic Messages API support.",
   "license": "Apache-2.0",
   "keywords": [