@ikyyofc/gemini-cli 3.0.5 → 3.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ikyyofc/gemini-cli",
-  "version": "3.0.5",
+  "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

@@ -110,40 +110,45 @@ function consolidate(cwd, beforeSnapshot) {
 }
 
 // ─────────────────────────────────────────────────────────────────
-//  Install
-//  1. Snapshot existing SKILL.md paths
-//  2. npx skills add (wherever it installs)
-//  3. Find new SKILL.md files and copy ALL → ~/.agents/
+//  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 { skill: explicitSkill = null, all = false } = opts;
     const { source, skill: parsedSkill } = parseSource(rawSource);
     const skillName = explicitSkill ?? parsedSkill;
 
-    const cwd    = process.cwd();
-    const before = new Set(
-        KNOWN_AGENT_DIRS.flatMap(rel => scanForSkillMds(path.join(cwd, rel), 3))
-    );
+    // Snapshot before
+    const before = new Set(loadSkills().map(s => s.slug));
 
     const parts = ["add", source, "-y"];
     if (skillName) parts.push(`--skill "${skillName}"`);
     if (all)       parts.push("--skill '*'");
 
     const { stdout, stderr } = await npxSkills(parts.join(" "));
-    const installed = consolidate(cwd, before);
 
-    return { output: stdout || stderr, installed };
+    // 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 };
 }
 
 // ─────────────────────────────────────────────────────────────────
-//  Remove — delete from ~/.agents/ then best-effort npx remove
+//  Remove — checks both ~/.agents/<slug>/ and ~/.agents/skills/<slug>/
 // ─────────────────────────────────────────────────────────────────
 export async function removeSkillNpx(slug) {
-    const skillDir = path.join(AGENTS_DIR, slug);
-    if (!fs.existsSync(skillDir)) throw new Error(`"${slug}" not found in ~/.agents/`);
-    fs.rmSync(skillDir, { recursive: true, force: true });
+    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 ~/.agents/${slug}` };
+
+    return { output: `Removed: ${found.join(", ")}` };
 }
 
 // ─────────────────────────────────────────────────────────────────
@@ -167,26 +172,38 @@ export async function initSkill(name = "") {
 }
 
 // ─────────────────────────────────────────────────────────────────
-//  Load all skills from ~/.agents/ for agent context injection
+//  Load all skills — scans both:
+//    ~/.agents/<slug>/SKILL.md          (manual / flat)
+//    ~/.agents/skills/<slug>/SKILL.md   (npx skills default)
 // ─────────────────────────────────────────────────────────────────
 export function loadSkills() {
     const skills = [];
-    if (!fs.existsSync(AGENTS_DIR)) return skills;
-
-    for (const entry of fs.readdirSync(AGENTS_DIR, { withFileTypes: true })) {
-        if (!entry.isDirectory()) continue;
-        const skillMd = path.join(AGENTS_DIR, entry.name, "SKILL.md");
-        if (!fs.existsSync(skillMd)) continue;
-
-        const content   = fs.readFileSync(skillMd, "utf8");
-        const nameMatch = content.match(/^#\s+(.+)$/m);
-        skills.push({
-            name:    nameMatch?.[1]?.trim() ?? entry.name,
-            slug:    entry.name,
-            content,
-            path:    path.join(AGENTS_DIR, entry.name),
-        });
-    }
+    const seen   = new Set();
+
+    const scanBase = (baseDir) => {
+        if (!fs.existsSync(baseDir)) return;
+        for (const entry of fs.readdirSync(baseDir, { withFileTypes: true })) {
+            if (!entry.isDirectory()) continue;
+            if (seen.has(entry.name)) continue;
+            const skillMd = path.join(baseDir, entry.name, "SKILL.md");
+            if (!fs.existsSync(skillMd)) continue;
+            seen.add(entry.name);
+            const content   = fs.readFileSync(skillMd, "utf8");
+            const nameMatch = content.match(/^#\s+(.+)$/m);
+            skills.push({
+                name:    nameMatch?.[1]?.trim() ?? entry.name,
+                slug:    entry.name,
+                content,
+                path:    path.join(baseDir, entry.name),
+            });
+        }
+    };
+
+    // 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;
 }