@ikyyofc/gemini-cli 3.0.4 → 3.0.6

package/package.json

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

package/src/skills.js

@@ -1,11 +1,5 @@
 // src/skills.js — Skills manager via npx skills CLI
-// All install/search/list/remove operations delegate to "npx skills"
-// which is the official skills.sh CLI (github.com/vercel-labs/skills)
-//
-// Skills directories (Gemini agent convention from skills.sh):
-//   Project:  ./.gemini/skills/     (committed with project)
-//   Global:   ~/.gemini/skills/     (across all projects)
-//   Custom:   ./.agents/            (manual / local skills)
+// All skills are consolidated into a single path: ~/.agents/
 import fs   from "fs";
 import path from "path";
 import os   from "os";
@@ -14,29 +8,54 @@ import { exec }      from "child_process";
 
 const execAsync = promisify(exec);
 
-// Directories where npx skills installs for Gemini agent
-const GLOBAL_SKILLS_DIR  = path.join(os.homedir(), ".gemini", "skills");
-const PROJECT_SKILLS_DIR = () => path.join(process.cwd(), ".gemini", "skills");
-const CUSTOM_SKILLS_DIR  = () => path.join(process.cwd(), ".agents");
+// Single canonical location for ALL skills
+export const AGENTS_DIR = path.join(os.homedir(), ".agents");
+
+// Agent dirs that npx skills may create (we scan after install to find new files)
+const KNOWN_AGENT_DIRS = [
+    ".gemini", ".gemini/skills",
+    ".claude", ".claude/skills",
+    ".cursor", ".cursor/rules",
+    ".codex",  ".opencode",
+    ".cline",  ".aider",
+    ".amp",    ".copilot",
+];
 
 export function ensureSkillsDirs() {
-    fs.mkdirSync(GLOBAL_SKILLS_DIR,  { recursive: true });
+    fs.mkdirSync(AGENTS_DIR, { recursive: true });
+}
+
+// ─────────────────────────────────────────────────────────────────
+//  Scan a dir tree for SKILL.md files
+// ─────────────────────────────────────────────────────────────────
+function scanForSkillMds(baseDir, maxDepth = 5) {
+    const results = [];
+    const SKIP    = new Set(["node_modules", ".git", "dist", "build"]);
+    const walk    = (dir, depth) => {
+        if (depth > maxDepth || !fs.existsSync(dir)) return;
+        for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+            if (SKIP.has(entry.name)) continue;
+            const full = path.join(dir, entry.name);
+            if (entry.isDirectory())            walk(full, depth + 1);
+            else if (entry.name === "SKILL.md") results.push(full);
+        }
+    };
+    walk(baseDir, 0);
+    return results;
 }
 
 // ─────────────────────────────────────────────────────────────────
