@corbat-tech/coco 2.20.0 → 2.21.0

package/dist/cli/index.js

@@ -4487,7 +4487,7 @@ var init_codex = __esm({
           model,
           input,
           instructions: instructions ?? "You are a helpful coding assistant.",
-          max_tokens: options?.maxTokens ?? this.config.maxTokens ?? 8192,
+          max_output_tokens: options?.maxTokens ?? this.config.maxTokens ?? 8192,
           temperature: options?.temperature ?? this.config.temperature ?? 0,
           store: false,
           stream: true
@@ -10461,8 +10461,9 @@ function isNonRetryableProviderError(error) {
   if (error instanceof ProviderError) {
     const code = error.statusCode;
     if (code === 401 || code === 403) return true;
+    if (code === 400) return true;
     const msg = error.message.toLowerCase();
-    if (msg.includes("exceeded your current quota") || msg.includes("usage limit") || msg.includes("insufficient_quota") || msg.includes("billing") || msg.includes("payment") || msg.includes("invalid_api_key") || msg.includes("incorrect api key") || msg.includes("bad credentials") || msg.includes("not authorized")) {
+    if (msg.includes("exceeded your current quota") || msg.includes("usage limit") || msg.includes("insufficient_quota") || msg.includes("billing") || msg.includes("payment") || msg.includes("invalid_api_key") || msg.includes("incorrect api key") || msg.includes("bad credentials") || msg.includes("not authorized") || msg.includes("unsupported parameter")) {
       return true;
     }
   }
@@ -10530,15 +10531,19 @@ function installProcessSafetyNet() {
   _safetyNetInstalled = true;
   const debug = Boolean(process.env["COCO_DEBUG"]);
   process.on("uncaughtException", (error) => {
+    if (isAbortError(error)) return;
     const msg = error instanceof Error ? error.message : String(error);
     console.error(chalk2.red(`
-\xD7 Unexpected error (uncaught): ${msg}`));
+\xD7 Unexpected error: ${msg}`));
+    console.error(chalk2.dim("  The REPL continues \u2014 type your next message or /help"));
     if (debug) console.error(error.stack);
   });
   process.on("unhandledRejection", (reason) => {
+    if (isAbortError(reason)) return;
     const msg = reason instanceof Error ? reason.message : String(reason);
     console.error(chalk2.red(`
-\xD7 Unhandled rejection: ${msg}`));
+\xD7 Unhandled error: ${msg}`));
+    console.error(chalk2.dim("  The REPL continues \u2014 type your next message or /help"));
     if (debug && reason instanceof Error) console.error(reason.stack);
   });
 }
@@ -11173,12 +11178,12 @@ function renderFileBlock(file, opts) {
       }
     }
   }
