coder-agent 2.8.1 → 2.8.3

package/dist/agent.js

@@ -463,6 +463,50 @@ async function callGeminiAPIWithRotation(apiKey, params, maxRetries = 3, initial
                             processChunk(value);
                     }
                 }
+                // Flush remaining buffer in case the final chunk didn't end with a newline
+                if (buffer.trim()) {
+                    const trimmed = buffer.trim();
+                    if (trimmed.startsWith("data: ") && trimmed !== "data: [DONE]") {
+                        try {
+                            const parsed = JSON.parse(trimmed.slice(6));
+                            const choice = parsed.choices?.[0];
+                            if (choice) {
+                                const content = choice.delta?.content;
+                                if (content) {
+                                    if (!silent) {
+                                        pushToTypewriter(content);
+                                    }
+                                    else {
+                                        accumulatedContent += content;
+                                    }
+                                }
+                                const toolCalls = choice.delta?.tool_calls;
+                                if (toolCalls) {
+                                    for (const tc of toolCalls) {
+                                        const idx = tc.index ?? 0;
+                                        if (!accumulatedToolCalls[idx]) {
+                                            accumulatedToolCalls[idx] = {
+                                                id: tc.id || "",
+                                                type: "function",
+                                                function: { name: "", arguments: "" }
+                                            };
+                                        }
+                                        if (tc.id)
+                                            accumulatedToolCalls[idx].id = tc.id;
+                                        if (tc.function?.name) {
+                                            accumulatedToolCalls[idx].function.name += tc.function.name;
+                                        }
+                                        if (tc.function?.arguments) {
+                                            accumulatedToolCalls[idx].function.arguments += tc.function.arguments;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        catch { }
+                    }
+                    buffer = "";
+                }
                 // Wait for the typewriter to finish writing before returning
                 if (typewriterActive && !silent) {
                     await new Promise((resolve) => {
@@ -563,6 +607,12 @@ export class Agent {
     setModel(model) {
         this.model = model;
     }
+    getApiKey() {
+        return this.apiKey;
+    }
+    setApiKey(key) {
+        this.apiKey = key;
+    }
     async chat(userMessage, signal) {
         try {
             if (signal?.aborted) {
@@ -621,6 +671,7 @@ export class Agent {
             let iterations = 0;
             const MAX_ITERATIONS = 12;
             let waitCount = 0;
+            let emptyResponseRetries = 0;
             const MAX_WAITS = 3;
             const modifiedFiles = new Set();
             let cleanContent = "";
@@ -704,8 +755,22 @@ export class Agent {
                 cleanContent = cleanContent.trim();
                 // ── No tool calls → final answer ─────────────────────────────────────
                 if (toolCalls.length === 0) {
+                    if (cleanContent === "") {
+                        if (emptyResponseRetries < 3) {
+                            emptyResponseRetries++;
+                            console.log(chalk.hex('#ff9f0a')(`\n⚠ Warning: Received empty response from API. Retrying (attempt ${emptyResponseRetries}/3)...`));
+                            this.memory.getAll().pop(); // remove empty assistant message
+                            continue;
+                        }
+                        else {
+                            console.log(chalk.hex('#ff453a')('\n✕ error: Received consecutive empty responses from Gemini API. Exiting.'));
+                            break;
+                        }
+                    }
                     break;
                 }
+                // Reset empty response retries on a successful non-empty turn
+                emptyResponseRetries = 0;
                 // ── Phase 2: Tool Execution ───────────────────────────────────────────
                 const statusLines = [];
                 for (const toolCall of toolCalls) {

package/dist/index.js

@@ -180,9 +180,15 @@ async function main() {
         console.log(chalk.dim(`✓ Default model set to: ${tempModel}`));
         process.exit(0);
     }
-    // Bootstrap API Key if missing
-    if (!apiKey) {
-        apiKey = await promptApiKey();
+    // Load API Key
+    apiKey = apiKey || "";
+    // Single-Shot Mode key check
+    if (queryArgs.length > 0 && !apiKey) {
+        console.log(chalk.hex('#ff453a')('✕ error'));
+        console.log(chalk.dim("  Gemini API Key is required but missing."));
+        console.log(chalk.dim("  Please set it using the GEMINI_API_KEY environment variable or run:"));
+        console.log(`  ${chalk.cyan("coder-agent --set-key <key>")}`);
+        process.exit(1);
     }
     let currentAbortController = null;
     let originalListeners = [];
@@ -279,7 +285,12 @@ async function main() {
     // Save/update last used info immediately
     await saveLastUsedInfo(CURRENT_VERSION, Date.now());
     printBanner(modelToUse);
-    if (showWelcomeCommands) {
+    if (!agent.getApiKey()) {
+        console.log(chalk.hex('#ff9f0a')('  🔑 Gemini API Key is missing!'));
+        console.log(`     Please type ${chalk.cyan('/key <your_api_key>')} to set and save it globally.`);
+        console.log(chalk.dim("     Get a free key at https://aistudio.google.com\n"));
+    }
+    else if (showWelcomeCommands) {
         console.log(chalk.white.bold("  💡 Get started with interactive slash commands:"));
         console.log(`    ${chalk.hex('#0a84ff')('/model')} ${chalk.gray('[name]')} — View active model or switch to [name]`);
         console.log(`    ${chalk.hex('#0a84ff')('/clear')}        — Wipe conversation memory`);
@@ -288,11 +299,15 @@ async function main() {
         console.log(`    ${chalk.hex('#0a84ff')('/exit')}         — Exit Coder`);
         console.log();
     }
+    let isRlClosed = false;
     rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout,
         terminal: true,
     });
+    rl.on("close", () => {
+        isRlClosed = true;
+    });
     process.stdin.on("keypress", (char, key) => {
         if (isHijacked || !rl)
             return;
@@ -301,6 +316,7 @@ async function main() {
                 console.log();
                 console.log(chalk.dim("  Available Commands:"));
                 console.log(`  ${chalk.hex('#0a84ff')('/model')} ${chalk.gray('[name]')} ${chalk.dim('— View active model or switch to [name]')}`);
+                console.log(`  ${chalk.hex('#0a84ff')('/key')}   ${chalk.gray('[api_key]')} ${chalk.dim('— Set/save your Gemini API Key globally')}`);
                 console.log(`  ${chalk.hex('#0a84ff')('/clear')}        ${chalk.dim('— Wipe conversation memory')}`);
                 console.log(`  ${chalk.hex('#0a84ff')('/status')}       ${chalk.dim('— Show active model and memory usage')}`);
                 console.log(`  ${chalk.hex('#0a84ff')('/help')}         ${chalk.dim('— Show help screen')}`);
@@ -314,24 +330,42 @@ async function main() {
     let pasteTimeout = null;
     let lineCountInBurst = 0;
     async function executeAgentChat(trimmed) {
+        if (isRlClosed)
+            return;
         // Pause standard input processing during agent thinking & updates
-        rl.pause();
+        try {
+            rl.pause();
+        }
+        catch { }
         // Built-in slash commands
         if (trimmed === "/exit" || trimmed === "/quit") {
-            rl.close();
+            try {
+                rl.close();
+            }
+            catch { }
             process.exit(0);
         }
         if (trimmed === "/clear") {
             agent.clearMemory();
             console.log(chalk.hex('#30d158')('✓') + ' ' + chalk.gray('Memory cleared'));
-            rl.resume();
-            rl.prompt();
+            if (!isRlClosed) {
+                try {
+                    rl.resume();
+                    rl.prompt();
+                }
+                catch { }
+            }
             return;
         }
         if (trimmed === "/status") {
             console.log(chalk.dim(`session · ${agent.memoryStatus()}`));
-            rl.resume();
-            rl.prompt();
+            if (!isRlClosed) {
+                try {
+                    rl.resume();
+                    rl.prompt();
+                }
+                catch { }
+            }
             return;
         }
         if (trimmed.startsWith("/model")) {
@@ -351,22 +385,77 @@ async function main() {
                     console.log(chalk.dim(`  Model must be one of: ${VALID_MODELS.join(" · ")}`));
                 }
             }
-            rl.resume();
-            rl.prompt();
+            if (!isRlClosed) {
+                try {
+                    rl.resume();
+                    rl.prompt();
+                }
+                catch { }
+            }
+            return;
+        }
+        if (trimmed.startsWith("/key")) {
+            const parts = trimmed.split(/\s+/);
+            if (parts.length === 1) {
+                const keyToCheck = agent.getApiKey();
+                if (keyToCheck) {
+                    const masked = keyToCheck.slice(0, 7) + "..." + keyToCheck.slice(-4);
+                    console.log(chalk.dim(`  Gemini API Key is set: `) + chalk.gray(masked));
+                }
+                else {
+                    console.log(chalk.hex('#ff453a')('✕ error') + chalk.dim(' — Gemini API Key is missing. Set it using: /key <your_api_key>'));
+                }
+            }
+            else {
+                const newKey = parts[1].trim();
+                if (!newKey) {
+                    console.log(chalk.hex('#ff453a')('✕ error') + chalk.dim(' — API Key cannot be empty.'));
+                }
+                else {
+                    await saveApiKey(newKey);
+                    agent.setApiKey(newKey);
+                    console.log(chalk.hex('#30d158')('✓') + ' ' + chalk.gray('Gemini API Key saved and set successfully.'));
+                }
+            }
+            if (!isRlClosed) {
+                try {
+                    rl.resume();
+                    rl.prompt();
+                }
+                catch { }
+            }
             return;
         }
         if (trimmed === "/help") {
             console.log(chalk.white.bold("\n  Interactive Commands:"));
             console.log(chalk.gray(`    /model [name] — View active model or switch to [name]
+    /key [api_key]— Set/save your Gemini API Key globally (hides the key from the LLM)
     /clear        — Wipe conversation memory
     /status       — Show active model and memory usage
     /exit         — Exit Coder`));
             console.log(chalk.white.bold("\n  API Keys & Configuration:"));
             console.log(chalk.gray(`    • Stored at: ~/.coder-config.json
-    • To change key: Exit and run 'coder-agent --set-key <key>'
+    • To change key: Type '/key <api_key>' or run 'coder-agent --set-key <key>'
     • Env variable option: GEMINI_API_KEY`));
-            rl.resume();
-            rl.prompt();
+            if (!isRlClosed) {
+                try {
+                    rl.resume();
+                    rl.prompt();
+                }
+                catch { }
+            }
+            return;
+        }
+        // Block logic execution if API Key is missing
+        if (!agent.getApiKey()) {
+            console.log(chalk.hex('#ff453a')('✕ error') + chalk.dim(' — Gemini API Key is missing. Please set it using: /key <your_api_key>'));
+            if (!isRlClosed) {
+                try {
+                    rl.resume();
+                    rl.prompt();
+                }
+                catch { }
+            }
             return;
         }
         currentAbortController = new AbortController();
@@ -395,9 +484,14 @@ async function main() {
             stopHijack();
             currentAbortController = null;
         }
-        rl.resume();
-        console.log(chalk.dim('────────────────────────────────────────────────'));
-        rl.prompt();
+        if (!isRlClosed) {
+            try {
+                rl.resume();
+                console.log(chalk.dim('────────────────────────────────────────────────'));
+                rl.prompt();
+            }
+            catch { }
+        }
     }
     console.log(chalk.dim('────────────────────────────────────────────────'));
     rl.setPrompt(chalk.hex('#0a84ff')('›') + ' ');

package/package.json

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