coder-agent 2.2.2 → 2.3.0

package/dist/agent.js

@@ -236,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 {
@@ -247,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();
@@ -255,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 {
@@ -316,7 +343,6 @@ export class Agent {
                     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
                     try {
                         const relativePath = path.relative("/", filePath).replace(/^[a-zA-Z]:/, "").replace(/^\\+|^[//]+/, "");
                         const localContent = await fs.readFile(relativePath, "utf-8");
@@ -342,7 +368,7 @@ export class Agent {
         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,
@@ -350,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/package.json

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