@ikyyofc/gemini-cli 3.0.0 → 3.0.2

package/index.js

@@ -24,11 +24,16 @@ import {
 } from "./src/input.js";
 import { setupGlobalProxy, proxyStatus, setProxyEnabled } from "./src/utils/proxy.js";
 import { Spinner } from "./src/utils/spinner.js";
+import {
+    listInstalledSkills, installSkill, removeSkill,
+    searchSkills, browseSkills, ensureSkillsDirs, loadSkills,
+} from "./src/skills.js";
 
 // ─────────────────────────────────────────────────────────────────
 //  Bootstrap
 // ─────────────────────────────────────────────────────────────────
 ensureGlobalDir();
+ensureSkillsDirs();
 setupGlobalProxy();   // aktifkan rotasi proxy sebelum request apapun
 
 let extensions    = loadExtensions();
@@ -231,6 +236,138 @@ async function handleCommand(input) {
             printInfo("conversation cleared");
             break;
 
+        case "/skill": case "/skills": {
+            const sub  = tokens[1]?.toLowerCase();
+            const rest = tokens.slice(2).join(" ").trim();
+
+            // /skill list
+            if (!sub || sub === "list") {
+                const list = listInstalledSkills();
+                if (!list.length) {
+                    printInfo("no skills installed  ·  use /skill add <id> to install");
+                    printInfo("browse skills at https://skills.sh");
+                    break;
+                }
+                console.log("");
+                list.forEach(s => {
+                    const scope = s.global ? chalk.dim("global") : chalk.hex("#4EC9B0")("project");
+                    console.log(
+                        "  " + chalk.hex("#FFD080").bold(s.slug.padEnd(28)) +
+                        chalk.dim(s.source.padEnd(30)) + scope
+                    );
+                });
+                console.log(chalk.dim(`\n  ${list.length} skill(s) loaded into agent context\n`));
+                break;
+            }
+
+            // /skill add <id> [--global]
+            if (sub === "add" || sub === "install") {
+                const isGlobal = rest.includes("--global");
+                const id       = rest.replace("--global", "").trim();
+                if (!id) { printError("usage: /skill add <owner/repo/slug> [--global]"); break; }
+                const sp = new Spinner();
+                sp.start(`installing ${id}…`, "#FFD080");
+                try {
+                    const result = await installSkill(id, isGlobal ? "global" : "project");
+                    sp.succeed(`installed: ${result.name}  →  ${result.dir}`);
+                    printInfo("skill will be active on next message");
+                } catch (e) {
+                    sp.fail(e.message);
+                    printError(e.message);
+                }
+                break;
+            }
+
+            // /skill remove <slug>
+            if (sub === "remove" || sub === "rm") {
+                const slug = rest;
+                if (!slug) { printError("usage: /skill remove <slug>"); break; }
+                try {
+                    const removed = removeSkill(slug);
+                    removed.forEach(r => printSuccess(`removed: ${r}`));
+                } catch (e) { printError(e.message); }
+                break;
+            }
+
+            // /skill search <query>
+            if (sub === "search") {
+                if (!rest) { printError("usage: /skill search <query>"); break; }
+                const sp = new Spinner();
+                sp.start(`searching "${rest}"…`, "#4A9EFF");
+                try {
+                    const results = await searchSkills(rest, 8);
+                    sp.stop();
+                    if (!results.length) { printInfo("no results found"); break; }
+                    console.log("");
+                    results.forEach(r => {
+                        console.log(
+                            "  " + chalk.hex("#4A9EFF").bold(r.id.padEnd(48)) +
+                            chalk.dim(String(r.installs).padStart(8) + " installs")
+                        );
+                        if (r.name !== r.slug)
+                            console.log("  " + chalk.dim(" ".repeat(2) + r.name));
+                    });
+                    console.log(chalk.dim("\n  install: /skill add <id>\n"));
+                } catch (e) {
+                    sp.fail(e.message);
+                    printError(e.message);
+                }
+                break;
+            }
+
+            // /skill browse [trending|hot]
+            if (sub === "browse") {
+                const view = rest || "all-time";
+                const sp   = new Spinner();
+                sp.start(`fetching ${view}…`, "#4A9EFF");
+                try {
+                    const results = await browseSkills(view, 15);
+                    sp.stop();
+                    console.log("");
+                    results.forEach((r, i) => {
+                        console.log(
+                            "  " + chalk.dim(String(i+1).padStart(2) + ".") + " " +
+                            chalk.hex("#4A9EFF").bold(r.id.padEnd(46)) +
+                            chalk.dim(String(r.installs).padStart(8) + " installs")
+                        );
+                    });
+                    console.log(chalk.dim("\n  /skill browse trending  ·  /skill browse hot\n"));
+                } catch (e) {
+                    sp.fail(e.message);
+                    printError(e.message);
+                }
+                break;
+            }
+
+            // /skill info <id>
+            if (sub === "info") {
+                if (!rest) { printError("usage: /skill info <id>"); break; }
+                const sp = new Spinner();
+                sp.start(`fetching ${rest}…`, "#4A9EFF");
+                try {
+                    const { default: ax } = await import("axios");
+                    const { data } = await ax.get(`https://skills.sh/api/v1/skills/${rest}`);
+                    sp.stop();
+                    console.log("");
+                    printInfo(`id       ${data.id}`);
+                    printInfo(`source   ${data.source}`);
+                    printInfo(`installs ${data.installs}`);
+                    printInfo(`files    ${data.files?.length ?? 0}`);
+                    if (data.files?.length) {
+                        data.files.forEach(f => console.log(chalk.dim("           " + f.path)));
+                    }
+                    console.log(chalk.dim(`\n  /skill add ${data.id}\n`));
+                } catch (e) {
+                    sp.fail(e.message);
+                    printError(e.message);
+                }
+                break;
+            }
+
+            printInfo("usage: /skill [list | add | remove | search | browse | info]");
+            break;
+        }
+
         case "/file":
             if (!arg) { printError("usage: /file <path>"); break; }
             attachFile(arg); break;
@@ -282,12 +419,14 @@ async function handleCommand(input) {
             break;
 
         case "/model": {
-            const px = proxyStatus();
+            const px  = proxyStatus();
+            const sk  = loadSkills();
             printInfo(`model      gemini-pro-latest`);
             printInfo(`tools      ${agentMode ? "on (native function calling)" : "off"}`);
             printInfo(`yolo       ${autoApprove ? "on" : "off"}`);
             printInfo(`memory     ${memoryLoaded.length} file(s)  ·  extensions: ${extensions.length}`);
-            printInfo(`proxy      ${px.available}/${px.total} available  ·  ${px.blocked} blocked  ·  ${px.enabled ? "on" : "off"}`);
+            printInfo(`skills     ${sk.length} active  ·  .agents/ + ~/.gemini/agents/`);
+            printInfo(`proxy      ${px.available}/${px.total} available  ·  ${px.enabled ? "on" : "off"}`);
             printInfo(`config     ${GLOBAL_DIR}`);
             break;
         }
@@ -324,7 +463,7 @@ async function handleCommand(input) {
 // ─────────────────────────────────────────────────────────────────
 async function main() {
     process.stdout.write("\x1Bc");
-    console.log(renderWelcome(memoryLoaded.length, extensions.length));
+    console.log(renderWelcome(memoryLoaded.length, extensions.length, loadSkills().length));
 
     const argv = process.argv.slice(2);
     const positional = [];

package/package.json

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

package/src/agent.js

@@ -3,6 +3,7 @@ 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, buildSkillsPrompt } from "./skills.js";
 import {
     printAssistant, printError, printWarning,
     printToolCall, printToolResult,
@@ -15,7 +16,10 @@ const TIMEOUT_MS = 10 * 60 * 1000; // 10 minutes
 //  System prompt
 // ─────────────────────────────────────────────────────────────────
 function buildSystemPrompt(extra = "") {
-    const toolList = FUNCTION_DECLARATIONS.map(t => `- ${t.name}: ${t.description}`).join("\n");
+    const toolList    = FUNCTION_DECLARATIONS.map(t => `- ${t.name}: ${t.description}`).join("\n");
+    const skills      = loadSkills();
+    const skillsBlock = buildSkillsPrompt(skills);
+
     return `You are an autonomous AI coding agent running in the user's terminal. You have full access to their filesystem and shell through tools.
 
 ## CORE RULE — NEVER ASK, ALWAYS ACT
@@ -49,7 +53,7 @@ ${toolList}
 - Current working directory: ${process.cwd()}
 - Platform: ${process.platform}
 
-${extra ? `## EXTRA INSTRUCTIONS\n${extra}` : ""}`.trim();
+${skillsBlock ? skillsBlock + "\n" : ""}${extra ? `## EXTRA INSTRUCTIONS\n${extra}` : ""}`.trim();
 }
 
 // ─────────────────────────────────────────────────────────────────

package/src/renderer.js

@@ -13,16 +13,18 @@ const tw   = () => Math.min(process.stdout.columns || 72, 84);
 const bw   = () => Math.min(tw() - 4, 68);
 const vlen = s  => s.replace(/\x1b\[[0-9;]*m/g, "").length;
 
-function wrapText(text, maxW) {
-    if (vlen(text) <= maxW) return [text];
+// Word-wrap a PLAIN (no ANSI) string to maxW, returns array of lines
+function wrapPlain(text, maxW) {
+    if (!text || text.length <= maxW) return [text || ""];
     const words = text.split(" ");
     const lines = [];
     let cur = "";
     for (const w of words) {
-        const adding = cur ? cur + " " + w : w;
-        if (vlen(adding) <= maxW) { cur = adding; continue; }
+        const candidate = cur ? cur + " " + w : w;
+        if (candidate.length <= maxW) { cur = candidate; continue; }
         if (cur) lines.push(cur);
-        if (vlen(w) > maxW) {
+        if (w.length > maxW) {
+            // hard-wrap single very long word (e.g. bare URL)
             for (let i = 0; i < w.length; i += maxW) lines.push(w.slice(i, i + maxW));
             cur = "";
         } else { cur = w; }
@@ -31,37 +33,34 @@ function wrapText(text, maxW) {
     return lines.length ? lines : [""];
 }
 
-// ─── Syntax highlight ────────────────────────────────────────────
-// FIX: applyToRaw() ensures the number regex never matches digits
-// inside existing \x00N\x00 placeholder markers (the root cause of
-// garbage numbers appearing in rendered code).
+// ─────────────────────────────────────────────────────────────────
+//  Syntax highlighting — applyToRaw prevents placeholder corruption
+// ─────────────────────────────────────────────────────────────────
 const KW = {
-    js: /\b(const|let|var|function|return|if|else|for|while|do|switch|case|break|continue|new|this|class|extends|import|export|default|async|await|try|catch|finally|throw|typeof|instanceof|of|in|null|undefined|true|false|void|delete|yield|from|static|super)\b/g,
-    ts: /\b(const|let|var|function|return|if|else|for|while|switch|case|class|extends|import|export|default|async|await|try|catch|type|interface|enum|implements|declare|readonly|abstract|as|keyof|never|any|string|number|boolean|null|undefined|true|false)\b/g,
-    py: /\b(def|class|return|if|elif|else|for|while|import|from|as|with|try|except|finally|raise|pass|break|continue|and|or|not|in|is|None|True|False|lambda|yield|global|async|await)\b/g,
-    go: /\b(func|return|if|else|for|range|switch|var|const|type|struct|interface|import|package|defer|go|chan|map|make|new|nil|true|false)\b/g,
-    sh: /\b(if|then|else|elif|fi|for|while|do|done|case|esac|function|return|exit|export|echo|local|source|cd|mkdir|rm|cp|mv|sudo|npm|pip|git)\b/g,
-    rs: /\b(fn|let|mut|return|if|else|for|match|use|mod|pub|struct|enum|impl|trait|type|const|async|await|true|false|None|Some|Ok|Err)\b/g,
+    js:/\b(const|let|var|function|return|if|else|for|while|do|switch|case|break|continue|new|this|class|extends|import|export|default|async|await|try|catch|finally|throw|typeof|instanceof|of|in|null|undefined|true|false|void|delete|yield|from|static|super)\b/g,
+    ts:/\b(const|let|var|function|return|if|else|for|while|switch|case|class|extends|import|export|default|async|await|try|catch|type|interface|enum|implements|declare|readonly|abstract|as|keyof|never|any|string|number|boolean|null|undefined|true|false)\b/g,
+    py:/\b(def|class|return|if|elif|else|for|while|import|from|as|with|try|except|finally|raise|pass|break|continue|and|or|not|in|is|None|True|False|lambda|yield|global|async|await)\b/g,
+    go:/\b(func|return|if|else|for|range|switch|var|const|type|struct|interface|import|package|defer|go|chan|map|make|new|nil|true|false)\b/g,
+    sh:/\b(if|then|else|elif|fi|for|while|do|done|case|esac|function|return|exit|export|echo|local|source|cd|mkdir|rm|cp|mv|sudo|npm|pip|git)\b/g,
+    rs:/\b(fn|let|mut|return|if|else|for|match|use|mod|pub|struct|enum|impl|trait|type|const|async|await|true|false|None|Some|Ok|Err)\b/g,
 };
 const LANGMAP = {
-    javascript:"js", js:"js", typescript:"ts", ts:"ts",
-    python:"py", py:"py", go:"go", golang:"go",
-    rust:"rs", rs:"rs", bash:"sh", sh:"sh", shell:"sh", zsh:"sh", fish:"sh",
+    javascript:"js",js:"js",typescript:"ts",ts:"ts",
+    python:"py",py:"py",go:"go",golang:"go",
+    rust:"rs",rs:"rs",bash:"sh",sh:"sh",shell:"sh",zsh:"sh",fish:"sh",
 };
 
 function applyToRaw(str, re, fn) {
-    return str.split(/(\x00\d+\x00)/).map((p, i) =>
-        i % 2 === 0 ? p.replace(re, fn) : p
-    ).join("");
+    return str.split(/(\x00\d+\x00)/).map((p, i) => i % 2 === 0 ? p.replace(re, fn) : p).join("");
 }
 
 function highlight(code, lang = "") {
     const l = LANGMAP[lang.toLowerCase()] || "";
     if (!l) return code;
     const saved = [];
-    const save  = s => { const id = `\x00${saved.length}\x00`; saved.push(s); return id; };
+    const save = s => { const id = `\x00${saved.length}\x00`; saved.push(s); return id; };
     let r = code;
-    r = applyToRaw(r, /(\/\/.*$|#.*$|\/\*[\s\S]*?\*\/)/gm, m => save(chalk.hex(C.comment).italic(m)));
+    r = applyToRaw(r, /(\/\/.*$|#.*$|\/\*[\s\S]*?\*\/)/gm,  m => save(chalk.hex(C.comment).italic(m)));
     r = applyToRaw(r, /("(?:[^"\\]|\\.)*"|'(?:[^'\\]|\\.)*'|`(?:[^`\\]|\\.)*`)/g, m => save(chalk.hex(C.str)(m)));
     if (KW[l]) { KW[l].lastIndex = 0; r = applyToRaw(r, KW[l], m => save(chalk.hex(C.kw).bold(m))); }
     r = applyToRaw(r, /\b(\d+\.?\d*)\b/g, m => save(chalk.hex(C.num)(m)));
@@ -69,53 +68,162 @@ function highlight(code, lang = "") {
     return r.replace(/\x00(\d+)\x00/g, (_, i) => saved[+i] ?? "");
 }
 
-// ─── Markdown renderer ───────────────────────────────────────────
+// ─────────────────────────────────────────────────────────────────
+//  Markdown → array of display lines (with wrapping baked in)
+//  Returns: Array<{ text: string, raw: boolean }>
+//    raw=true  → ANSI already applied (code blocks), print as-is
+//    raw=false → plain text, will receive border + chalk in printBox
+// ─────────────────────────────────────────────────────────────────
 export function renderMarkdown(text, contentW) {
     const cw = contentW ?? bw() - 2;
-    let r = text;
-
-    r = r.replace(/```(\w*)\n?([\s\S]*?)```/g, (_, lang, code) => {
-        const trimmed = code.trimEnd();
-        const lines   = trimmed.split("\n");
-        const hl      = highlight(trimmed, lang);
-        const hlLines = hl.split("\n");
-        const gw      = String(lines.length).length;
-        const bw2     = Math.min(cw + 2, tw() - 6);
-        const lbl     = lang ? chalk.hex(C.blue).bold(` ${lang} `) : "";
-        const lblLen  = lang ? lang.length + 2 : 0;
-        const dashes  = Math.max(2, bw2 - lblLen - 1);
-        const maxCode = bw2 - gw - 4;
-
-        const top  = chalk.hex(C.dim)("┌─") + lbl + chalk.hex(C.dimmer)("─".repeat(dashes)) + chalk.hex(C.dim)("┐");
-        const bot  = chalk.hex(C.dim)("└" + "─".repeat(bw2 + 1) + "┘");
-        const body = hlLines.map((hl_line, i) => {
-            const ln  = chalk.hex(C.dimmer)(String(i + 1).padStart(gw));
-            const raw = lines[i] ?? "";
-            const disp = raw.length > maxCode ? hl_line.slice(0, maxCode * 3) + chalk.hex(C.dimmer)("…") : hl_line;
-            return chalk.hex(C.dim)("│") + chalk.hex(C.dimmer)(" " + ln + " ╎ ") + disp;
-        }).join("\n");
-
-        return `\n${top}\n${body}\n${bot}\n`;
-    });
-
-    r = r.replace(/`([^`\n]+)`/g, (_, c) => chalk.bgHex("#2A2A3E")(chalk.hex(C.orange)(" " + c + " ")));
-    r = r.replace(/^### (.+)$/gm, (_, t) => "\n" + chalk.hex(C.yellow).bold("◈ " + t));
-    r = r.replace(/^## (.+)$/gm,  (_, t) => "\n" + chalk.hex(C.blue).bold.underline(t));
-    r = r.replace(/^# (.+)$/gm,   (_, t) => "\n" + chalk.hex(C.teal).bold("◉ " + t.toUpperCase()));
-    r = r.replace(/\*\*\*(.+?)\*\*\*/g, (_, t) => chalk.bold.italic(t));
-    r = r.replace(/\*\*(.+?)\*\*/g,     (_, t) => chalk.bold(t));
-    r = r.replace(/\*(.+?)\*/g,          (_, t) => chalk.italic(t));
-    r = r.replace(/^> (.+)$/gm, (_, t) => chalk.hex(C.purple)("▎ ") + chalk.hex(C.muted).italic(t));
-    r = r.replace(/^(\s*)[*\-+] (.+)$/gm,  (_, i, t) => i + chalk.hex(C.teal)("◆ ") + chalk.hex(C.white)(t));
-    r = r.replace(/^(\s*)(\d+)\. (.+)$/gm, (_, i, n, t) => i + chalk.hex(C.blue)(chalk.bold(n + ".") + " ") + chalk.hex(C.white)(t));
-    r = r.replace(/^---+$/gm, chalk.hex(C.dimmer)("╌".repeat(Math.min(cw, 48))));
-    return r;
+    const out = []; // { text, raw }
+
+    const pushPlain  = (s) => out.push({ text: s,    raw: false });
+    const pushStyled = (s) => out.push({ text: s,    raw: true  });
+    const pushBlank  = ()  => out.push({ text: "",   raw: false });
+
+    // Normalise line endings
+    const src = text.replace(/\r\n/g, "\n").trimEnd();
+
+    // Split into tokens: code blocks vs everything else
+    const segments = src.split(/(```[\s\S]*?```)/g);
+
+    for (const seg of segments) {
+        // ── Fenced code block ──────────────────────────────────────
+        if (seg.startsWith("```")) {
+            const m    = seg.match(/^```(\w*)\n?([\s\S]*?)```$/);
+            const lang = m?.[1] ?? "";
+            const code = m?.[2]?.trimEnd() ?? seg.slice(3);
+            const lines   = code.split("\n");
+            const hl      = highlight(code, lang);
+            const hlLines = hl.split("\n");
+            const gw      = String(lines.length).length;
+            const bw2     = Math.min(cw + 2, tw() - 6);
+            const lbl     = lang ? chalk.hex(C.blue).bold(` ${lang} `) : "";
+            const lblLen  = lang ? lang.length + 2 : 0;
+            const dashes  = Math.max(2, bw2 - lblLen - 1);
+            const maxCode = bw2 - gw - 4;
+
+            pushBlank();
+            pushStyled(chalk.hex(C.dim)("┌─") + lbl + chalk.hex(C.dimmer)("─".repeat(dashes)) + chalk.hex(C.dim)("┐"));
+            hlLines.forEach((hl_line, i) => {
+                const ln  = chalk.hex(C.dimmer)(String(i + 1).padStart(gw));
+                const raw = lines[i] ?? "";
+                const disp = raw.length > maxCode ? hl_line.slice(0, maxCode * 3) + chalk.hex(C.dimmer)("…") : hl_line;
+                pushStyled(chalk.hex(C.dim)("│") + chalk.hex(C.dimmer)(" " + ln + " ╎ ") + disp);
+            });
+            pushStyled(chalk.hex(C.dim)("└" + "─".repeat(bw2 + 1) + "┘"));
+            pushBlank();
+            continue;
+        }
+
+        // ── Text segment — process line by line ───────────────────
+        for (const rawLine of seg.split("\n")) {
+            const line = rawLine;
+
+            // Blank line
+            if (!line.trim()) { pushBlank(); continue; }
+
+            // === Header === (non-standard but model uses it)
+            if (/^={3,}\s*.+\s*={3,}$/.test(line)) {
+                const t = line.replace(/^=+\s*/, "").replace(/\s*=+$/, "");
+                pushBlank();
+                pushStyled(chalk.hex(C.blue).bold.underline(t));
+                pushBlank();
+                continue;
+            }
+
+            // ATX headers
+            if (/^### /.test(line)) { pushStyled(chalk.hex(C.yellow).bold("◈ " + line.slice(4))); continue; }
+            if (/^## /.test(line))  { pushStyled(chalk.hex(C.blue).bold.underline(line.slice(3))); continue; }
+            if (/^# /.test(line))   { pushStyled(chalk.hex(C.teal).bold("◉ " + line.slice(2).toUpperCase())); continue; }
+
+            // HR
+            if (/^---+$/.test(line)) { pushStyled(chalk.hex(C.dimmer)("╌".repeat(Math.min(cw, 48)))); continue; }
+
+            // Blockquote
+            if (/^> /.test(line)) {
+                const t = line.slice(2);
+                wrapPlain(t, cw - 2).forEach((wl, i) =>
+                    pushStyled(chalk.hex(C.purple)("▎ ") + chalk.hex(C.muted).italic(wl))
+                );
+                continue;
+            }
+
+            // Unordered list
+            const ulM = line.match(/^(\s*)[*\-+] (.+)$/);
+            if (ulM) {
+                const [, ind, content] = ulM;
+                const indW = ind.length;
+                const itemW = cw - indW - 4; // "◆ " = 2 chars visible + 2 padding
+                const plain = stripInline(content);
+                wrapPlain(plain, itemW).forEach((wl, i) => {
+                    if (i === 0)
+                        pushStyled(ind + chalk.hex(C.teal)("◆ ") + chalk.hex(C.white)(applyInline(wl)));
+                    else
+                        pushStyled(ind + "  " + chalk.hex(C.white)(applyInline(wl)));
+                });
+                continue;
+            }
+
+            // Ordered list
+            const olM = line.match(/^(\s*)(\d+)\. (.+)$/);
+            if (olM) {
+                const [, ind, num, content] = olM;
+                const markerW = num.length + 2;
+                const itemW   = cw - ind.length - markerW;
+                const plain   = stripInline(content);
+                wrapPlain(plain, itemW).forEach((wl, i) => {
+                    if (i === 0)
+                        pushStyled(ind + chalk.hex(C.blue)(chalk.bold(num + ".") + " ") + chalk.hex(C.white)(applyInline(wl)));
+                    else
+                        pushStyled(ind + " ".repeat(markerW) + chalk.hex(C.white)(applyInline(wl)));
+                });
+                continue;
+            }
+
+            // Plain paragraph — strip inline markup for wrapping, then re-apply
+            const plain = stripInline(line);
+            wrapPlain(plain, cw).forEach(wl =>
+                pushStyled(chalk.hex(C.white)(applyInline(wl)))
+            );
+        }
+    }
+
+    return out;
+}
+
+// Strip inline markdown to get plain text for accurate wrapping
+function stripInline(s) {
+    return s
+        .replace(/\[([^\]]+)\]\([^)]+\)/g, "$1") // links → text only
+        .replace(/`([^`]+)`/g, "$1")
+        .replace(/\*\*\*(.+?)\*\*\*/g, "$1")
+        .replace(/\*\*(.+?)\*\*/g, "$1")
+        .replace(/\*(.+?)\*/g, "$1")
+        .replace(/_(.+?)_/g, "$1");
+}
+
+// Apply inline markdown styling to already-wrapped line
+function applyInline(s) {
+    return s
+        // Links → show "text (url truncated)" — URLs not clickable in terminal
+        .replace(/\[([^\]]+)\]\(([^)]+)\)/g, (_, text, url) => {
+            const short = url.length > 40 ? url.slice(0, 40) + "…" : url;
+            return chalk.hex(C.teal)(text) + chalk.hex(C.dimmer)(" (" + short + ")");
+        })
+        .replace(/`([^`]+)`/g, (_, c) => chalk.bgHex("#2A2A3E")(chalk.hex(C.orange)(" " + c + " ")))
+        .replace(/\*\*\*(.+?)\*\*\*/g, (_, t) => chalk.bold.italic(t))
+        .replace(/\*\*(.+?)\*\*/g,     (_, t) => chalk.bold(t))
+        .replace(/\*(.+?)\*/g,          (_, t) => chalk.italic(t))
+        .replace(/_(.+?)_/g,            (_, t) => chalk.italic(t));
 }
 
-// ─── Box printer ─────────────────────────────────────────────────
-function printBox(contentLines, borderHex, label, extra = "") {
+// ─────────────────────────────────────────────────────────────────
+//  Box printer — all lines are pre-wrapped, just add border
+// ─────────────────────────────────────────────────────────────────
+function printBox(renderedLines, borderHex, label, extra = "") {
     const W      = bw();
-    const inner  = W - 2;
     const lblLen = vlen(label) + vlen(extra);
     const dashes = Math.max(0, W - lblLen - 1);
 
@@ -124,37 +232,43 @@ function printBox(contentLines, borderHex, label, extra = "") {
         chalk.hex(C.dim)("─".repeat(dashes)) + extra + "\n"
     );
 
-    for (const line of contentLines) {
-        if (line.includes("\x1b[")) {
-            // Already styled (code blocks, headers) — print as-is
-            process.stdout.write(chalk.hex(borderHex)("│  ") + line + "\n");
-        } else {
-            wrapText(line || " ", inner).forEach(wl =>
-                process.stdout.write(chalk.hex(borderHex)("│  ") + wl + "\n")
-            );
-        }
+    for (const { text, raw } of renderedLines) {
+        // raw lines (code blocks, headers with box-drawing) — print as-is
+        // non-raw lines — already plain/styled text, just add border
+        process.stdout.write(chalk.hex(borderHex)("│  ") + text + "\n");
     }
 
     process.stdout.write(chalk.hex(borderHex)("╰" + "─".repeat(W + 1)) + "\n");
 }
 
-// ─── Messages ────────────────────────────────────────────────────
+// ─────────────────────────────────────────────────────────────────
+//  Messages
+// ─────────────────────────────────────────────────────────────────
 export function printUser(text) {
-    const lines  = text.split("\n");
-    const multi  = lines.length > 1;
-    const label  = chalk.hex(C.blue).bold(" you ");
-    const extra  = multi ? chalk.hex(C.muted)(` (${lines.length} lines) `) : "";
+    const W      = bw();
+    const inner  = W - 2;
+    const rawLines = text.split("\n");
+    const multi    = rawLines.length > 1;
+    const label    = chalk.hex(C.blue).bold(" you ");
+    const extra    = multi ? chalk.hex(C.muted)(` (${rawLines.length} lines) `) : "";
+
+    const lines = multi
+        ? rawLines.flatMap(l => wrapPlain(l, inner).map(wl => ({ text: chalk.hex(C.white)(wl), raw: true })))
+        : wrapPlain(text, inner).map(wl => ({ text: chalk.hex(C.white)(wl), raw: true }));
+
     printBox(lines, C.blue, label, extra);
 }
 
 export function printAssistant(text) {
-    const inner   = bw() - 2;
-    const rendered = renderMarkdown(text.trimEnd(), inner);
-    printBox(rendered.split("\n"), C.teal, chalk.hex(C.teal).bold(" gemini "));
+    const inner = bw() - 2;
+    const lines = renderMarkdown(text.trimEnd(), inner);
+    printBox(lines, C.teal, chalk.hex(C.teal).bold(" gemini "));
     process.stdout.write("\n");
 }
 
-// ─── Agent step blocks ───────────────────────────────────────────
+// ─────────────────────────────────────────────────────────────────
+//  Agent step blocks
+// ─────────────────────────────────────────────────────────────────
 export function printStepHeader(step) {
     const W     = bw();
     const label = chalk.hex(C.yellow).bold(" working ");
@@ -173,7 +287,7 @@ export function printStepFooter() {
 export function printToolCall(name, args = {}) {
     const argStr = Object.entries(args).map(([k, v]) => {
         const raw = String(v).replace(/\n/g, "↵");
-        const val = vlen(raw) > 42 ? raw.slice(0, 42) + "…" : raw;
+        const val = raw.length > 42 ? raw.slice(0, 42) + "…" : raw;
         return chalk.hex(C.muted)(k + ":") + chalk.hex(C.orange)(val);
     }).join("  ");
     process.stdout.write(
@@ -199,18 +313,23 @@ export function printToolResult(result) {
     if (extra > 0) process.stdout.write(border + chalk.hex(C.dim)(`… +${extra} more lines`) + "\n");
 }
 
-// ─── Status ──────────────────────────────────────────────────────
+// ─────────────────────────────────────────────────────────────────
+//  Status
+// ─────────────────────────────────────────────────────────────────
 export function printError(msg)   { process.stdout.write("\n" + chalk.hex(C.red)("╳  ") + chalk.hex(C.red).bold("error  ") + chalk.hex(C.muted)(msg) + "\n\n"); }
 export function printInfo(msg)    { process.stdout.write(chalk.hex(C.dim)("·  ") + chalk.hex(C.white)(msg) + "\n"); }
 export function printSuccess(msg) { process.stdout.write(chalk.hex(C.teal)("✓  ") + chalk.hex(C.teal)(msg) + "\n"); }
 export function printWarning(msg) { process.stdout.write(chalk.hex(C.yellow)("⚠  ") + chalk.hex(C.yellow)(msg) + "\n"); }
 
-// ─── Welcome ─────────────────────────────────────────────────────
-export function renderWelcome(memCount = 0, extCount = 0) {
-    const W     = bw();
+// ─────────────────────────────────────────────────────────────────
+//  Welcome & Help
+// ─────────────────────────────────────────────────────────────────
+export function renderWelcome(memCount = 0, extCount = 0, skillCount = 0) {
+    const W = bw();
     const stats = [
-        memCount ? `${memCount} context file${memCount > 1 ? "s" : ""}` : null,
-        extCount ? `${extCount} extension${extCount > 1 ? "s" : ""}` : null,
+        memCount   ? `${memCount} context file${memCount > 1 ? "s" : ""}`     : null,
+        extCount   ? `${extCount} extension${extCount > 1 ? "s" : ""}`         : null,
+        skillCount ? `${skillCount} skill${skillCount > 1 ? "s" : ""} active`  : null,
     ].filter(Boolean).join("  ·  ");
     return [
         "",
@@ -224,7 +343,6 @@ export function renderWelcome(memCount = 0, extCount = 0) {
     ].join("\n");
 }
 
-// ─── Help ────────────────────────────────────────────────────────
 export function renderHelp(customCommands = {}) {
     const sep = chalk.hex(C.dimmer)("  " + "─".repeat(Math.min(tw() - 4, 52)));
     const row = (cmd, desc) => "  " + chalk.hex(C.blue).bold(cmd.padEnd(24)) + chalk.hex(C.muted)(desc);
@@ -249,6 +367,15 @@ export function renderHelp(customCommands = {}) {
         row("/new  /clear",       "Reset conversation"),
         row("/model",             "Model & config info"),
         row("/proxy [on|off]",    "Proxy rotation status/toggle"),
+        "  " + sep,
+        chalk.hex(C.yellow).bold("  Skills  ·  skills.sh"),
+        "  " + sep,
+        row("/skill list",        "List installed skills"),
+        row("/skill add <id>",    "Install from skills.sh (--global for global)"),
+        row("/skill remove <n>",  "Uninstall a skill"),
+        row("/skill search <q>",  "Search skills.sh registry"),
+        row("/skill browse",      "Browse top skills (trending/hot)"),
+        row("/skill info <id>",   "Show skill details"),
         row("/exit  /quit",       "Exit"), sep,
         chalk.hex(C.dim)("  Ctrl+C  interrupt  ·  Ctrl+D  exit"), "",
     ];

package/src/skills.js

@@ -0,0 +1,218 @@
+// src/skills.js — Agent Skills Manager
+// Integrates with skills.sh registry
+// Skills are stored in .agents/ (project) or ~/.gemini/agents/ (global)
+import fs   from "fs";
+import path from "path";
+import os   from "os";
+import axios from "axios";
+
+const API   = "https://skills.sh/api/v1";
+const GLOBAL_AGENTS_DIR = path.join(os.homedir(), ".gemini", "agents");
+
+// ─────────────────────────────────────────────────────────────────
+//  Resolve skills directories
+//  Priority: .agents/ (project) → ~/.gemini/agents/ (global)
+// ─────────────────────────────────────────────────────────────────
+export function getSkillsDirs() {
+    const dirs = [];
+    const local = path.join(process.cwd(), ".agents");
+    if (fs.existsSync(local)) dirs.push(local);
+    if (fs.existsSync(GLOBAL_AGENTS_DIR)) dirs.push(GLOBAL_AGENTS_DIR);
+    return dirs;
+}
+
+export function ensureSkillsDirs() {
+    fs.mkdirSync(GLOBAL_AGENTS_DIR, { recursive: true });
+}
+
+// ─────────────────────────────────────────────────────────────────
+//  Load all installed skills — returns array of { name, path, content }
+// ─────────────────────────────────────────────────────────────────
+export function loadSkills() {
+    const skills = [];
+    const seen   = new Set();
+
+    for (const dir of getSkillsDirs()) {
+        if (!fs.existsSync(dir)) continue;
+
+        for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+            if (!entry.isDirectory()) continue;
+            const skillDir  = path.join(dir, entry.name);
+            const skillMd   = path.join(skillDir, "SKILL.md");
+            const metaFile  = path.join(skillDir, ".meta.json");
+
+            if (!fs.existsSync(skillMd)) continue;
+            if (seen.has(entry.name)) continue; // project-level takes priority
+            seen.add(entry.name);
+
+            let meta = {};
+            try { meta = JSON.parse(fs.readFileSync(metaFile, "utf8")); } catch {}
+
+            const content = fs.readFileSync(skillMd, "utf8");
+
+            // Also read any supporting files (examples, etc.)
+            const extras = fs.readdirSync(skillDir)
+                .filter(f => f !== "SKILL.md" && f !== ".meta.json" && f.endsWith(".md"))
+                .map(f => fs.readFileSync(path.join(skillDir, f), "utf8"))
+                .join("\n\n");
+
+            skills.push({
+                name:    meta.name  ?? entry.name,
+                slug:    meta.slug  ?? entry.name,
+                source:  meta.source ?? "local",
+                path:    skillDir,
+                content: content + (extras ? "\n\n" + extras : ""),
+                global:  dir === GLOBAL_AGENTS_DIR,
+            });
+        }
+    }
+
+    return skills;
+}
+
+// ─────────────────────────────────────────────────────────────────
+//  Build skills section for 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\nThe following skills provide additional knowledge and capabilities. Apply them when relevant:\n\n${sections}`;
+}
+
+// ─────────────────────────────────────────────────────────────────
+//  API helpers
+// ─────────────────────────────────────────────────────────────────
+async function apiFetch(path, params = {}) {
+    const url = `${API}${path}`;
+    const res = await axios.get(url, {
+        params,
+        headers: { "User-Agent": "gemini-cli/2.0" },
+        timeout: 15000,
+    });
+    return res.data;
+}
+
+// ─────────────────────────────────────────────────────────────────
+//  Search skills
+// ─────────────────────────────────────────────────────────────────
+export async function searchSkills(query, limit = 10) {
+    const data = await apiFetch("/skills/search", { q: query, limit });
+    return data.data ?? [];
+}
+
+export async function browseSkills(view = "all-time", perPage = 20) {
+    const data = await apiFetch("/skills", { view, per_page: perPage });
+    return data.data ?? [];
+}
+
+// ─────────────────────────────────────────────────────────────────
+//  Fetch skill files from API
+//  id format: "owner/repo/slug"  e.g. "vercel-labs/agent-skills/next-js-development"
+// ─────────────────────────────────────────────────────────────────
+export async function fetchSkill(id) {
+    const data = await apiFetch(`/skills/${id}`);
+    return data; // { id, slug, name?, files: [{ path, contents }] }
+}
+
+// ─────────────────────────────────────────────────────────────────
+//  Install a skill
+//  source: "owner/repo/slug" or just "owner/repo" (installs all)
+//  scope:  "project" | "global"
+// ─────────────────────────────────────────────────────────────────
+export async function installSkill(id, scope = "project") {
+    const skill = await fetchSkill(id);
+
+    if (!skill.files?.length) {
+        throw new Error(`Skill "${id}" has no files.`);
+    }
+
+    const targetDir = scope === "global"
+        ? GLOBAL_AGENTS_DIR
+        : path.join(process.cwd(), ".agents");
+
+    const slug    = skill.slug ?? id.split("/").pop();
+    const skillDir = path.join(targetDir, slug);
+    fs.mkdirSync(skillDir, { recursive: true });
+
+    // Write all skill files
+    for (const file of skill.files) {
+        const filePath = path.join(skillDir, file.path);
+        fs.mkdirSync(path.dirname(filePath), { recursive: true });
+        fs.writeFileSync(filePath, file.contents ?? "", "utf8");
+    }
+
+    // Write metadata
+    fs.writeFileSync(path.join(skillDir, ".meta.json"), JSON.stringify({
+        id:        skill.id,
+        name:      skill.name ?? slug,
+        slug,
+        source:    skill.source,
+        installs:  skill.installs,
+        installedAt: new Date().toISOString(),
+        scope,
+    }, null, 2));
+
+    return { slug, name: skill.name ?? slug, dir: skillDir };
+}
+
+// ─────────────────────────────────────────────────────────────────
+//  Remove a skill
+// ─────────────────────────────────────────────────────────────────
+export function removeSkill(slug, scope = "both") {
+    const removed = [];
+
+    const dirs = scope === "global"
+        ? [GLOBAL_AGENTS_DIR]
+        : scope === "project"
+            ? [path.join(process.cwd(), ".agents")]
+            : [path.join(process.cwd(), ".agents"), GLOBAL_AGENTS_DIR];
+
+    for (const dir of dirs) {
+        const skillDir = path.join(dir, slug);
+        if (fs.existsSync(skillDir)) {
+            fs.rmSync(skillDir, { recursive: true, force: true });
+            removed.push(skillDir);
+        }
+    }
+
+    if (!removed.length) throw new Error(`Skill "${slug}" not found.`);
+    return removed;
+}
+
+// ─────────────────────────────────────────────────────────────────
+//  List installed skills with status
+// ─────────────────────────────────────────────────────────────────
+export function listInstalledSkills() {
+    const result = [];
+
+    const checkDir = (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);
+            const metaFile = path.join(skillDir, ".meta.json");
+            const hasSkillMd = fs.existsSync(path.join(skillDir, "SKILL.md"));
+            if (!hasSkillMd) continue;
+
+            let meta = {};
+            try { meta = JSON.parse(fs.readFileSync(metaFile, "utf8")); } catch {}
+
+            result.push({
+                slug:   entry.name,
+                name:   meta.name   ?? entry.name,
+                source: meta.source ?? "local",
+                global: isGlobal,
+                dir:    skillDir,
+                installedAt: meta.installedAt ?? null,
+            });
+        }
+    };
+
+    checkDir(path.join(process.cwd(), ".agents"), false);
+    checkDir(GLOBAL_AGENTS_DIR, true);
+    return result;
+}