coder-agent 2.2.1 → 2.3.0

package/dist/agent.js

@@ -1,5 +1,6 @@
 import chalk from "chalk";
 import * as path from "path";
+import * as fs from "fs/promises";
 import { TOOL_DEFINITIONS, dispatchTool } from "./tools.js";
 import { Memory } from "./memory.js";
 // ─── Loading Spinner ──────────────────────────────────────────────────────────
@@ -28,7 +29,55 @@ function stopSpinner() {
         process.stdout.write('\r\x1b[K');
     }
 }
-// ─── Formatting Helpers ──────────────────────────────────────────────────────
+// ─── Formatting & Parsing Helpers ───────────────────────────────────────────
+function normalizeFilePath(p) {
+    let normalized = p;
+    if (process.platform === "win32" && /^\/[a-zA-Z]:/.test(normalized)) {
+        normalized = normalized.slice(1);
+    }
+    return path.normalize(normalized);
+}
+function extractDiagnostics(text) {
+    const diagnostics = [];
+    const startIdx = Math.min(text.indexOf('[') === -1 ? Infinity : text.indexOf('['), text.indexOf('{') === -1 ? Infinity : text.indexOf('{'));
+    if (startIdx !== -1 && startIdx !== Infinity) {
+        const potentialJson = text.slice(startIdx).trim();
+        try {
+            let cleanedJson = potentialJson;
+            if (cleanedJson.endsWith('```')) {
+                cleanedJson = cleanedJson.slice(0, -3).trim();
+            }
+            const parsed = JSON.parse(cleanedJson);
+            const items = Array.isArray(parsed) ? parsed : [parsed];
+            for (const item of items) {
+                if (item && typeof item === 'object' && item.resource && item.message) {
+                    diagnostics.push({
+                        resource: String(item.resource),
+                        message: String(item.message),
+                        startLineNumber: Number(item.startLineNumber || item.line || 1),
+                        endLineNumber: item.endLineNumber ? Number(item.endLineNumber) : undefined
+                    });
+                }
+            }
+        }
+        catch {
+            try {
+                const resourceMatch = text.match(/"resource"\s*:\s*"([^"]+)"/);
+                const messageMatch = text.match(/"message"\s*:\s*"([^"]+)"/);
+                const lineMatch = text.match(/"startLineNumber"\s*:\s*(\d+)/) || text.match(/"line"\s*:\s*(\d+)/);
+                if (resourceMatch && messageMatch) {
+                    diagnostics.push({
+                        resource: resourceMatch[1],
+                        message: messageMatch[1].replace(/\\n/g, '\n'),
+                        startLineNumber: lineMatch ? parseInt(lineMatch[1], 10) : 1
+                    });
+                }
+            }
+            catch { }
+        }
+    }
+    return diagnostics;
+}
 function getToolBadge(name) {
     const blue = chalk.hex('#0a84ff');
     const amber = chalk.hex('#ff9f0a');
@@ -134,7 +183,6 @@ function formatResponseText(text) {
 // ─── Extract Text Tool Calls ──────────────────────────────────────────────────
 function extractTextToolCalls(content) {
     const calls = [];
-    // Pattern 1: <function(name)> {args} </function>
     const pattern1 = /<function\((\w+)\)>([\s\S]*?)(?:<\/function>)?/g;
     let match;
     while ((match = pattern1.exec(content)) !== null) {
@@ -151,7 +199,6 @@ function extractTextToolCalls(content) {
         }
         catch { }
     }
-    // Pattern 1b: <function(name){args}></function>
     const pattern1b = /<function\((\w+)\)({[\s\S]*?})>(?:<\/function>)?/g;
     pattern1b.lastIndex = 0;
     while ((match = pattern1b.exec(content)) !== null) {
@@ -170,7 +217,6 @@ function extractTextToolCalls(content) {
         }
         catch { }
     }
-    // Pattern 2: <function=name>{args}</function>
     const pattern2 = /<function=(\w+)>({[\s\S]*?})<\/function>/g;
     pattern2.lastIndex = 0;
     while ((match = pattern2.exec(content)) !== null) {
@@ -190,8 +236,19 @@ 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) {
+    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) {
         try {
@@ -201,7 +258,7 @@ 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 })
             });
             if (!res.ok) {
                 const errText = await res.text();
@@ -209,20 +266,36 @@ 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) {
             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 => setTimeout(resolve, delay));
+                    continue;
+                }
             }
             throw err;
         }
     }
