@ikyyofc/gemini-cli 4.0.7 → 4.0.8

package/index.js

@@ -4,7 +4,7 @@ import fs       from "fs";
 import path     from "path";
 import chalk    from "chalk";
 
-import { chat, callGeminiStream } from "./src/gemini.js";
+import { chat } from "./src/gemini.js";
 import { runAgentLoop } from "./src/agent.js";
 import {
     loadMemory, buildContextString, memoryShow, memoryAdd, ensureGlobalDir, GLOBAL_DIR
@@ -163,62 +163,20 @@ async function send(rawLine) {
             history.push({ role: "assistant", content: res.finalResponse });
         }
     } else {
-        // Chat mode — streaming
+        // Chat mode — non-streaming
+        const sp   = new Spinner();
         const msgs = [];
         if (sysInstruction()) msgs.push({ role: "system", content: sysInstruction() });
         msgs.push(...history, { role: "user", content: userText });
-
-        const W      = bw();
-        const prefix = chalk.hex("#00D4AA")("  │  ");
-        let   started = false;
-        let   fullText = "";
-        let   thinkText = "";
-
-        const sp = new Spinner();
         sp.start("thinking…", "#4A9EFF");
-
         try {
-            await callGeminiStream({
-                messages:          msgs,
-                fileBuffer:        pendingFile || null,
-                onThought: (chunk) => {
-                    thinkText += chunk;
-                },
-                onText: (chunk) => {
-                    if (!started) {
-                        sp.stop();
-                        // Show thinking first if any
-                        if (thinkText.trim()) {
-                            process.stdout.write(
-                                "\n" + chalk.hex("#2A2A40")("  ╭─ thinking " + "─".repeat(Math.max(2, W - 13))) + "\n"
-                            );
-                            thinkText.trim().split("\n").forEach(line =>
-                                process.stdout.write(chalk.hex("#2A2A40")("  │  ") + chalk.hex("#4A4A6A").italic(line) + "\n")
-                            );
-                            process.stdout.write(chalk.hex("#2A2A40")("  ╰" + "─".repeat(W + 1)) + "\n\n");
-                        }
-                        process.stdout.write(
-                            "\n" + chalk.hex("#00D4AA")("  ╭─") +
-                            chalk.hex("#00D4AA").bold(" gemini ") +
-                            chalk.hex("#4A4A5E")("─".repeat(Math.max(0, W - 10))) + "\n"
-                        );
-                        started = true;
-                    }
-                    fullText += chunk;
-                    process.stdout.write(prefix + chunk.replace(/\n/g, "\n" + prefix));
-                },
-                onDone: () => {
-                    if (!started) sp.stop();
-                }
-            });
-
-            if (started) {
-                process.stdout.write("\n" + chalk.hex("#00D4AA")("  ╰" + "─".repeat(W + 1)) + "\n\n");
-            }
-
-            history.push({ role: "user", content: userText }, { role: "assistant", content: fullText });
+            const t0    = Date.now();
+            const reply = await chat(msgs, pendingFile || null);
+            sp.succeed(`done  ${((Date.now()-t0)/1000).toFixed(1)}s`);
+            history.push({ role: "user", content: userText }, { role: "assistant", content: reply });
+            printAssistant(reply);
         } catch (e) {
-            sp.stop();
+            sp.fail(e.message);
             printError(e.message);
         }
     }

package/package.json

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

package/src/agent.js

@@ -1,6 +1,6 @@
-// src/agent.js — ReAct agent loop with streaming final answer
+// src/agent.js — ReAct agent loop
 import chalk from "chalk";
-import { callGemini, callGeminiStream } from "./gemini.js";
+import { callGemini } from "./gemini.js";
 import { GEMINI_TOOLS, FUNCTION_DECLARATIONS, executeTool } from "./tools.js";
 import { Spinner } from "./utils/spinner.js";
 import { loadSkills, SKILLS_DIR } from "./skills.js";
