coder-agent 2.8.2 → 2.8.4

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) => {
@@ -627,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 = "";
@@ -710,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) {
@@ -724,6 +783,14 @@ export class Agent {
                     let args = {};
                     try {
                         args = JSON.parse(toolCall.function.arguments);
+                        if (args && typeof args === "object") {
+                            if (args.filepath && !args.file_path)
+                                args.file_path = args.filepath;
+                            if (args.path && !args.file_path)
+                                args.file_path = args.path;
+                            if (args.dirpath && !args.dir_path)
+                                args.dir_path = args.dirpath;
+                        }
                     }
                     catch { }
                     // Render tool execution card

package/dist/tools.js

@@ -423,15 +423,22 @@ export async function patch_file({ file_path, target_code, replacement_code }) {
         }
         const targetPath = normalizeFilePath(file_path);
         const content = await fs.readFile(targetPath, "utf-8");
-        if (!content.includes(target_code)) {
+        // Normalize all line endings to LF (\n) for comparison and patching
+        const normalizedContent = content.replace(/\r\n/g, "\n");
+        const normalizedTarget = target_code.replace(/\r\n/g, "\n");
+        const normalizedReplacement = replacement_code.replace(/\r\n/g, "\n");
+        if (!normalizedContent.includes(normalizedTarget)) {
             return `ERROR: Target code not found in file ${file_path}. Please verify target content.`;
         }
-        const occurrences = content.split(target_code).length - 1;
+        const occurrences = normalizedContent.split(normalizedTarget).length - 1;
         if (occurrences > 1) {
             return `ERROR: Target code matches ${occurrences} times in file ${file_path}. Please provide more unique context to target the exact edit.`;
         }
-        const newContent = content.replace(target_code, replacement_code);
-        await fs.writeFile(targetPath, newContent, "utf-8");
+        const newNormalizedContent = normalizedContent.replace(normalizedTarget, normalizedReplacement);
+        // Restore original CRLF line endings if the original file had them
+        const hasCrlf = content.includes("\r\n");
+        const finalContent = hasCrlf ? newNormalizedContent.replace(/\n/g, "\r\n") : newNormalizedContent;
+        await fs.writeFile(targetPath, finalContent, "utf-8");
         return `✓ Patched file ${file_path} successfully.`;
     }
     catch (e) {

package/package.json

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