coder-agent 2.2.2 → 2.3.1

package/dist/agent.js

@@ -236,10 +236,26 @@ function extractTextToolCalls(content) {
     }
     return calls;
 }
-// ─── Gemini API client ────────────────────────────────────────────────────────
-async function callGeminiAPI(apiKey, params, maxRetries = 3, initialDelayMs = 1500) {
+// ─── Gemini API client with Auto-Rotation Fallback ────────────────────────────
+async function callGeminiAPIWithRotation(apiKey, params, maxRetries = 3, initialDelayMs = 1500, signal) {
+    const rotationList = [
+        "gemini-2.5-flash",
+        "gemini-2.5-pro",
+        "gemini-2.0-flash",
+        "gemini-2.0-pro-exp"
+    ];
+    let currentModel = params.model;
+    let modelIndex = rotationList.indexOf(currentModel);
+    if (modelIndex === -1) {
+        modelIndex = 0; // Default if not in list
+    }
     let attempts = 0;
     while (attempts < maxRetries) {
+        if (signal?.aborted) {
+            const abortErr = new Error("The user aborted a request.");
+            abortErr.name = "AbortError";
+            throw abortErr;
+        }
         try {
             const res = await fetch("https://generativelanguage.googleapis.com/v1beta/openai/chat/completions", {
                 method: "POST",
@@ -247,7 +263,8 @@ async function callGeminiAPI(apiKey, params, maxRetries = 3, initialDelayMs = 15
                     "Content-Type": "application/json",
                     "Authorization": `Bearer ${apiKey}`
                 },
-                body: JSON.stringify(params)
+                body: JSON.stringify({ ...params, model: currentModel }),
+                signal
             });
             if (!res.ok) {
                 const errText = await res.text();
@@ -255,20 +272,50 @@ async function callGeminiAPI(apiKey, params, maxRetries = 3, initialDelayMs = 15
                 err.status = res.status;
                 throw err;
             }
-            return await res.json();
+            const data = await res.json();
+            return { data, modelUsed: currentModel };
         }
         catch (err) {
+            if (signal?.aborted || err?.name === "AbortError") {
+                throw err;
+            }
             attempts++;
             const status = err?.status;
             const isRetryableError = status === 429 || status === 503 || (status >= 500 && status < 600) || !status;
-            if (isRetryableError && attempts < maxRetries) {
-                const delay = initialDelayMs * Math.pow(2, attempts - 1);
-                await new Promise(resolve => setTimeout(resolve, delay));
-                continue;
+            if (isRetryableError) {
+                // Rotate model immediately if rate limit or service unavailable occurred
+                if ((status === 429 || status === 503) && modelIndex + 1 < rotationList.length) {
+                    modelIndex++;
+                    const nextModel = rotationList[modelIndex];
+                    stopSpinner();
+                    console.log(chalk.hex('#ff9f0a')('⚠') + ' ' + chalk.gray(`Rate limited on ${currentModel}. Rotating to ${nextModel}`));
+                    startSpinner("thinking...");
+                    currentModel = nextModel;
+                    attempts = 0; // reset retry counter for the fresh model
+                    continue;
+                }
+                // Otherwise do standard delay retry on same model
+                if (attempts < maxRetries) {
+                    const delay = initialDelayMs * Math.pow(2, attempts - 1);
+                    await new Promise((resolve, reject) => {
+                        const timer = setTimeout(resolve, delay);
+                        if (signal) {
+                            const onAbort = () => {
+                                clearTimeout(timer);
+                                const abortErr = new Error("The user aborted a request.");
+                                abortErr.name = "AbortError";
+                                reject(abortErr);
+                            };
+                            signal.addEventListener("abort", onAbort);
+                        }
+                    });
+                    continue;
+                }
             }
             throw err;
         }
     }
+    throw new Error("Request failed after all fallback rotations.");
 }
 // ─── Agent Class ─────────────────────────────────────────────────────────────
 export class Agent {
@@ -294,154 +341,195 @@ export class Agent {
     setModel(model) {
         this.model = model;
     }
-    async chat(userMessage) {
-        await this.memory.init(this.memoryScope, "coder");
-        // ── Phase 1: Input & Enriched Context Pre-Parsing ──────────────────────
-        console.log(chalk.dim('\n' + '─'.repeat(48) + '\n'));
-        startSpinner("thinking...");
-        const diagnostics = extractDiagnostics(userMessage);
-        let enrichedPrompt = userMessage;
-        if (diagnostics.length > 0) {
-            updateSpinner("resolving files & context...");
-            const contexts = [];
-            for (const diag of diagnostics) {
-                const filePath = normalizeFilePath(diag.resource);
-                try {
-                    const content = await fs.readFile(filePath, "utf-8");
-                    const lines = content.split(/\r?\n/);
-                    const startLine = Math.max(1, diag.startLineNumber - 10);
-                    const endLine = Math.min(lines.length, (diag.endLineNumber || diag.startLineNumber) + 10);
-                    const slice = lines.slice(startLine - 1, endLine);
-                    const numberedLines = slice.map((line, idx) => `${startLine + idx}: ${line}`);
-                    contexts.push(`File contents of ${filePath} (around line ${diag.startLineNumber}):\n` + numberedLines.join("\n"));
-                }
-                catch (err) {
-                    // If the absolute path doesn't exist directly (e.g. running in virtual workspaces), try to resolve it relative to current cwd
+    async chat(userMessage, signal) {
+        try {
+            if (signal?.aborted) {
+                const abortErr = new Error("The user aborted a request.");
+                abortErr.name = "AbortError";
+                throw abortErr;
+            }
+            await this.memory.init(this.memoryScope, "coder");
+            if (signal?.aborted) {
+                const abortErr = new Error("The user aborted a request.");
+                abortErr.name = "AbortError";
+                throw abortErr;
+            }
+            // ── Phase 1: Input & Enriched Context Pre-Parsing ──────────────────────
+            console.log(chalk.dim('\n' + '─'.repeat(48) + '\n'));
+            startSpinner("thinking...");
+            const diagnostics = extractDiagnostics(userMessage);
+            let enrichedPrompt = userMessage;
+            if (diagnostics.length > 0) {
+                updateSpinner("resolving files & context...");
+                const contexts = [];
+                for (const diag of diagnostics) {
+                    if (signal?.aborted) {
+                        const abortErr = new Error("The user aborted a request.");
+                        abortErr.name = "AbortError";
+                        throw abortErr;
+                    }
+                    const filePath = normalizeFilePath(diag.resource);
                     try {
-                        const relativePath = path.relative("/", filePath).replace(/^[a-zA-Z]:/, "").replace(/^\\+|^[//]+/, "");
-                        const localContent = await fs.readFile(relativePath, "utf-8");
-                        const lines = localContent.split(/\r?\n/);
+                        const content = await fs.readFile(filePath, "utf-8");
+                        const lines = content.split(/\r?\n/);
                         const startLine = Math.max(1, diag.startLineNumber - 10);
                         const endLine = Math.min(lines.length, (diag.endLineNumber || diag.startLineNumber) + 10);
                         const slice = lines.slice(startLine - 1, endLine);
                         const numberedLines = slice.map((line, idx) => `${startLine + idx}: ${line}`);
-                        contexts.push(`File contents of resolved path ${relativePath} (around line ${diag.startLineNumber}):\n` + numberedLines.join("\n"));
+                        contexts.push(`File contents of ${filePath} (around line ${diag.startLineNumber}):\n` + numberedLines.join("\n"));
                     }
-                    catch {
-                        contexts.push(`[File Context: failed to read path ${filePath} - ${err.message}]`);
+                    catch (err) {
+                        try {
+                            const relativePath = path.relative("/", filePath).replace(/^[a-zA-Z]:/, "").replace(/^\\+|^[//]+/, "");
+                            const localContent = await fs.readFile(relativePath, "utf-8");
+                            const lines = localContent.split(/\r?\n/);
+                            const startLine = Math.max(1, diag.startLineNumber - 10);
+                            const endLine = Math.min(lines.length, (diag.endLineNumber || diag.startLineNumber) + 10);
+                            const slice = lines.slice(startLine - 1, endLine);
+                            const numberedLines = slice.map((line, idx) => `${startLine + idx}: ${line}`);
+                            contexts.push(`File contents of resolved path ${relativePath} (around line ${diag.startLineNumber}):\n` + numberedLines.join("\n"));
+                        }
+                        catch {
+                            contexts.push(`[File Context: failed to read path ${filePath} - ${err.message}]`);
+                        }
                     }
                 }
+                enrichedPrompt += "\n\n=== Enriched Code Context (Auto-Parsed) ===\n" + contexts.join("\n\n") + "\n===========================================";
             }
-            enrichedPrompt += "\n\n=== Enriched Code Context (Auto-Parsed) ===\n" + contexts.join("\n\n") + "\n===========================================";
-        }
-        this.memory.add({ role: "user", content: enrichedPrompt });
-        let iterations = 0;
-        const MAX_ITERATIONS = 12;
-        const modifiedFiles = new Set();
-        let cleanContent = "";
-        while (iterations < MAX_ITERATIONS) {
-            iterations++;
-            updateSpinner("thinking...");
-            const response = await callGeminiAPI(this.apiKey, {
-                model: this.model,
-                messages: this.memory.getAll(),
-                tools: TOOL_DEFINITIONS,
-                tool_choice: "auto",
-                temperature: 0.2,
-            });
-            stopSpinner();
-            const choice = response.choices[0];
-            const msg = choice.message;
-            // Extract text-based tool calls if native tool_calls is empty
-            let toolCalls = msg.tool_calls || [];
-            const extracted = extractTextToolCalls(msg.content ?? "");
-            if (toolCalls.length === 0 && extracted.length > 0) {
-                toolCalls = extracted.map(e => ({
-                    id: e.id,
-                    type: "function",
-                    function: {
-                        name: e.name,
-                        arguments: JSON.stringify(e.args)
-                    }
-                }));
-            }
-            // Save assistant message to memory
-            const assistantMsg = {
-                role: "assistant",
-                content: msg.content ?? "",
-                tool_calls: toolCalls.length > 0 ? toolCalls : undefined,
-            };
-            this.memory.add(assistantMsg);
-            // Clean up text tool calls from the conversational output content
-            cleanContent = msg.content ?? "";
-            for (const call of extracted) {
-                cleanContent = cleanContent.replace(call.rawText, "");
-            }
-            cleanContent = cleanContent.trim();
-            // ── No tool calls → final answer ─────────────────────────────────────
-            if (toolCalls.length === 0) {
-                break;
-            }
-            // ── Phase 2: Tool Execution ───────────────────────────────────────────
-            const statusLines = [];
-            for (const toolCall of toolCalls) {
-                const name = toolCall.function.name;
-                let args = {};
-                try {
-                    args = JSON.parse(toolCall.function.arguments);
+            this.memory.add({ role: "user", content: enrichedPrompt });
+            let iterations = 0;
+            const MAX_ITERATIONS = 12;
+            const modifiedFiles = new Set();
+            let cleanContent = "";
+            while (iterations < MAX_ITERATIONS) {
+                if (signal?.aborted) {
+                    const abortErr = new Error("The user aborted a request.");
+                    abortErr.name = "AbortError";
+                    throw abortErr;
+                }
+                iterations++;
+                updateSpinner("thinking...");
+                const responseObj = await callGeminiAPIWithRotation(this.apiKey, {
+                    model: this.model,
+                    messages: this.memory.getAll(),
+                    tools: TOOL_DEFINITIONS,
+                    tool_choice: "auto",
+                    temperature: 0.2,
+                }, 3, 1500, signal);
+                stopSpinner();
+                if (signal?.aborted) {
+                    const abortErr = new Error("The user aborted a request.");
+                    abortErr.name = "AbortError";
+                    throw abortErr;
+                }
+                this.model = responseObj.modelUsed; // Persist successful model rotation
+                const response = responseObj.data;
+                const choice = response.choices[0];
+                const msg = choice.message;
+                // Extract text-based tool calls if native tool_calls is empty
+                let toolCalls = msg.tool_calls || [];
+                const extracted = extractTextToolCalls(msg.content ?? "");
+                if (toolCalls.length === 0 && extracted.length > 0) {
+                    toolCalls = extracted.map(e => ({
+                        id: e.id,
+                        type: "function",
+                        function: {
+                            name: e.name,
+                            arguments: JSON.stringify(e.args)
+                        }
+                    }));
+                }
+                // Save assistant message to memory
+                const assistantMsg = {
+                    role: "assistant",
+                    content: msg.content ?? "",
+                    tool_calls: toolCalls.length > 0 ? toolCalls : undefined,
+                };
+                this.memory.add(assistantMsg);
+                // Clean up text tool calls from the conversational output content
+                cleanContent = msg.content ?? "";
+                for (const call of extracted) {
+                    cleanContent = cleanContent.replace(call.rawText, "");
                 }
-                catch { }
-                // Render tool execution card
-                const badge = getToolBadge(name);
-                const target = getToolTargetDescription(name, args);
-                const details = getToolDetailsDescription(name, args);
-                console.log(`  ${badge}  ${chalk.gray(target)}`);
-                console.log(chalk.dim(`  ${details}`));
-                // Track created or modified files
-                if (name === "write_file" || name === "patch_file") {
-                    if (args.file_path) {
-                        modifiedFiles.add(path.normalize(args.file_path));
+                cleanContent = cleanContent.trim();
+                // ── No tool calls → final answer ─────────────────────────────────────
+                if (toolCalls.length === 0) {
+                    break;
+                }
+                // ── Phase 2: Tool Execution ───────────────────────────────────────────
+                const statusLines = [];
+                for (const toolCall of toolCalls) {
+                    if (signal?.aborted) {
+                        const abortErr = new Error("The user aborted a request.");
+                        abortErr.name = "AbortError";
+                        throw abortErr;
+                    }
+                    const name = toolCall.function.name;
+                    let args = {};
+                    try {
+                        args = JSON.parse(toolCall.function.arguments);
+                    }
+                    catch { }
+                    // Render tool execution card
+                    const badge = getToolBadge(name);
+                    const target = getToolTargetDescription(name, args);
+                    const details = getToolDetailsDescription(name, args);
+                    console.log(`  ${badge}  ${chalk.gray(target)}`);
+                    console.log(chalk.dim(`  ${details}`));
+                    // Track created or modified files
+                    if (name === "write_file" || name === "patch_file") {
+                        if (args.file_path) {
+                            modifiedFiles.add(path.normalize(args.file_path));
+                        }
                     }
+                    const result = await dispatchTool(name, args, signal);
+                    if (signal?.aborted) {
+                        const abortErr = new Error("The user aborted a request.");
+                        abortErr.name = "AbortError";
+                        throw abortErr;
+                    }
+                    // Generate outcome result status line
+                    const isError = result.startsWith("ERROR:");
+                    if (isError) {
+                        statusLines.push(`${chalk.hex('#ff453a')('✕')} ${chalk.gray(result.slice(6).trim())}`);
+                    }
+                    else {
+                        statusLines.push(`${chalk.hex('#30d158')('✓')} ${chalk.gray(getToolSuccessSummary(name, args, result))}`);
+                    }
+                    this.memory.add({
+                        role: "tool",
+                        content: result,
+                        tool_call_id: toolCall.id,
+                        name,
+                    });
                 }
-                const result = await dispatchTool(name, args);
-                // Generate outcome result status line
-                const isError = result.startsWith("ERROR:");
-                if (isError) {
-                    statusLines.push(`${chalk.hex('#ff453a')('✕')} ${chalk.gray(result.slice(6).trim())}`);
+                // Stream results status lines
+                console.log("");
+                for (const line of statusLines) {
+                    console.log(line);
                 }
-                else {
-                    statusLines.push(`${chalk.hex('#30d158')('✓')} ${chalk.gray(getToolSuccessSummary(name, args, result))}`);
+                if (iterations < MAX_ITERATIONS) {
+                    console.log(chalk.dim('\n' + '─'.repeat(48) + '\n'));
+                    startSpinner("thinking...");
                 }
-                this.memory.add({
-                    role: "tool",
-                    content: result,
-                    tool_call_id: toolCall.id,
-                    name,
-                });
             }
-            // Stream results status lines
-            console.log("");
-            for (const line of statusLines) {
-                console.log(line);
+            // Output modified files metadata line if applicable
+            if (modifiedFiles.size > 0) {
+                console.log(chalk.dim('─') + ' ' + chalk.dim(`${modifiedFiles.size} file(s) modified`));
             }
-            if (iterations < MAX_ITERATIONS) {
-                console.log(chalk.dim('\n' + '─'.repeat(48) + '\n'));
-                startSpinner("thinking...");
+            // ── Phase 3: Final Agent Response ───────────────────────────────────────
+            console.log(chalk.dim('\n' + '─'.repeat(48) + '\n'));
+            if (cleanContent) {
+                console.log(formatResponseText(cleanContent));
+                console.log(""); // one trailing blank line
+            }
+            if (iterations >= MAX_ITERATIONS) {
+                console.log(chalk.hex('#ff453a')('✕ error'));
+                console.log(chalk.dim('  Max tool iterations reached.'));
             }
         }
-        // Output modified files metadata line if applicable
-        if (modifiedFiles.size > 0) {
-            console.log(chalk.dim('─') + ' ' + chalk.dim(`${modifiedFiles.size} file(s) modified`));
-        }
-        // ── Phase 3: Final Agent Response ───────────────────────────────────────
-        console.log(chalk.dim('\n' + '─'.repeat(48) + '\n'));
-        if (cleanContent) {
-            console.log(formatResponseText(cleanContent));
-            console.log(""); // one trailing blank line
-        }
-        if (iterations >= MAX_ITERATIONS) {
-            console.log(chalk.hex('#ff453a')('✕ error'));
-            console.log(chalk.dim('  Max tool iterations reached.'));
+        finally {
+            stopSpinner();
         }
     }
 }

package/dist/index.js

@@ -174,6 +174,7 @@ async function main() {
     });
     let inputBuffer = "";
     let pasteTimeout = null;
+    let currentAbortController = null;
     rl.setPrompt(chalk.hex('#0a84ff')('›') + ' ');
     rl.prompt();
     rl.on("line", (line) => {
@@ -245,29 +246,46 @@ async function main() {
                 rl.prompt();
                 return;
             }
+            currentAbortController = new AbortController();
             try {
-                await agent.chat(trimmed);
+                await agent.chat(trimmed, currentAbortController.signal);
             }
             catch (err) {
-                console.log(chalk.hex('#ff453a')('✕ error'));
-                if (err?.status === 401) {
-                    console.log(chalk.dim("  Invalid API key. Check your configuration."));
-                }
-                else if (err?.status === 429) {
-                    console.log(chalk.dim("  Rate limit exceeded on Gemini API."));
+                if (err?.name === "AbortError" || currentAbortController.signal.aborted) {
+                    console.log(chalk.hex('#ff453a')('\n✕ cancelled'));
                 }
                 else {
-                    console.log(chalk.dim(`  ${err.message}`));
+                    console.log(chalk.hex('#ff453a')('✕ error'));
+                    if (err?.status === 401) {
+                        console.log(chalk.dim("  Invalid API key. Check your configuration."));
+                    }
+                    else if (err?.status === 429) {
+                        console.log(chalk.dim("  Rate limit exceeded on Gemini API."));
+                    }
+                    else {
+                        console.log(chalk.dim(`  ${err.message}`));
+                    }
                 }
             }
+            finally {
+                currentAbortController = null;
+            }
             rl.resume();
             rl.prompt();
         }, 80);
     });
     // Handle Ctrl+C gracefully
-    rl.on("SIGINT", () => {
-        process.exit(0);
-    });
+    const sigintHandler = () => {
+        if (currentAbortController) {
+            currentAbortController.abort();
+        }
+        else {
+            rl.close();
+            process.exit(0);
+        }
+    };
+    process.on("SIGINT", sigintHandler);
+    rl.on("SIGINT", sigintHandler);
 }
 main().catch((err) => {
     console.error(chalk.hex('#ff453a')('✕ error'));

package/dist/tools.js

@@ -181,7 +181,7 @@ export async function list_directory({ dir_path = "." }) {
         return `ERROR: ${e.message}`;
     }
 }
-export async function run_shell({ command, cwd }) {
+export async function run_shell({ command, cwd }, signal) {
     try {
         let targetCwd = process.cwd();
         if (cwd) {
@@ -200,18 +200,22 @@ export async function run_shell({ command, cwd }) {
         const { stdout, stderr } = await execAsync(command, {
             cwd: targetCwd,
             timeout: 30_000,
+            signal,
         });
         const out = [stdout.trim(), stderr.trim()].filter(Boolean).join("\n--- stderr ---\n");
         return out || "(no output)";
     }
     catch (e) {
+        if (e.name === "AbortError" || signal?.aborted) {
+            throw e;
+        }
         return `EXIT ${e.code ?? "?"}: ${e.stderr || e.message}`;
     }
 }
-export async function web_search({ query }) {
+export async function web_search({ query }, signal) {
     try {
         const url = `https://api.duckduckgo.com/?q=${encodeURIComponent(query)}&format=json&no_html=1&skip_disambig=1`;
-        const res = await fetch(url);
+        const res = await fetch(url, { signal });
         const data = (await res.json());
         const parts = [];
         if (data.AbstractText)
@@ -229,6 +233,9 @@ export async function web_search({ query }) {
         return parts.length ? parts.join("\n\n") : `No instant answer found for: "${query}". Try rephrasing.`;
     }
     catch (e) {
+        if (e.name === "AbortError" || signal?.aborted) {
+            throw e;
+        }
         return `Search error: ${e.message}`;
     }
 }
@@ -341,13 +348,13 @@ export async function patch_file({ file_path, target_code, replacement_code }) {
     }
 }
 // ─── Dispatcher ──────────────────────────────────────────────────────────────
-export async function dispatchTool(name, args) {
+export async function dispatchTool(name, args, signal) {
     switch (name) {
         case "read_file": return read_file(args);
         case "write_file": return write_file(args);
         case "list_directory": return list_directory(args);
-        case "run_shell": return run_shell(args);
-        case "web_search": return web_search(args);
+        case "run_shell": return run_shell(args, signal);
+        case "web_search": return web_search(args, signal);
         case "find_files": return find_files(args);
         case "read_file_lines": return read_file_lines(args);
         case "search_grep": return search_grep(args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coder-agent",
-  "version": "2.2.2",
+  "version": "2.3.1",
   "description": "CLI coding agent powered by Google Gemini",
   "type": "module",
   "main": "dist/index.js",