chatccc 0.2.276 → 0.2.278

package/deepccc-agent/package.json

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

package/dist/deepccc-agent/src/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/src/adapters/codex-adapter.js

@@ -71,6 +71,13 @@ function resolveCodexEffort() {
 // normalizeCodexMessage — Codex 事件 → UnifiedStreamMessage | null
 // ---------------------------------------------------------------------------
 export function normalizeCodexMessage(msg) {
+    if (msg.type === "error" && msg.message?.trim()) {
+        throw new Error(`Codex turn failed: ${msg.message.trim()}`);
+    }
+    if (msg.type === "turn.failed") {
+        const detail = typeof msg.error === "string" ? msg.error : msg.error?.message;
+        throw new Error(`Codex turn failed: ${detail?.trim() || "unknown Codex error"}`);
+    }
     // agent_message 只是 Codex 的一条阶段性文本 item。即使内容看起来像完整答复，
     // 后面仍可能继续发出工具调用，因此不能用它关闭 response-stall watchdog。
     if (msg.type === "item.completed" &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chatccc",
-  "version": "0.2.276",
+  "version": "0.2.278",
   "description": "Feishu bot bridge for Claude Code",
   "license": "Apache-2.0",
   "type": "module",