@ikyyofc/gemini-cli 4.0.1 → 4.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikyyofc/gemini-cli",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "description": "AI Agent CLI — native function calling · GEMINI.md context · extensions",
   "type": "module",
   "bin": { "gemini": "./index.js" },

package/src/agent.js

@@ -7,7 +7,7 @@ import { loadSkills, buildSkillsPrompt } from "./skills.js";
 import {
     printAssistant, printError, printWarning,
     printToolCall, printToolResult,
-    printStepHeader, printStepFooter,
+    printStepHeader, printStepFooter, bw,
 } from "./renderer.js";
 
 const TIMEOUT_MS = 10 * 60 * 1000; // 10 minutes
@@ -109,9 +109,24 @@ export async function runAgentLoop(userMessage, history, {
             return null;
         }
 
-        const textParts   = parts.filter(p => p.text        != null);
-        const callParts   = parts.filter(p => p.functionCall != null);
-        const textContent = textParts.map(p => p.text).join("").trim();
+        // Separate: thought parts (p.thought===true), text parts, tool call parts
+        const thoughtParts = parts.filter(p => p.thought === true && p.text);
+        const textParts    = parts.filter(p => p.text != null && !p.thought);
+        const callParts    = parts.filter(p => p.functionCall != null);
+        const textContent  = textParts.map(p => p.text).join("").trim();
+        const thinkContent = thoughtParts.map(p => p.text).join("").trim();
+
+        // ── Show thinking (thought parts) ─────────────────────────
+        if (thinkContent) {
+            process.stdout.write(
+                "\n" + chalk.hex("#3A3A4E")("  ╭─ thinking ") +
+                chalk.hex("#3A3A4E")("─".repeat(Math.max(2, bw() - 13))) + "\n"
+            );
+            thinkContent.split("\n").forEach(line =>
+                process.stdout.write(chalk.hex("#3A3A4E")("  │  ") + chalk.hex("#5A5A7A").italic(line) + "\n")
+            );
+            process.stdout.write(chalk.hex("#3A3A4E")("  ╰" + "─".repeat(bw() - 1)) + "\n\n");
+        }
 
         // ── Final answer — no more tool calls ─────────────────────
         if (callParts.length === 0) {
@@ -119,12 +134,13 @@ export async function runAgentLoop(userMessage, history, {
             return { finalResponse: textContent, iterations: iteration };
         }
 
-        // ── Model reasoning text (before tool block) ───────────────
+        // ── Model reasoning text alongside tool calls ──────────────
         if (textContent) {
-            process.stdout.write(
-                chalk.hex("#4A4A5E")("  ┄ ") +
-                chalk.hex("#7A7A9A").italic(textContent.split("\n")[0].slice(0, 72)) +
-                "\n"
+            textContent.split("\n").forEach((line, i) =>
+                process.stdout.write(
+                    chalk.hex("#4A4A5E")(i === 0 ? "  ┄ " : "    ") +
+                    chalk.hex("#7A7A9A").italic(line) + "\n"
+                )
             );
         }
 

package/src/renderer.js

@@ -9,8 +9,8 @@ const C = {
     comment: "#6A9955", num:   "#B5CEA8", fn:     "#FFD080",
 };
 
-const tw   = () => Math.min(process.stdout.columns || 72, 84);
-const bw   = () => Math.min(tw() - 4, 68);
+export const tw   = () => Math.min(process.stdout.columns || 72, 84);
+export const bw   = () => Math.min(tw() - 4, 68);
 const vlen = s  => s.replace(/\x1b\[[0-9;]*m/g, "").length;
 
 // Word-wrap a PLAIN (no ANSI) string to maxW, returns array of lines
@@ -285,32 +285,38 @@ export function printStepFooter() {
 }
 
 export function printToolCall(name, args = {}) {
-    const argStr = Object.entries(args).map(([k, v]) => {
-        const raw = String(v).replace(/\n/g, "↵");
-        const val = raw.length > 42 ? raw.slice(0, 42) + "…" : raw;
-        return chalk.hex(C.muted)(k + ":") + chalk.hex(C.orange)(val);
-    }).join("  ");
+    // Tool name
     process.stdout.write(
-        chalk.hex(C.yellow)("├─ ") + chalk.hex(C.blue).bold(name) +
-        (argStr ? "  " + argStr : "") + "\n"
+        chalk.hex(C.yellow)("├─ ") + chalk.hex(C.blue).bold(name) + "\n"
     );
+    // Each arg on its own line, full value, no truncation
+    Object.entries(args).forEach(([k, v]) => {
+        const raw   = String(v);
+        const lines = raw.split("\n");
+        process.stdout.write(
+            chalk.hex(C.dimmer)("│   ") +
+            chalk.hex(C.muted)(k + ": ") +
+            chalk.hex(C.orange)(lines[0]) + "\n"
+        );
+        // Multi-line values (e.g. file content passed as arg)
+        lines.slice(1).forEach(l =>
+            process.stdout.write(chalk.hex(C.dimmer)("│        ") + chalk.hex(C.orange)(l) + "\n")
+        );
+    });
 }
 
 export function printToolResult(result) {
-    const W     = bw() - 5;
     const isErr = typeof result === "object" && result.error;
     const text  = typeof result === "object"
         ? (result.result ?? result.error ?? JSON.stringify(result, null, 2))
         : String(result);
     const color  = isErr ? chalk.hex(C.red) : chalk.hex(C.muted);
     const border = chalk.hex(C.dimmer)("│   ");
-    const lines  = text.split("\n");
-    const shown  = lines.slice(0, 10);
-    const extra  = lines.length - 10;
-    shown.forEach(l =>
-        process.stdout.write(border + color(l.length > W ? l.slice(0, W) + "…" : l) + "\n")
+
+    // Print ALL lines — no limit, no truncation
+    text.split("\n").forEach(l =>
+        process.stdout.write(border + color(l) + "\n")
     );
-    if (extra > 0) process.stdout.write(border + chalk.hex(C.dim)(`… +${extra} more lines`) + "\n");
 }
 
 // ─────────────────────────────────────────────────────────────────

package/src/tools.js

@@ -668,25 +668,48 @@ export async function executeTool(name, args = {}, { autoApprove = false } = {})
             // ── Real-time ─────────────────────────────────────────
             case "web_search": {
                 const q = encodeURIComponent(args.query);
+
+                // 1. DuckDuckGo Instant Answer API (best for facts/definitions)
                 const { stdout: ddg } = await execAsync(
-                    `curl -sL --max-time 10 "https://api.duckduckgo.com/?q=${q}&format=json&no_redirect=1&no_html=1&skip_disambig=1"`
+                    `curl -sL --max-time 10 -H "User-Agent: Mozilla/5.0" "https://api.duckduckgo.com/?q=${q}&format=json&no_redirect=1&no_html=1&skip_disambig=1"`
                 ).catch(() => ({ stdout: "" }));
-                const { stdout: html } = await execAsync(
-                    `curl -sL --max-time 10 -H "User-Agent: Mozilla/5.0" "https://html.duckduckgo.com/html/?q=${q}" | grep -oP '(?<=class="result__snippet">)[^<]+' | head -8`
+
+                // 2. DuckDuckGo Lite HTML (more reliable for general search)
+                const { stdout: lite } = await execAsync(
+                    `curl -sL --max-time 12 -H "User-Agent: Mozilla/5.0 (Linux; Android 10)" -H "Accept-Language: id,en" "https://lite.duckduckgo.com/lite/?q=${q}&kl=id-id" | grep -A1 'class="result-snippet"' | grep -v "result-snippet" | sed 's/<[^>]*>//g' | sed 's/^[[:space:]]*//' | grep -v '^$' | head -12`
+                ).catch(() => ({ stdout: "" }));
+
+                // 3. Also grab result titles from lite
+                const { stdout: titles } = await execAsync(
+                    `curl -sL --max-time 12 -H "User-Agent: Mozilla/5.0 (Linux; Android 10)" "https://lite.duckduckgo.com/lite/?q=${q}&kl=id-id" | grep -oP '(?<=<a class="result-link"[^>]*>)[^<]+' | head -8`
                 ).catch(() => ({ stdout: "" }));
 
                 let out = "";
+
+                // Parse instant answer
                 try {
                     const d = JSON.parse(ddg);
-                    if (d.AbstractText) out += `${d.AbstractText}\nSource: ${d.AbstractURL}\n\n`;
-                    if (d.Answer)       out += `Answer: ${d.Answer}\n\n`;
+                    if (d.AbstractText) out += `📖 ${d.AbstractText}\n   → ${d.AbstractURL}\n\n`;
+                    if (d.Answer)       out += `💡 ${d.Answer}\n\n`;
+                    if (d.Definition)   out += `📝 ${d.Definition}\n\n`;
                     if (d.RelatedTopics?.length) {
-                        out += "Related:\n";
-                        d.RelatedTopics.slice(0, 5).forEach(t => { if (t.Text) out += `  · ${t.Text}\n`; });
+                        const related = d.RelatedTopics.slice(0, 4).map(t => t.Text).filter(Boolean);
+                        if (related.length) out += "Related:\n" + related.map(t => `  · ${t}`).join("\n") + "\n\n";
                     }
                 } catch {}
-                if (html.trim()) out += "\nSnippets:\n" + html.trim().split("\n").map(l => `  · ${l.trim()}`).join("\n");
-                return { result: out.trim() || "No results found." };
+
+                // Add titles + snippets from lite
+                const titleList  = titles.trim().split("\n").filter(Boolean);
+                const snippetList = lite.trim().split("\n").filter(Boolean);
+                if (titleList.length) {
+                    out += "Search Results:\n";
+                    titleList.forEach((title, i) => {
+                        out += `  ${i+1}. ${title.trim()}\n`;
+                        if (snippetList[i]) out += `     ${snippetList[i].trim()}\n`;
+                    });
+                }
+
+                return { result: out.trim() || "No results found. Try rephrasing the query." };
             }
 
             case "get_weather": {