@ikyyofc/gemini-cli 4.0.8 → 4.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikyyofc/gemini-cli",
-  "version": "4.0.8",
+  "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
+// src/agent.js — ReAct agent loop with auto skill injection
 import chalk from "chalk";
 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,55 +13,61 @@ 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 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 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
-${skills.length ? "0. READ SKILL — load the relevant SKILL.md first if applicable\n" : ""}1. EXPLORE — understand the project structure
+1. EXPLORE — understand the project structure
 2. ACT — complete the task fully using tools
 3. VERIFY — test after changes
 4. REPORT — brief summary
@@ -71,7 +77,7 @@ ${toolList}
 
 ## RULES
 - Always read files before editing them
-- Use patch_file for targeted edits (safer than full rewrite)
+- Use patch_file for targeted edits
 - Verify code works after changes
 - If a command fails, diagnose and retry
 - Platform: ${process.platform} | CWD: ${process.cwd()}
@@ -101,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) {
@@ -156,7 +166,7 @@ export async function runAgentLoop(userMessage, history, {
         }
 
         // ── Tool calls ─────────────────────────────────────────────
-        // Push ALL parts (including thinking) into history for context continuity
+        // Push ALL parts including thinking into history — maintains context continuity
         messages.push({ role: "model", parts });
 
         printStepHeader(iteration);