@corbat-tech/coco 2.22.1 → 2.23.0

package/dist/cli/index.js

@@ -1016,6 +1016,7 @@ var init_anthropic = __esm({
        */
       async *stream(messages, options) {
         this.ensureInitialized();
+        let timeoutTriggered = false;
         try {
           const stream = await this.client.messages.stream(
             {
@@ -1033,6 +1034,7 @@ var init_anthropic = __esm({
           const timeoutInterval = setInterval(() => {
             if (Date.now() - lastActivityTime > streamTimeout) {
               clearInterval(timeoutInterval);
+              timeoutTriggered = true;
               timeoutController.abort();
             }
           }, 5e3);
@@ -1063,6 +1065,11 @@ var init_anthropic = __esm({
             throw new Error(`Stream timeout: No response from LLM for ${streamTimeout / 1e3}s`);
           }
         } catch (error) {
+          if (timeoutTriggered) {
+            throw new Error(
+              `Stream timeout: No response from LLM for ${(this.config.timeout ?? 12e4) / 1e3}s`
+            );
+          }
           throw this.handleError(error);
         }
       }
@@ -1071,6 +1078,7 @@ var init_anthropic = __esm({
        */
       async *streamWithTools(messages, options) {
         this.ensureInitialized();
+        let timeoutTriggered = false;
         try {
           const stream = await this.client.messages.stream(
             {
@@ -1092,6 +1100,7 @@ var init_anthropic = __esm({
           const timeoutInterval = setInterval(() => {
             if (Date.now() - lastActivityTime > streamTimeout) {
               clearInterval(timeoutInterval);
+              timeoutTriggered = true;
               timeoutController.abort();
             }
           }, 5e3);
@@ -1186,6 +1195,11 @@ var init_anthropic = __esm({
             throw new Error(`Stream timeout: No response from LLM for ${streamTimeout / 1e3}s`);
           }
         } catch (error) {
+          if (timeoutTriggered) {
+            throw new Error(
+              `Stream timeout: No response from LLM for ${(this.config.timeout ?? 12e4) / 1e3}s`
+            );
+          }
           throw this.handleError(error);
         }
       }
@@ -1755,6 +1769,7 @@ var init_openai = __esm({
           yield* this.streamWithToolsViaResponses(messages, options);
           return;
         }
+        let timeoutTriggered = false;
         try {
           const supportsTemp = this.supportsTemperature(model);
           const extraBody = this.getExtraBody(model);
@@ -1783,6 +1798,7 @@ var init_openai = __esm({
           const timeoutInterval = setInterval(() => {
             if (Date.now() - lastActivityTime > streamTimeout) {
               clearInterval(timeoutInterval);
+              timeoutTriggered = true;
               timeoutController.abort();
             }
           }, 5e3);
@@ -1896,6 +1912,11 @@ var init_openai = __esm({
             throw new Error(`Stream timeout: No response from LLM for ${streamTimeout / 1e3}s`);
           }
         } catch (error) {
+          if (timeoutTriggered) {
+            throw new Error(
+              `Stream timeout: No response from LLM for ${(this.config.timeout ?? 12e4) / 1e3}s`
+            );
+          }
           throw this.handleError(error);
         }
       }
@@ -2341,6 +2362,7 @@ var init_openai = __esm({
        */
       async *streamViaResponses(messages, options) {
         this.ensureInitialized();
+        let timeoutTriggered = false;
         try {
           const model = options?.model ?? this.config.model ?? DEFAULT_MODEL2;
           const { input, instructions } = this.convertToResponsesInput(messages, options?.system);
@@ -2359,6 +2381,7 @@ var init_openai = __esm({
           const timeoutInterval = setInterval(() => {
             if (Date.now() - lastActivityTime > streamTimeout) {
               clearInterval(timeoutInterval);
+              timeoutTriggered = true;
               timeoutController.abort();
             }
           }, 5e3);
@@ -2383,6 +2406,11 @@ var init_openai = __esm({
             throw new Error(`Stream timeout: No response from LLM for ${streamTimeout / 1e3}s`);
           }
         } catch (error) {
+          if (timeoutTriggered) {
+            throw new Error(
+              `Stream timeout: No response from LLM for ${(this.config.timeout ?? 12e4) / 1e3}s`
+            );
+          }
           throw this.handleError(error);
         }
       }
@@ -2395,6 +2423,7 @@ var init_openai = __esm({
        */
       async *streamWithToolsViaResponses(messages, options) {
         this.ensureInitialized();
+        let timeoutTriggered = false;
         try {
           const model = options?.model ?? this.config.model ?? DEFAULT_MODEL2;
           const { input, instructions } = this.convertToResponsesInput(messages, options?.system);
@@ -2421,6 +2450,7 @@ var init_openai = __esm({
           const timeoutInterval = setInterval(() => {
             if (Date.now() - lastActivityTime > streamTimeout) {
               clearInterval(timeoutInterval);
+              timeoutTriggered = true;
               timeoutController.abort();
             }
           }, 5e3);
@@ -2506,6 +2536,11 @@ var init_openai = __esm({
             throw new Error(`Stream timeout: No response from LLM for ${streamTimeout / 1e3}s`);
           }
         } catch (error) {
+          if (timeoutTriggered) {
+            throw new Error(
+              `Stream timeout: No response from LLM for ${(this.config.timeout ?? 12e4) / 1e3}s`
+            );
+          }
           throw this.handleError(error);
         }
       }
@@ -9582,7 +9617,15 @@ Responses are short and direct by default. Lead with the answer or action, not r
 
 ## File Changes
 
-**Never output raw diff or unified diff format in your responses.** Use edit_file and write_file to make changes \u2014 Coco renders a visual diff automatically. Do not quote file contents back to the user after reading them unless explicitly asked.`;
+**Never output raw diff or unified diff format in your responses.** Use edit_file and write_file to make changes \u2014 Coco renders a visual diff automatically.
+
+## Output Discipline
+
+**NEVER echo file contents in your responses.** When you read a file, extract only the specific information needed \u2014 do NOT reprint whole files, functions, or large excerpts. The terminal shows which files you read and their line counts \u2014 the user does not need to see the content again.
+
+**During tool-calling iterations, keep text minimal.** A single short orienting line before tool calls is acceptable. Do NOT explain every step, narrate what you are about to do, or produce paragraphs between tool calls. Reserve explanatory text for your final response after all tools have completed.
+
+**Code blocks in responses are expensive.** Only include a code block when the user explicitly asks to see code, or when the code IS the deliverable (e.g., a script to paste in a terminal). Never include a code block to "show your work" when you can write the file directly instead.`;
     SHELL_METACHARACTERS = /[;|&`$(){}<>!\n\\'"]/;
     SAFE_COMMAND_VALIDATORS = {
       git: (args) => {
@@ -47017,6 +47060,8 @@ var streamingIndicatorInterval = null;
 var streamingIndicatorFrame = 0;
 var STREAMING_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
 var getTerminalWidth2 = () => process.stdout.columns || 80;
+var MAX_STREAMING_CODE_LINES = 50;
+var STREAMING_CODE_HEAD_LINES = 40;
 function startStreamingIndicator() {
   if (streamingIndicatorActive) return;
   streamingIndicatorActive = true;
@@ -47340,11 +47385,17 @@ function renderSimpleCodeBlock(lang, lines, blockId) {
   const isDiff = lang === "diff" || !lang && looksLikeDiff(lines);
   const title = lang || "Code";
   console.log(chalk2.dim(`${title} \xB7 #${blockId}`));
+  let displayLines = lines;
+  let truncatedCount = 0;
+  if (!isDiff && lines.length > MAX_STREAMING_CODE_LINES) {
+    displayLines = lines.slice(0, STREAMING_CODE_HEAD_LINES);
+    truncatedCount = lines.length - STREAMING_CODE_HEAD_LINES;
+  }
   const bgDel = chalk2.bgRgb(80, 20, 20);
   const bgAdd = chalk2.bgRgb(20, 60, 20);
   let oldLineNo = 0;
   let newLineNo = 0;
-  for (const line of lines) {
+  for (const line of displayLines) {
     if (isDiff) {
       const hunkMatch = line.match(/^@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@/);
       if (hunkMatch) {
@@ -47372,6 +47423,9 @@ function renderSimpleCodeBlock(lang, lines, blockId) {
       }
     }
   }
+  if (truncatedCount > 0) {
+    console.log(chalk2.dim(`  \u2026 ${truncatedCount} more lines \xB7 /copy ${blockId} for full content`));
+  }
   console.log(chalk2.dim(`  #${blockId} \xB7 /copy ${blockId}`));
 }
 function formatDiffLineNo(line, oldLineNo, newLineNo) {
@@ -50023,6 +50077,8 @@ async function executeAgentTurn(session, userMessage, provider, toolRegistry, op
   const maxIterations = session.config.agent.maxToolIterations;
   const toolErrorCounts = /* @__PURE__ */ new Map();
   const MAX_CONSECUTIVE_TOOL_ERRORS = 3;
+  const ITERATION_LIMIT_WARNING_RATIO = 0.75;
+  const ITERATION_LIMIT_SUMMARY_PROMPT = `[System: You have now used all allowed iterations and tool calls are no longer available. Write your final response immediately: (1) briefly state what was completed, (2) describe what still needs to be done, (3) give specific next steps so the user can continue. Be concise and direct.]`;
   const INLINE_RESULT_MAX_CHARS = 8e3;
   const INLINE_RESULT_HEAD_CHARS = 6500;
   const INLINE_RESULT_TAIL_CHARS = 1e3;
@@ -50037,6 +50093,8 @@ ${tail}`;
   }
   while (iteration < maxIterations) {
     iteration++;
+    const isLastIteration = iteration === maxIterations;
+    const iterationTextChunks = [];
     if (options.signal?.aborted) {
       return abortReturn();
     }
@@ -50064,7 +50122,7 @@ ${tail}`;
             }
             responseContent += chunk.text;
             finalContent += chunk.text;
-            options.onStream?.(chunk);
+            iterationTextChunks.push(chunk);
           }
           if (chunk.type === "tool_use_start" && chunk.toolCall) {
             flushLineBuffer();
@@ -50141,6 +50199,11 @@ ${tail}`;
         error: errorMsg
       };
     }
+    if (collectedToolCalls.length === 0) {
+      for (const bufferedChunk of iterationTextChunks) {
+        options.onStream?.(bufferedChunk);
+      }
+    }
     const inputText = messages.map((m) => {
       if (typeof m.content === "string") return m.content;
       try {
@@ -50316,10 +50379,20 @@ ${tail}`;
       });
       const declineReason = declinedTools.get(toolCall.id);
       if (declineReason) {
+        let skipContent;
+        if (declineReason === "User declined") {
+          skipContent = "The user explicitly declined this tool call. You MUST find a different approach \u2014 do not retry the same action or parameters.";
+        } else if (declineReason.toLowerCase().includes("timeout") || declineReason.toLowerCase().includes("timed out")) {
+          skipContent = `Tool execution timed out: ${declineReason}. Try a simpler or faster alternative, or break the task into smaller steps.`;
+        } else if (declineReason.toLowerCase().includes("abort")) {
+          skipContent = "Tool execution was cancelled.";
+        } else {
+          skipContent = `Tool execution was skipped: ${declineReason}`;
+        }
         toolResults.push({
           type: "tool_result",
           tool_use_id: toolCall.id,
-          content: `Tool execution was declined: ${declineReason}`,
+          content: skipContent,
           is_error: true
         });
         continue;
@@ -50373,6 +50446,28 @@ ${tail}`;
         }
       }
     }
+    if (toolResults.length > 0) {
+      const warningThreshold = Math.ceil(maxIterations * ITERATION_LIMIT_WARNING_RATIO);
+      const lastIdx = toolResults.length - 1;
+      const last = toolResults[lastIdx];
+      if (isLastIteration && !stuckInErrorLoop) {
+        toolResults[lastIdx] = {
+          ...last,
+          content: typeof last.content === "string" ? last.content + `
+
+${ITERATION_LIMIT_SUMMARY_PROMPT}` : ITERATION_LIMIT_SUMMARY_PROMPT
+        };
+      } else if (iteration === warningThreshold) {
+        const remaining = maxIterations - iteration;
+        const warning = `
+
+[System: Iteration budget warning \u2014 ${iteration} of ${maxIterations} iterations used, ${remaining} remaining. Begin wrapping up your task. Prioritize the most critical remaining steps.]`;
+        toolResults[lastIdx] = {
+          ...last,
+          content: typeof last.content === "string" ? last.content + warning : warning
+        };
+      }
+    }
     const assistantContent = response.content ? [{ type: "text", text: response.content }, ...toolUses] : toolUses;
     addMessage(session, {
       role: "assistant",
@@ -50417,14 +50512,38 @@ ${tail}`;
       }
       break;
     }
-  }
-  if (iteration >= maxIterations) {
-    const notice = `
+    if (isLastIteration && toolResults.length > 0) {
+      let summaryThinkingEnded = false;
+      options.onThinkingStart?.();
+      try {
+        const finalMessages = getConversationContext(session, toolRegistry);
+        for await (const chunk of provider.streamWithTools(finalMessages, {
+          tools: [],
+          maxTokens: session.config.provider.maxTokens,
+          signal: options.signal
+        })) {
+          if (options.signal?.aborted) break;
+          if (chunk.type === "text" && chunk.text) {
+            if (!summaryThinkingEnded) {
+              options.onThinkingEnd?.();
+              summaryThinkingEnded = true;
+            }
+            finalContent += chunk.text;
+            options.onStream?.(chunk);
+          }
+          if (chunk.type === "done") break;
+        }
+      } catch {
+        const notice = `
 
----
-_Reached the iteration limit (${maxIterations}). The task may be incomplete. You can say "continue" to resume._`;
-    finalContent += notice;
-    options.onStream?.({ type: "text", text: notice });
+I have reached the maximum iteration limit (${maxIterations}). The task may be incomplete. Type "continue" to give me more iterations, or describe what you'd like me to focus on next.`;
+        finalContent += notice;
+        options.onStream?.({ type: "text", text: notice });
+      } finally {
+        if (!summaryThinkingEnded) options.onThinkingEnd?.();
+      }
+      break;
+    }
   }
   options.onStream?.({ type: "done" });
   return {
@@ -51623,6 +51742,9 @@ ${imagePrompts}`.trim() : imagePrompts;
             result.toolCalls.length
           );
         }
+        if (result.toolCalls.length > 0) {
+          console.log(chalk2.dim("   Type your request again to resume where you left off."));
+        }
         console.log();
         continue;
       }
@@ -51646,6 +51768,9 @@ ${imagePrompts}`.trim() : imagePrompts;
           console.log(
             chalk2.dim("   Recovery failed or error is non-retryable. Returning to prompt.")
           );
+          console.log(
+            chalk2.dim("   Tip: Try /provider or /model to switch, then rephrase and retry.")
+          );
           consecutiveErrors = 0;
         }
         console.log();
@@ -51713,12 +51838,20 @@ ${imagePrompts}`.trim() : imagePrompts;
             compactSpinner.clear();
           }
         } catch {
-          compactSpinner.clear();
+          compactSpinner.stop("\u26A0 Context compaction failed");
+          console.log(
+            chalk2.yellow(
+              "  \u26A0 Context compaction failed \u2014 context unchanged. Use /clear if needed."
+            )
+          );
         } finally {
           clearTimeout(compactTimeout);
           process.off("SIGINT", compactSigint);
         }
       } catch {
+        console.log(
+          chalk2.yellow("  \u26A0 Context compaction failed \u2014 context unchanged. Use /clear if needed.")
+        );
       }
       renderStatusBar(session.projectPath, session.config, gitContext, usageForDisplay);
       if (usageForDisplay >= 90 && !warned90) {
@@ -51825,11 +51958,15 @@ ${imagePrompts}`.trim() : imagePrompts;
         session.messages.length = preCallMessageLength;
         renderError(errorMsg);
         console.log(chalk2.dim("   Recovery failed after multiple attempts. Returning to prompt."));
+        console.log(
+          chalk2.dim("   Tip: Try /provider or /model to switch, then rephrase and retry.")
+        );
         continue;
       }
       session.messages.length = preCallMessageLength;
       consecutiveErrors = 0;
       renderError(errorMsg);
+      console.log(chalk2.dim("   Tip: Try /provider or /model to switch, then rephrase and retry."));
     } finally {
       clearSpinner();
       if (originalSystemPrompt !== void 0) {