@ikyyofc/gemini-cli 4.0.7 → 4.0.9

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.9",
   "description": "AI Agent CLI — native function calling · GEMINI.md context · extensions",
   "type": "module",
   "bin": { "gemini": "./index.js" },

package/src/agent.js

@@ -1,9 +1,9 @@
-// src/agent.js — ReAct agent loop with streaming final answer
+// src/agent.js — ReAct agent loop with auto skill injection
 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";
+import { loadSkills } from "./skills.js";
 import {
     printAssistant, printError, printWarning,
     printToolCall, printToolResult,
@@ -13,18 +13,47 @@ import {
 const TIMEOUT_MS = 10 * 60 * 1000;
 
 // ─────────────────────────────────────────────────────────────────
-//  System prompt
+//  Auto-inject relevant skill content into conversation
+//  This happens BEFORE the first LLM call — model has no choice
+//  but to see and follow the skill instructions.
 // ─────────────────────────────────────────────────────────────────
-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;
+function injectSkills(userMessage, messages) {
+    const skills = loadSkills();
+    if (!skills.length) return messages;
+
+    const query = userMessage.toLowerCase();
+    const words = query.split(/\s+/).filter(w => w.length > 3);
+
+    // Score each skill by keyword match
+    const scored = skills.map(skill => {
+        const hay  = (skill.name + " " + skill.slug + " " + skill.content.slice(0, 400)).toLowerCase();
+        const hits = words.filter(w => hay.includes(w)).length;
+        return { skill, hits };
+    });
+
+    // Use matched skills, or ALL skills if none matched (task is ambiguous)
+    const matched  = scored.filter(s => s.hits > 0).map(s => s.skill);
+    const toInject = matched.length > 0 ? matched : skills;
+
+    const block = toInject.map(s =>
+        `=== SKILL: ${s.name} ===\n${s.content.trim()}`
+    ).join("\n\n---\n\n");
+
+    // Replace the last user message with skill context prepended
+    const last   = messages[messages.length - 1];
+    const newLast = {
+        role:    "user",
+        content: `[SKILLS TO APPLY FOR THIS TASK]\n\n${block}\n\n[END SKILLS]\n\nTask: ${last.content ?? userMessage}`
+    };
+
+    return [...messages.slice(0, -1), newLast];
+}
 
+// ─────────────────────────────────────────────────────────────────
+//  System prompt — clean, no skill listing
+// ─────────────────────────────────────────────────────────────────
+function buildSystemPrompt(extra = "") {
+    const toolList = FUNCTION_DECLARATIONS.map(t => `- ${t.name}: ${t.description}`).join("\n");
     const now      = new Date();
     const tz       = Intl.DateTimeFormat().resolvedOptions().timeZone;
     const datetime = now.toLocaleString("id-ID", { timeZone: tz, dateStyle: "full", timeStyle: "long" });
@@ -38,30 +67,21 @@ ${datetime} (${tz})
 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
+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
+- Always read files before editing them
 - Use patch_file for targeted edits
 - 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();
 }
 
 // ─────────────────────────────────────────────────────────────────
@@ -87,10 +107,14 @@ export async function runAgentLoop(userMessage, history, {
 } = {}) {
 
     const fullSystem = buildSystemPrompt(systemInstruction ?? "");
-    const messages   = [...history, { role: "user", content: userMessage }];
-    const spinner    = new Spinner();
-    const deadline   = Date.now() + TIMEOUT_MS;
-    let   iteration  = 0;
+
+    // Build messages and auto-inject relevant skills
+    let messages = [...history, { role: "user", content: userMessage }];
+    messages     = injectSkills(userMessage, messages);
+
+    const spinner  = new Spinner();
+    const deadline = Date.now() + TIMEOUT_MS;
+    let   iteration = 0;
 
     while (true) {
         if (Date.now() > deadline) {
@@ -125,16 +149,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 +166,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 — maintains context continuity
         messages.push({ role: "model", parts });
 
         printStepHeader(iteration);
@@ -164,44 +185,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");
-    }
-}