+    throw new Error("Request failed after all fallback rotations.");
 }
 // ─── Agent Class ─────────────────────────────────────────────────────────────
 export class Agent {
@@ -250,18 +323,52 @@ export class Agent {
     }
     async chat(userMessage) {
         await this.memory.init(this.memoryScope, "coder");
-        this.memory.add({ role: "user", content: userMessage });
+        // ── 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) {
+                    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===========================================";
+        }
+        this.memory.add({ role: "user", content: enrichedPrompt });
         let iterations = 0;
         const MAX_ITERATIONS = 12;
         const modifiedFiles = new Set();
         let cleanContent = "";
-        // ── Phase 1: Input to Thinking ──────────────────────────────────────────
-        console.log(chalk.dim('\n' + '─'.repeat(48) + '\n'));
-        startSpinner("thinking...");
         while (iterations < MAX_ITERATIONS) {
             iterations++;
             updateSpinner("thinking...");
-            const response = await callGeminiAPI(this.apiKey, {
+            const responseObj = await callGeminiAPIWithRotation(this.apiKey, {
                 model: this.model,
                 messages: this.memory.getAll(),
                 tools: TOOL_DEFINITIONS,
@@ -269,6 +376,8 @@ export class Agent {
                 temperature: 0.2,
             });
             stopSpinner();
+            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

package/dist/index.js

@@ -172,13 +172,26 @@ async function main() {
         output: process.stdout,
         terminal: true,
     });
-    const prompt = () => {
-        rl.question(chalk.hex('#0a84ff')('›') + ' ', async (input) => {
-            const trimmed = input.trim();
+    let inputBuffer = "";
+    let pasteTimeout = null;
+    rl.setPrompt(chalk.hex('#0a84ff')('›') + ' ');
+    rl.prompt();
+    rl.on("line", (line) => {
+        inputBuffer += (inputBuffer ? "\n" : "") + line;
+        if (pasteTimeout) {
+            clearTimeout(pasteTimeout);
+        }
+        pasteTimeout = setTimeout(async () => {
+            pasteTimeout = null;
+            const accumulatedInput = inputBuffer;
+            inputBuffer = "";
+            const trimmed = accumulatedInput.trim();
             if (!trimmed) {
-                prompt();
+                rl.prompt();
                 return;
             }
+            // Pause standard input processing during agent thinking & updates
+            rl.pause();
             // Built-in slash commands
             if (trimmed === "/exit" || trimmed === "/quit") {
                 rl.close();
@@ -187,12 +200,14 @@ async function main() {
             if (trimmed === "/clear") {
                 agent.clearMemory();
                 console.log(chalk.hex('#30d158')('✓') + ' ' + chalk.gray('Memory cleared'));
-                prompt();
+                rl.resume();
+                rl.prompt();
                 return;
             }
             if (trimmed === "/status") {
                 console.log(chalk.dim(`session · ${agent.memoryStatus()}`));
-                prompt();
+                rl.resume();
+                rl.prompt();
                 return;
             }
             if (trimmed.startsWith("/model")) {
@@ -212,7 +227,8 @@ async function main() {
                         console.log(chalk.dim(`  Model must be one of: ${VALID_MODELS.join(" · ")}`));
                     }
                 }
-                prompt();
+                rl.resume();
+                rl.prompt();
                 return;
             }
             if (trimmed === "/help") {
@@ -225,7 +241,8 @@ async function main() {
                 console.log(chalk.gray(`    • Stored at: ~/.coder-config.json
     • To change key: Exit and run 'coder-agent --set-key <key>'
     • Env variable option: GEMINI_API_KEY`));
-                prompt();
+                rl.resume();
+                rl.prompt();
                 return;
             }
             try {
@@ -243,14 +260,14 @@ async function main() {
                     console.log(chalk.dim(`  ${err.message}`));
                 }
             }
-            prompt();
-        });
-    };
+            rl.resume();
+            rl.prompt();
+        }, 80);
+    });
     // Handle Ctrl+C gracefully
     rl.on("SIGINT", () => {
         process.exit(0);
     });
-    prompt();
 }
 main().catch((err) => {
     console.error(chalk.hex('#ff453a')('✕ error'));

package/package.json

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