-//  Run npx skills with timeout
+//  Run npx skills — exposes real stderr on failure
 // ─────────────────────────────────────────────────────────────────
 async function npxSkills(args, cwd = process.cwd(), timeout = 120_000) {
     const cmd = `npx --yes skills ${args}`;
     try {
         const { stdout, stderr } = await execAsync(cmd, {
-            cwd,
-            timeout,
+            cwd, timeout,
             env: { ...process.env, NO_COLOR: "1", CI: "1" },
         });
         return { stdout: stdout.trim(), stderr: stderr.trim() };
     } catch (err) {
-        // Expose actual npx output in the thrown error message
         const detail = [err.stdout?.trim(), err.stderr?.trim()]
             .filter(Boolean).join("\n") || err.message;
         throw new Error(detail);
@@ -44,161 +63,158 @@ async function npxSkills(args, cwd = process.cwd(), timeout = 120_000) {
 }
 
 // ─────────────────────────────────────────────────────────────────
-//  Parse source: handles "owner/repo@skill-name" shorthand
-//  e.g. "anthropics/skills@frontend-design"
-//       → source="anthropics/skills", skill="frontend-design"
+//  Parse "owner/repo@skill-name" shorthand
 // ─────────────────────────────────────────────────────────────────
 function parseSource(raw) {
     const atIdx = raw.indexOf("@");
     if (atIdx > 0 && !raw.startsWith("http") && !raw.startsWith("git@")) {
-        return {
-            source: raw.slice(0, atIdx),
-            skill:  raw.slice(atIdx + 1),
-        };
+        return { source: raw.slice(0, atIdx), skill: raw.slice(atIdx + 1) };
     }
     return { source: raw, skill: null };
 }
 
 // ─────────────────────────────────────────────────────────────────
-//  Install — npx skills add <source> [-y] [--global] [--skill name]
+//  After npx install: copy new SKILL.md files → ~/.agents/<slug>/
+// ─────────────────────────────────────────────────────────────────
+function consolidate(cwd, beforeSnapshot) {
+    const copied = [];
+    const dest   = AGENTS_DIR;
+
+    // 1. Check known agent dirs first
+    for (const rel of KNOWN_AGENT_DIRS) {
+        for (const f of scanForSkillMds(path.join(cwd, rel), 3)) {
+            if (beforeSnapshot.has(f)) continue;
+            const slug = path.basename(path.dirname(f));
+            const dir  = path.join(dest, slug);
+            fs.mkdirSync(dir, { recursive: true });
+            fs.copyFileSync(f, path.join(dir, "SKILL.md"));
+            copied.push(slug);
+        }
+    }
+
+    // 2. Broader scan of cwd for anything missed
+    if (copied.length === 0) {
+        for (const f of scanForSkillMds(cwd, 5)) {
+            if (beforeSnapshot.has(f)) continue;
+            // Skip anything already inside ~/.agents
+            if (f.startsWith(dest)) continue;
+            const slug = path.basename(path.dirname(f));
+            const dir  = path.join(dest, slug);
+            fs.mkdirSync(dir, { recursive: true });
+            fs.copyFileSync(f, path.join(dir, "SKILL.md"));
+            copied.push(slug);
+        }
+    }
+
+    return [...new Set(copied)]; // deduplicate
+}
+
+// ─────────────────────────────────────────────────────────────────
+//  Install — npx skills puts files directly into ~/.agents/skills/
+//  No post-copy needed; just run npx and report what's new
 // ─────────────────────────────────────────────────────────────────
 export async function installSkill(rawSource, opts = {}) {
-    const { global = false, skill: explicitSkill = null, all = false } = opts;
+    const { skill: explicitSkill = null, all = false } = opts;
     const { source, skill: parsedSkill } = parseSource(rawSource);
     const skillName = explicitSkill ?? parsedSkill;
 
-    // Build args — let npx skills auto-detect agent (more reliable than -a gemini)
+    // Snapshot before
+    const before = new Set(loadSkills().map(s => s.slug));
+
     const parts = ["add", source, "-y"];
-    if (global)    parts.push("-g");
     if (skillName) parts.push(`--skill "${skillName}"`);
     if (all)       parts.push("--skill '*'");
 
     const { stdout, stderr } = await npxSkills(parts.join(" "));
-    return { output: stdout || stderr };
+
+    // Report what was newly installed
+    const after   = loadSkills().map(s => s.slug);
+    const newSlugs = after.filter(s => !before.has(s));
+
+    return { output: stdout || stderr, installed: newSlugs };
 }
 
 // ─────────────────────────────────────────────────────────────────
-//  List installed — npx skills list
+//  Remove — checks both ~/.agents/<slug>/ and ~/.agents/skills/<slug>/
 // ─────────────────────────────────────────────────────────────────
-export async function listNpxSkills(global = false) {
-    const args  = global ? "list -g" : "list";
-    const { stdout } = await npxSkills(args);
-    return stdout;
+export async function removeSkillNpx(slug) {
+    const candidates = [
+        path.join(AGENTS_DIR, slug),
+        path.join(AGENTS_DIR, "skills", slug),
+    ];
+    const found = candidates.filter(d => fs.existsSync(d));
+    if (!found.length) throw new Error(`"${slug}" not found in ~/.agents/`);
+
+    found.forEach(d => fs.rmSync(d, { recursive: true, force: true }));
+    try { await npxSkills(`remove ${slug} -y`); } catch {}
+
+    return { output: `Removed: ${found.join(", ")}` };
 }
 
 // ─────────────────────────────────────────────────────────────────
-//  Search — npx skills find <query>
+//  Delegate to npx for search / list / update / init
 // ─────────────────────────────────────────────────────────────────
 export async function findSkills(query) {
     const { stdout } = await npxSkills(`find ${JSON.stringify(query)}`);
     return stdout;
 }
-
-// ─────────────────────────────────────────────────────────────────
-//  Remove — npx skills remove <slug>
-// ─────────────────────────────────────────────────────────────────
-export async function removeSkillNpx(slug) {
-    const { stdout, stderr } = await npxSkills(`remove ${slug} -y`);
-    return { output: stdout || stderr };
+export async function listNpxSkills() {
+    const { stdout } = await npxSkills("list");
+    return stdout;
 }
-
-// ─────────────────────────────────────────────────────────────────
-//  Update — npx skills update [slug]
-// ─────────────────────────────────────────────────────────────────
 export async function updateSkill(slug = "") {
-    const args = slug ? `update ${slug} -y` : "update -y";
-    const { stdout, stderr } = await npxSkills(args);
-    return { output: stdout || stderr };
+    const { stdout } = await npxSkills(slug ? `update ${slug} -y` : "update -y");
+    return stdout;
 }
-
-// ─────────────────────────────────────────────────────────────────
-//  Init — npx skills init [name]   (creates a SKILL.md template)
-// ─────────────────────────────────────────────────────────────────
 export async function initSkill(name = "") {
-    const args = name ? `init "${name}"` : "init";
-    const { stdout, stderr } = await npxSkills(args);
-    return { output: stdout || stderr };
+    const { stdout } = await npxSkills(name ? `init "${name}"` : "init");
+    return stdout;
 }
 
 // ─────────────────────────────────────────────────────────────────
-//  Load skills for agent context injection
-//  Scans all skill directories and reads SKILL.md files
+//  Load all skills — scans both:
+//    ~/.agents/<slug>/SKILL.md          (manual / flat)
+//    ~/.agents/skills/<slug>/SKILL.md   (npx skills default)
 // ─────────────────────────────────────────────────────────────────
 export function loadSkills() {
     const skills = [];
     const seen   = new Set();
 
-    const scanDir = (dir, scope) => {
-        if (!fs.existsSync(dir)) return;
-
-        const entries = fs.readdirSync(dir, { withFileTypes: true });
-        for (const entry of entries) {
+    const scanBase = (baseDir) => {
+        if (!fs.existsSync(baseDir)) return;
+        for (const entry of fs.readdirSync(baseDir, { withFileTypes: true })) {
             if (!entry.isDirectory()) continue;
-
-            const skillDir = path.join(dir, entry.name);
-            const skillMd  = path.join(skillDir, "SKILL.md");
+            if (seen.has(entry.name)) continue;
+            const skillMd = path.join(baseDir, entry.name, "SKILL.md");
             if (!fs.existsSync(skillMd)) continue;
-
-            const key = entry.name;
-            if (seen.has(key)) continue; // project takes priority over global
-            seen.add(key);
-
-            const content = fs.readFileSync(skillMd, "utf8");
-
-            // Parse optional frontmatter name from SKILL.md
+            seen.add(entry.name);
+            const content   = fs.readFileSync(skillMd, "utf8");
             const nameMatch = content.match(/^#\s+(.+)$/m);
-            const name      = nameMatch?.[1]?.trim() ?? entry.name;
-
-            skills.push({ name, slug: entry.name, content, scope, path: skillDir });
+            skills.push({
+                name:    nameMatch?.[1]?.trim() ?? entry.name,
+                slug:    entry.name,
+                content,
+                path:    path.join(baseDir, entry.name),
+            });
         }
     };
 
-    // Priority: project (.gemini/skills/) > custom (.agents/) > global (~/.gemini/skills/)
-    scanDir(PROJECT_SKILLS_DIR(), "project");
-    scanDir(CUSTOM_SKILLS_DIR(),  "custom");
-    scanDir(GLOBAL_SKILLS_DIR,    "global");
+    // Flat: ~/.agents/<slug>/SKILL.md
+    scanBase(AGENTS_DIR);
+    // Nested: ~/.agents/skills/<slug>/SKILL.md  (npx skills default)
+    scanBase(path.join(AGENTS_DIR, "skills"));
 
     return skills;
 }
 
-// ─────────────────────────────────────────────────────────────────
-//  Build skills section injected into agent system prompt
-// ─────────────────────────────────────────────────────────────────
 export function buildSkillsPrompt(skills) {
     if (!skills.length) return null;
-
     const sections = skills.map(s =>
         `### Skill: ${s.name}\n${s.content.trim()}`
     ).join("\n\n---\n\n");
-
-    return `## INSTALLED SKILLS\n\nApply the following skills when relevant to the current task:\n\n${sections}`;
+    return `## INSTALLED SKILLS\n\nApply the following skills when relevant:\n\n${sections}`;
 }
 
-// ─────────────────────────────────────────────────────────────────
-//  Quick disk check — list installed skills without running npx
-// ─────────────────────────────────────────────────────────────────
 export function listInstalledSkills() {
-    const result = [];
-
-    const scanDir = (dir, isGlobal) => {
-        if (!fs.existsSync(dir)) return;
-        for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-            if (!entry.isDirectory()) continue;
-            const skillDir = path.join(dir, entry.name);
-            if (!fs.existsSync(path.join(skillDir, "SKILL.md"))) continue;
-            const content   = fs.readFileSync(path.join(skillDir, "SKILL.md"), "utf8");
-            const nameMatch = content.match(/^#\s+(.+)$/m);
-            result.push({
-                slug:   entry.name,
-                name:   nameMatch?.[1]?.trim() ?? entry.name,
-                global: isGlobal,
-                dir:    skillDir,
-            });
-        }
-    };
-
-    scanDir(PROJECT_SKILLS_DIR(), false);
-    scanDir(CUSTOM_SKILLS_DIR(),  false);
-    scanDir(GLOBAL_SKILLS_DIR,    true);
-    return result;
+    return loadSkills().map(s => ({ ...s, global: true, dir: s.path }));
 }