@ikyyofc/gemini-cli 1.0.6 → 1.0.7

package/index.js

@@ -81,20 +81,13 @@ function cleanup() {
     disableBracketedPaste();
     try { if (process.stdin.isTTY) process.stdin.setRawMode(false); } catch {}
 }
-process.on("exit",    cleanup);
+process.on("exit", cleanup);
 process.on("SIGTERM", () => { cleanup(); process.exit(0); });
 
-// When terminal is resized (or focus returns on some terminals),
-// only redraw prompt if we are NOT currently processing
-process.on("SIGWINCH", () => { if (!processing) showPrompt(); });
-
 // ─────────────────────────────────────────────────────────────────
 //  Prompt
 // ─────────────────────────────────────────────────────────────────
 function showPrompt() {
-    // Never redraw prompt while a request is in flight
-    if (processing) return;
-
     const mode  = agentMode     ? chalk.hex("#4EC9B0")("agent") : chalk.dim("chat");
     const yolo  = autoApprove   ? chalk.red(" yolo")   : "";
     const file  = pendingFile   ? chalk.yellow(` +${path.basename(pendingPath)}`) : "";
@@ -141,20 +134,22 @@ async function send(rawLine) {
             history.push({ role: "assistant", content: res.finalResponse });
         }
     } else {
-        process.stdout.write(chalk.hex("#555566")("  ⋯ ") + chalk.dim("thinking…") + "\n");
+        const { default: ora } = await import("ora");
+        const sp = ora({
+            text: "thinking…", spinner: "dots", color: "cyan",
+            prefixText: "  ", discardStdin: false
+        }).start();
         const msgs = [];
         if (sysInstruction()) msgs.push({ role: "system", content: sysInstruction() });
         msgs.push(...history, { role: "user", content: userText });
         try {
             const t0    = Date.now();
             const reply = await chat(msgs, pendingFile || null);
-            // clear "thinking…" line, print done
-            if (process.stdout.isTTY) process.stdout.write("\x1b[1A\x1b[2K");
-            process.stdout.write(chalk.hex("#555566")("  ⋯ ") + chalk.dim(`done (${((Date.now()-t0)/1000).toFixed(1)}s)`) + "\n");
+            sp.succeed(chalk.dim(`done (${((Date.now()-t0)/1000).toFixed(1)}s)`));
             history.push({ role: "user", content: userText }, { role: "assistant", content: reply });
             printAssistant(reply);
         } catch (e) {
-            if (process.stdout.isTTY) process.stdout.write("\x1b[1A\x1b[2K");
+            sp.fail("failed");
             printError(e.message);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikyyofc/gemini-cli",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "AI CLI Agent powered by Gemini — your own terminal assistant",
   "type": "module",
   "main": "index.js",

package/src/agent.js

@@ -1,115 +1,116 @@
-// src/agent.js — ReAct agent loop, native Gemini function calling
+// src/agent.js — ReAct agent loop using NATIVE Gemini function calling
 import chalk from "chalk";
+import ora   from "ora";
 import { callGemini }   from "./gemini.js";
 import { GEMINI_TOOLS, executeTool } from "./tools.js";
 import { printAssistant, printError, printWarning, printToolCall, printToolResult } from "./renderer.js";
 
-// ─────────────────────────────────────────────────────────────────
-//  Static progress line — write once, no continuous redraw
-//  Safe when terminal loses focus (no ANSI overwrite loops)
-// ─────────────────────────────────────────────────────────────────
-function printStep(n, label) {
-    process.stdout.write(
-        chalk.hex("#555566")("  ⋯ ") +
-        chalk.dim(label) +
-        (n > 1 ? chalk.hex("#555566")(` (step ${n})`) : "") +
-        "\n"
-    );
-}
-
-function clearLastLine() {
-    // Move cursor up one line and clear it — only called right after printStep
-    // so we can replace "thinking…" with the actual tool section header
-    if (process.stdout.isTTY) {
-        process.stdout.write("\x1b[1A\x1b[2K");
-    }
-}
-
+/**
+ * Run the agent loop until the model gives a final text answer (no more tool calls).
+ *
+ * Native function calling flow:
+ *   1. Send contents + tools (functionDeclarations) to Gemini
+ *   2. Response parts may contain: { functionCall: { name, args } }
+ *   3. Execute the tool → get result
+ *   4. Append model turn (with functionCall) + user turn (with functionResponse)
+ *   5. Repeat until response has only text parts → done
+ */
 export async function runAgentLoop(userMessage, history, {
     systemInstruction = null,
     autoApprove       = false,
     maxIterations     = 40,
 } = {}) {
 
+    // Build initial message list
     const messages = [
         ...history,
         { role: "user", content: userMessage }
     ];
 
-    let iteration    = 0;
-    let sectionOpen  = false;
+    let iteration = 0;
 
     while (iteration < maxIterations) {
         iteration++;
 
-        // Print a static "thinking…" line — written once, not looping
-        printStep(iteration, iteration === 1 ? "thinking…" : "thinking…");
+        // ── Call Gemini API with tools ──────────────────────────
+        const spinner = ora({
+            text:         chalk.dim(iteration === 1 ? "thinking…" : `step ${iteration}…`),
+            spinner:      "dots",
+            color:        "cyan",
+            prefixText:   "  ",
+            discardStdin: false,   // prevent ora from pausing stdin after stop
+        }).start();
 
         let parts;
         try {
             const res = await callGemini({ messages, tools: GEMINI_TOOLS, systemInstruction });
             parts = res.parts;
-            // Clear the "thinking…" line now that we have a response
-            clearLastLine();
+            spinner.stop();
+            clearLine();
         } catch (err) {
-            clearLastLine();
+            spinner.fail(chalk.hex("#F44747")("API error"));
             printError(err.message);
             return null;
         }
 
-        const textParts = parts.filter(p => p.text   != null);
+        // ── Separate text parts from functionCall parts ─────────
+        const textParts = parts.filter(p => p.text != null);
         const callParts = parts.filter(p => p.functionCall != null);
 
-        // Model thinking aloud alongside tool calls
+        // Print any accompanying text (model thinking aloud)
         const textContent = textParts.map(p => p.text).join("").trim();
         if (textContent && callParts.length > 0) {
             process.stdout.write(
-                chalk.hex("#555566")("  ┄ ") +
-                chalk.dim(textContent.split("\n")[0].slice(0, 80)) +
-                "\n"
+                chalk.dim("  …  " + textContent.replace(/\n/g, "\n       ")) + "\n"
             );
         }
 
-        // ── Final answer (no more tool calls) ─────────────────────
+        // ── No tool calls → final answer ────────────────────────
         if (callParts.length === 0) {
             const final = textParts.map(p => p.text).join("").trim();
-            if (sectionOpen) {
+            // Close the tool section if it was opened
+            if (iteration > 1) {
                 process.stdout.write(
                     chalk.hex("#4A9EFF")("  ╰") +
                     chalk.hex("#555566")("─".repeat(47)) + "\n"
                 );
-                sectionOpen = false;
             }
             if (final) printAssistant(final);
             return { finalResponse: final, iterations: iteration };
         }
 
-        // ── Tool calls ─────────────────────────────────────────────
+        // ── Execute each tool call ───────────────────────────────
         messages.push({ role: "model", parts });
 
-        if (!sectionOpen) {
+        // Print tool section header on first iteration
+        if (iteration === 1) {
             process.stdout.write(
                 "\n" + chalk.hex("#4A9EFF")("  ╭─ working") +
                 chalk.hex("#555566")(" " + "─".repeat(36)) + "\n"
             );
-            sectionOpen = true;
         }
 
         const responseParts = [];
+
         for (const part of callParts) {
             const { name, args } = part.functionCall;
             printToolCall(name, args);
+
             const result = await executeTool(name, args ?? {}, { autoApprove });
             printToolResult(result);
-            responseParts.push({ functionResponse: { name, response: result } });
+
+            responseParts.push({
+                functionResponse: { name, response: result }
+            });
         }
 
         messages.push({ role: "user", parts: responseParts });
     }
 
-    if (sectionOpen) {
-        process.stdout.write(chalk.hex("#4A9EFF")("  ╰") + chalk.hex("#555566")("─".repeat(47)) + "\n");
-    }
-    printWarning(`max iterations (${maxIterations}) reached`);
+    printWarning(`Max iterations (${maxIterations}) reached.`);
     return { finalResponse: null, iterations: iteration };
 }
+
+function clearLine() {
+    if (process.stdout.clearLine) { process.stdout.clearLine(0); process.stdout.cursorTo(0); }
+}