-  console.log();
 }
 function formatLineNo(line, show) {
   if (!show) return "";
-  const lineNo = line.type === "delete" ? line.oldLineNo : line.newLineNo;
-  return chalk2.dim(`${String(lineNo ?? "").padStart(5)} `);
+  const oldStr = line.oldLineNo !== void 0 ? String(line.oldLineNo) : "";
+  const newStr = line.newLineNo !== void 0 ? String(line.newLineNo) : "";
+  return chalk2.dim(`${oldStr.padStart(4)} | ${newStr.padStart(4)} `);
 }
 function getChangedLines(diff) {
   const result = /* @__PURE__ */ new Map();
@@ -36816,7 +36821,22 @@ async function savePermissionPreference(key, value) {
 }
 async function shouldShowPermissionSuggestion() {
   const prefs = await loadPermissionPreferences();
-  return !prefs.recommendedAllowlistApplied && !prefs.recommendedAllowlistDismissed;
+  if (prefs.recommendedAllowlistDismissed) {
+    return false;
+  }
+  if (!prefs.recommendedAllowlistApplied) {
+    return true;
+  }
+  try {
+    const content = await fs34__default.readFile(CONFIG_PATHS.trustedTools, "utf-8");
+    const settings = JSON.parse(content);
+    if (!settings.globalTrusted || settings.globalTrusted.length === 0) {
+      return true;
+    }
+  } catch {
+    return true;
+  }
+  return false;
 }
 async function applyRecommendedPermissions() {
   for (const tool of [...RECOMMENDED_GLOBAL, ...RECOMMENDED_PROJECT]) {
@@ -47606,11 +47626,7 @@ ${icon} ${label}`);
   if (toolName === "edit_file") {
     console.log(`
 ${icon} ${chalk2.yellow.bold("EDIT")} ${chalk2.cyan(String(input.path || ""))}`);
-    const editPreview = renderEditPreview(
-      String(input.old_string || ""),
-      String(input.new_string || "")
-    );
-    if (editPreview) console.log(editPreview);
+    printEditDiff(String(input.oldText || ""), String(input.newText || ""));
     return;
   }
   console.log(`
@@ -47682,20 +47698,21 @@ function wordLevelHighlight(deletedContent, addedContent) {
   }
   return { styledDelete, styledAdd };
 }
-function renderEditPreview(oldStr, newStr) {
-  const termWidth = Math.max(getTerminalWidth2() - 14, 30);
+function printEditDiff(oldStr, newStr) {
+  const termWidth = Math.max(getTerminalWidth2() - 15, 30);
   const MAX_SHOWN = 30;
   if (!oldStr.trim()) {
     const lines = newStr.split("\n").filter((l) => l.trim().length > 0).slice(0, 6);
-    if (lines.length === 0) return "";
+    if (lines.length === 0) return;
     const truncate4 = (s) => s.length > termWidth - 2 ? s.slice(0, termWidth - 3) + "\u2026" : s;
-    return lines.map((l) => {
+    for (const l of lines) {
       const text13 = `+ ${truncate4(l)}`;
       const pad = Math.max(0, termWidth - stripAnsi(text13).length + 2);
-      return "  " + diffBgAdd(text13 + " ".repeat(pad));
-    }).join("\n");
+      console.log("  " + diffBgAdd(text13 + " ".repeat(pad)));
+    }
+    return;
   }
-  if (!newStr.trim() && !oldStr.trim()) return "";
+  if (!newStr.trim() && !oldStr.trim()) return;
   const changes = diffLines(oldStr, newStr);
   const diffLineList = [];
   let oldNo = 1;
@@ -47717,7 +47734,7 @@ function renderEditPreview(oldStr, newStr) {
       }
     }
   }
-  if (diffLineList.length === 0) return "";
+  if (diffLineList.length === 0) return;
   const pairs = pairAdjacentDiffLines(diffLineList);
   const pairedDeletes = new Set(pairs.map((p45) => p45.deleteIdx));
   const pairedAdds = new Set(pairs.map((p45) => p45.addIdx));
@@ -47739,7 +47756,6 @@ function renderEditPreview(oldStr, newStr) {
       if (n >= 0 && n < diffLineList.length) visibleIndices.add(n);
     }
   }
-  const result = [];
   let shown = 0;
   let prevIdx = -1;
   const truncate3 = (s) => s.length > termWidth ? s.slice(0, termWidth - 1) + "\u2026" : s;
@@ -47751,11 +47767,11 @@ function renderEditPreview(oldStr, newStr) {
   for (let i = 0; i < diffLineList.length; i++) {
     if (!visibleIndices.has(i)) continue;
     if (shown >= MAX_SHOWN) {
-      result.push(chalk2.dim(`  \u2026 +${diffLineList.length - i} more lines`));
+      console.log(chalk2.dim(`  \u2026 +${diffLineList.length - i} more lines`));
       break;
     }
     if (prevIdx >= 0 && i > prevIdx + 1) {
-      result.push(chalk2.dim("      \u22EE"));
+      console.log(chalk2.dim("      \u22EE"));
     }
     prevIdx = i;
     shown++;
@@ -47765,20 +47781,19 @@ function renderEditPreview(oldStr, newStr) {
       const visLen = stripAnsi(rawContent).length;
       const pad = Math.max(0, termWidth - visLen);
       const line = diffBgAdd(` + ${rawContent}${" ".repeat(pad)}`);
-      result.push("  " + gutter(void 0, dl.newLineNo) + line);
+      console.log("  " + gutter(void 0, dl.newLineNo) + line);
     } else if (dl.type === "delete") {
       const rawContent = pairedDeletes.has(i) ? wordHighlights.get(i)?.styledDelete ?? truncate3(dl.content) : truncate3(dl.content);
       const visLen = stripAnsi(rawContent).length;
       const pad = Math.max(0, termWidth - visLen);
       const line = diffBgDel(` - ${rawContent}${" ".repeat(pad)}`);
-      result.push("  " + gutter(dl.oldLineNo, void 0) + line);
+      console.log("  " + gutter(dl.oldLineNo, void 0) + line);
     } else {
-      result.push(
+      console.log(
         "  " + gutter(dl.oldLineNo, dl.newLineNo) + chalk2.dim(`   ${truncate3(dl.content)}`)
       );
     }
   }
-  return result.join("\n");
 }
 function renderToolEnd(result) {
   const status = result.result.success ? chalk2.green("\u2713") : chalk2.red("\u2717");
@@ -49800,7 +49815,21 @@ var ParallelToolExecutor = class {
       if (isAbortError(error, signal)) {
         return null;
       }
-      throw error;
+      const errMsg = error instanceof Error ? error.message : String(error);
+      const duration2 = performance.now() - startTime;
+      const executedCall2 = {
+        id: toolCall.id,
+        name: toolCall.name,
+        input: toolCall.input,
+        result: {
+          success: false,
+          output: `Unexpected error in ${toolCall.name}: ${errMsg}`,
+          error: errMsg
+        },
+        duration: duration2
+      };
+      onToolEnd?.(executedCall2);
+      return executedCall2;
     }
     if (!result.success && result.error && onPathAccessDenied) {
       const dirPath = extractDeniedPath(result.error);
@@ -49811,7 +49840,13 @@ var ParallelToolExecutor = class {
         } catch {
         }
         if (authorized) {
-          result = await registry.execute(toolCall.name, toolCall.input, { signal });
+          try {
+            result = await registry.execute(toolCall.name, toolCall.input, { signal });
+          } catch (retryError) {
+            if (isAbortError(retryError, signal)) return null;
+            const msg = retryError instanceof Error ? retryError.message : String(retryError);
+            result = { success: false, error: `Retry failed: ${msg}`, duration: 0 };
+          }
         }
       }
     }
@@ -50046,6 +50081,9 @@ ${tail}`;
       if (isAbortError(streamError, options.signal)) {
         return abortReturn();
       }
+      if (isNonRetryableProviderError(streamError)) {
+        throw streamError;
+      }
       const errorMsg = streamError instanceof Error ? streamError.message : String(streamError);
       addMessage(session, {
         role: "assistant",
@@ -50110,7 +50148,18 @@ ${tail}`;
       const needsConfirmation = !options.skipConfirmation && !session.trustedTools.has(trustPattern) && requiresConfirmation(toolCall.name, toolCall.input);
       if (needsConfirmation) {
         options.onBeforeConfirmation?.();
-        const confirmResult = await confirmToolExecution(toolCall);
+        let confirmResult;
+        try {
+          confirmResult = await confirmToolExecution(toolCall);
+        } catch (confirmError) {
+          options.onAfterConfirmation?.();
+          declinedTools.set(
+            toolCall.id,
+            `Confirmation failed: ${confirmError instanceof Error ? confirmError.message : String(confirmError)}`
+          );
+          options.onToolSkipped?.(toolCall, "Confirmation error");
+          continue;
+        }
         options.onAfterConfirmation?.();
         if (typeof confirmResult === "object" && confirmResult.type === "edit") {
           const editedToolCall = {
@@ -51164,6 +51213,11 @@ async function startRepl(options = {}) {
         agentMessage = commandResult.forkPrompt;
       } else if (hasPendingImage()) {
         const images = consumePendingImages();
+        const imagePrompts = images.map((img) => img.prompt).join("\n");
+        const userText = input?.trim() || "";
+        const combinedText = userText ? `${userText}
+
+${imagePrompts}`.trim() : imagePrompts;
         agentMessage = [
           ...images.map(
             (img) => ({
@@ -51173,7 +51227,7 @@ async function startRepl(options = {}) {
           ),
           {
             type: "text",
-            text: images.map((img) => img.prompt).join("\n")
+            text: combinedText
           }
         ];
       } else {
@@ -51182,6 +51236,11 @@ async function startRepl(options = {}) {
     }
     if (agentMessage === null && hasPendingImage()) {
       const images = consumePendingImages();
+      const imagePrompts = images.map((img) => img.prompt).join("\n");
+      const userText = input?.trim() || "";
+      const combinedText = userText ? `${userText}
+
+${imagePrompts}`.trim() : imagePrompts;
       agentMessage = [
         ...images.map(
           (img) => ({
@@ -51191,7 +51250,7 @@ async function startRepl(options = {}) {
         ),
         {
           type: "text",
-          text: images.map((img) => img.prompt).join("\n")
+          text: combinedText
         }
       ];
     }
@@ -51524,6 +51583,31 @@ async function startRepl(options = {}) {
         console.log();
         continue;
       }
+      if (result.error) {
+        session.messages.length = preCallMessageLength;
+        if (originalUserMessage !== null && consecutiveErrors < MAX_CONSECUTIVE_ERRORS && !isNonRetryableProviderError(new Error(result.error))) {
+          consecutiveErrors++;
+          const humanized = humanizeProviderError(new Error(result.error));
+          renderError(humanized);
+          console.log(
+            chalk2.dim(
+              `   \u21BB Retrying automatically (attempt ${consecutiveErrors}/${MAX_CONSECUTIVE_ERRORS})\u2026`
+            )
+          );
+          const recoveryPrefix = `[System: The previous attempt failed with: "${humanized}". Please try a different approach, tool, or method to complete the task. Do NOT repeat the exact same action that caused the error.]
+
+`;
+          pendingQueuedMessages = [recoveryPrefix + originalUserMessage];
+        } else {
+          renderError(result.error);
+          console.log(
+            chalk2.dim("   Recovery failed or error is non-retryable. Returning to prompt.")
+          );
+          consecutiveErrors = 0;
+        }
+        console.log();
+        continue;
+      }
       console.log();
       if (pendingExplanations.length > 0) {
         const settled = await Promise.race([
@@ -51700,6 +51784,8 @@ async function startRepl(options = {}) {
         console.log(chalk2.dim("   Recovery failed after multiple attempts. Returning to prompt."));
         continue;
       }
+      session.messages.length = preCallMessageLength;
+      consecutiveErrors = 0;
       renderError(errorMsg);
     } finally {
       clearSpinner();
@@ -52122,6 +52208,7 @@ registerSwarmCommand(program);
 program.command("setup").description("Configure AI provider and API key").action(async () => {
   const result = await runOnboardingV2();
   if (result) {
+    await saveConfiguration(result);
     console.log("\n\u2705 Configuration saved! Run `coco` to start coding.");
   } else {
     console.log("\n\u274C Setup cancelled.");
@@ -52135,6 +52222,7 @@ program.command("chat", { isDefault: true }).description("Start interactive chat
         console.log("\n\u274C Setup cancelled.");
         return;
       }
+      await saveConfiguration(result);
     }
     const providerType = options.provider ?? await getLastUsedProvider();
     if (options.print !== void 0) {