@@ -16,52 +16,66 @@ const TIMEOUT_MS = 10 * 60 * 1000;
 //  System prompt
 // ─────────────────────────────────────────────────────────────────
 function buildSystemPrompt(extra = "") {
-    const toolList   = FUNCTION_DECLARATIONS.map(t => `- ${t.name}: ${t.description}`).join("\n");
-    const skills     = loadSkills();
-    const skillIndex = skills.length
-        ? skills.map(s => {
-            const firstLine = s.content.split("\n").find(l => l.trim() && !l.startsWith("#")) ?? "";
-            return `  - ${s.slug}: ${firstLine.slice(0, 80)}`;
-        }).join("\n")
-        : null;
+    const toolList = FUNCTION_DECLARATIONS.map(t => `- ${t.name}: ${t.description}`).join("\n");
+    const skills   = loadSkills();
 
     const now      = new Date();
     const tz       = Intl.DateTimeFormat().resolvedOptions().timeZone;
     const datetime = now.toLocaleString("id-ID", { timeZone: tz, dateStyle: "full", timeStyle: "long" });
 
+    // Build skill section
+    let skillSection = "";
+    if (skills.length) {
+        const index = skills.map(s => {
+            const desc = s.content.split("\n").find(l => l.trim() && !l.startsWith("#")) ?? "";
+            return `  - ${s.slug}: ${desc.slice(0, 80)}`;
+        }).join("\n");
+
+        skillSection = `
+## SKILLS — MANDATORY
+You have skills installed. Skills contain expert instructions for specific tasks.
+
+**RULE: You MUST read the relevant skill file BEFORE starting any task.**
+Do NOT proceed with a task until you have read the applicable skill(s).
+
+Steps:
+1. Look at the installed skills below
+2. Identify which skill(s) apply to the current task
+3. Use read_file to load the skill: read_file("${SKILLS_DIR}/<slug>/SKILL.md")
+4. Follow the skill's instructions exactly
+5. Only then proceed with the task
+
+Installed skills:
+${index}
+
+Skills directory: ${SKILLS_DIR}`;
+    }
+
     return `You are an autonomous AI coding agent running in the user's terminal.
 
 ## CURRENT TIME
 ${datetime} (${tz})
+${skillSection}
 
 ## CORE RULE — NEVER ASK, ALWAYS ACT
 Use tools to complete every task. Never instruct the user to do anything themselves.
 
 ## WORKFLOW
-1. CHECK SKILLS — if skills are available, read the relevant one FIRST before starting
-2. EXPLORE — understand the project structure
-3. ACT — complete the task fully using tools
-4. VERIFY — test after changes
-5. REPORT — brief summary
+${skills.length ? "0. READ SKILL — load the relevant SKILL.md first if applicable\n" : ""}1. EXPLORE — understand the project structure
+2. ACT — complete the task fully using tools
+3. VERIFY — test after changes
+4. REPORT — brief summary
 
 ## TOOLS
 ${toolList}
 
-${skillIndex ? `## AVAILABLE SKILLS
-You have skills installed. ALWAYS check if a skill is relevant before starting a task.
-If relevant, read it first: read_file("${SKILLS_DIR}/<slug>/SKILL.md")
-
-Installed:
-${skillIndex}` : ""}
-
 ## RULES
-- Always read files before editing
-- Use patch_file for targeted edits
+- Always read files before editing them
+- Use patch_file for targeted edits (safer than full rewrite)
 - Verify code works after changes
 - If a command fails, diagnose and retry
 - Platform: ${process.platform} | CWD: ${process.cwd()}
-
-${extra ? `## EXTRA\n${extra}` : ""}`.trim();
+${extra ? `\n## EXTRA\n${extra}` : ""}`.trim();
 }
 
 // ─────────────────────────────────────────────────────────────────
@@ -125,16 +139,13 @@ export async function runAgentLoop(userMessage, history, {
         // Show thinking
         printThinkBlock(thinkContent);
 
-        // ── Final answer — stream it ───────────────────────────────
+        // ── Final answer ───────────────────────────────────────────
         if (callParts.length === 0) {
-            if (textContent) {
-                // Stream the final answer for better UX
-                await streamFinalAnswer(messages, fullSystem, thinkContent);
-            }
+            if (textContent) printAssistant(textContent);
             return { finalResponse: textContent, iterations: iteration };
         }
 
-        // Show reasoning text before tool block
+        // Reasoning text before tool block
         if (textContent) {
             textContent.split("\n").forEach((line, i) =>
                 process.stdout.write(
@@ -145,7 +156,7 @@ export async function runAgentLoop(userMessage, history, {
         }
 
         // ── Tool calls ─────────────────────────────────────────────
-        // Include ALL parts (thinking + text + calls) in history for continuity
+        // Push ALL parts (including thinking) into history for context continuity
         messages.push({ role: "model", parts });
 
         printStepHeader(iteration);
@@ -164,44 +175,3 @@ export async function runAgentLoop(userMessage, history, {
         messages.push({ role: "user", parts: responseParts });
     }
 }
-
-// ─────────────────────────────────────────────────────────────────
-//  Stream the final answer with live typing effect
-// ─────────────────────────────────────────────────────────────────
-async function streamFinalAnswer(messages, systemInstruction, prevThink) {
-    const W      = bw();
-    const prefix = chalk.hex("#00D4AA")("  │  ");
-    let   started = false;
-    let   thinkAcc = "";
-
-    const printHeader = () => {
-        process.stdout.write(
-            "\n" + chalk.hex("#00D4AA")("  ╭─") +
-            chalk.hex("#00D4AA").bold(" gemini ") +
-            chalk.hex("#4A4A5E")("─".repeat(Math.max(0, W - 10))) + "\n"
-        );
-        started = true;
-    };
-
-    await callGeminiStream({
-        messages,
-        systemInstruction,
-        onThought: (chunk) => {
-            thinkAcc += chunk;
-        },
-        onText: (chunk) => {
-            if (!started) printHeader();
-            process.stdout.write(prefix + chunk.replace(/\n/g, "\n" + prefix));
-        },
-        onDone: (parts) => {
-            // Show thinking if new thinking arrived in final answer
-            if (thinkAcc.trim() && thinkAcc !== prevThink) {
-                printThinkBlock(thinkAcc);
-            }
-        }
-    });
-
-    if (started) {
-        process.stdout.write("\n" + chalk.hex("#00D4AA")("  ╰" + "─".repeat(W + 1)) + "\n\n");
-    }
-}