ikie-cli 0.1.33 → 0.1.34

package/dist/repl.js

@@ -10,6 +10,8 @@ import { join as pathJoin } from 'path';
 import { deleteSession, listSessions, loadSession, normalizeSessionName, saveSession } from './session.js';
 import { buildUserContent, formatBytes, loadClipboardImageAttachment, loadImageAttachment, hasClipboardImage } from './attachments.js';
 import { runOnboarding } from './onboarding.js';
+import { getMcpManager, parseClaudeMcpAddCommand } from './mcp-manager.js';
+import { generateTree, parseTreeArgs } from './tree.js';
 async function fetchModelsFromServer(config) {
     const baseUrl = config.baseURL || IKIE_API_BASE;
     const apiUrl = baseUrl.includes('/api/v1')
@@ -72,6 +74,11 @@ const SLASH_CMDS = [
         ],
     },
     { name: 'context', desc: 'Show project context' },
+    {
+        name: 'tree',
+        desc: 'Show file tree',
+        args: '[path] [-a] [-s] [-d depth]',
+    },
     {
         name: 'models',
         desc: 'List available models',
@@ -109,10 +116,51 @@ const SLASH_CMDS = [
     { name: 'agent', desc: 'Switch to agent mode (full)' },
     { name: 'compact', desc: 'Summarize conversation to free up context window' },
     { name: 'onboarding', desc: 'Run the first-time onboarding tutorial' },
+    {
+        name: 'mcp',
+        desc: 'MCP servers',
+        args: '[add|remove|reconnect|list]',
+        subs: [
+            { name: 'add', desc: 'Add a server from a claude mcp add line' },
+            { name: 'remove', desc: 'Remove a server by name' },
+            { name: 'reconnect', desc: 'Reconnect a server by name' },
+            { name: 'list', desc: 'List configured servers' },
+        ],
+    },
     { name: 'login', desc: 'Sign in to ikie account' },
     { name: 'logout', desc: 'Sign out of ikie account' },
     { name: 'exit', desc: 'Exit Ikie' },
 ];
+// ── Interactive picker state (arrow-key selectors like /theme) ──
+let pickerActive = false;
+let pickerItems = [];
+let pickerSel = 0;
+let pickerResolve = null;
+let drawPickerFn = null;
+let pickerTitle = '';
+let pickerActiveValue = null;
+// ── Rotating tips shown below the prompt ─────────────────────────
+const TIPS = [
+    'Use /theme to change the color theme',
+    'Type /model to switch the AI model',
+    'Use /help to see all commands',
+    'Press Esc to cancel a running task',
+    'Use /session to manage chat sessions',
+    'Type /clear to reset the conversation',
+    'Use /settings to adjust your preferences',
+    'Type /usage to check your API usage',
+    'Use /context to see project context',
+    'Use /image to attach images',
+    'Type /tokens for token estimates',
+    'Use /mode to switch between plan and agent mode',
+    'Type /compact to summarize the conversation',
+    'Use /memory to save notes',
+    'Type /exit to quit ikie',
+    'Use /skills to manage skills',
+    'Type /tree to show the file tree',
+    'Use /rpm to set the requests-per-minute limit',
+];
+let tipIndex = Date.now(); // start at a pseudo-random position
 /**
  * Compute live slash-menu items for the current input line.
  * Returns rich items (name/desc/insert) plus the typed fragment to highlight.
@@ -137,6 +185,13 @@ function computeSlashMenu(line) {
     // Command-name stage: "/<frag>".
     const items = SLASH_CMDS
         .filter(s => s.name.startsWith(cmd))
+        .sort((a, b) => {
+        if (a.name === cmd)
+            return -1;
+        if (b.name === cmd)
+            return 1;
+        return 0;
+    })
         .map(s => ({
         name: s.name,
         desc: s.desc,
@@ -160,6 +215,7 @@ ${c.primary.bold('Ikie Commands')}
   ${c.warning('/session load')}    Load saved chat
   ${c.warning('/session new')}     Start a fresh chat (auto-saved)
   ${c.warning('/context')}         Show current project context
+  ${c.warning('/tree [path]')}     Show file tree structure
   ${c.warning('/models')}          List available models
   ${c.warning('/model <name>')}    Switch AI model
   ${c.warning('/settings')}       View all settings
@@ -181,6 +237,10 @@ ${c.primary.bold('Ikie Commands')}
   ${c.warning('/skills show <name>')} Show a skill's instructions
   ${c.warning('/skills install <src>')} Install a skill (git URL or path)
   ${c.warning('/skills remove <name>')} Remove an installed skill
+  ${c.warning('/mcp')}             List MCP servers and tools
+  ${c.warning('/mcp add <line>')}  Add a server from a claude mcp add line
+  ${c.warning('/mcp remove <name>')} Remove a server by name
+  ${c.warning('/mcp reconnect <name>')} Reconnect a server by name
   ${c.warning('/plan')}            Plan mode — research & propose, no changes
   ${c.warning('/agent')}           Agent mode — full execution (default)
   ${c.warning('/mode')}            Show or set mode  ${c.muted('(Shift+Tab toggles)')}
@@ -356,6 +416,15 @@ async function handleSlashCommand(input, agent, config, projectContext, rl, sess
             console.log(`\n${c.primary.bold('Project Context')}\n`);
             console.log(renderMarkdown(projectContext));
             return true;
+        case 'tree': {
+            const { path, options } = parseTreeArgs(args);
+            console.log();
+            console.log(generateTree(path, options));
+            console.log();
+            console.log(c.muted('  Usage: /tree [path] [-a all] [-s size] [-d depth]'));
+            console.log(c.muted('  Example: /tree src -a -d 4'));
+            return true;
+        }
         case 'models': {
             const sub = args[0]?.toLowerCase();
             if (sub === 'refresh' || !sub || sub === 'list') {
@@ -370,7 +439,8 @@ async function handleSlashCommand(input, agent, config, projectContext, rl, sess
             }
             else {
                 config.model = model;
-                saveConfig({ model });
+                config.modelPinned = true;
+                saveConfig({ model, modelPinned: true });
                 console.log(successLine(`Default model set to: ${model}`));
                 console.log(infoLine('Persisted to settings — will be used for all new sessions.'));
             }
@@ -477,6 +547,71 @@ async function handleSlashCommand(input, agent, config, projectContext, rl, sess
             await runOnboarding(config);
             return true;
         }
+        case 'mcp': {
+            const sub = (args[0] ?? 'list').toLowerCase();
+            const rest = args.slice(1).join(' ').trim();
+            const manager = getMcpManager();
+            if (sub === 'add') {
+                if (!rest) {
+                    console.log(errorLine('Usage: /mcp add <claude mcp add line>'));
+                    return true;
+                }
+                const parsed = parseClaudeMcpAddCommand(rest);
+                if ('error' in parsed) {
+                    console.log(errorLine(parsed.error));
+                    return true;
+                }
+                try {
+                    await manager.addServer(parsed.name, parsed.entry, 'project');
+                    console.log(successLine(`Added MCP server "${parsed.name}" and connected.`));
+                }
+                catch (err) {
+                    console.log(errorLine(err instanceof Error ? err.message : String(err)));
+                }
+                return true;
+            }
+            if (sub === 'remove' || sub === 'rm') {
+                if (!rest) {
+                    console.log(errorLine('Usage: /mcp remove <name>'));
+                    return true;
+                }
+                const removed = manager.removeServer(rest, 'project');
+                console.log(removed ? successLine(`Removed MCP server "${rest}".`) : errorLine(`No MCP server named "${rest}" in project scope.`));
+                return true;
+            }
+            if (sub === 'reconnect') {
+                if (!rest) {
+                    console.log(errorLine('Usage: /mcp reconnect <name>'));
+                    return true;
+                }
+                try {
+                    await manager.reconnectServer(rest);
+                    console.log(successLine(`Reconnected MCP server "${rest}".`));
+                }
+                catch (err) {
+                    console.log(errorLine(err instanceof Error ? err.message : String(err)));
+                }
+                return true;
+            }
+            const servers = manager.listServers();
+            if (!servers.length) {
+                console.log(infoLine('No MCP servers configured.'));
+                console.log(`\n  ${c.muted('Add one with')} ${c.warning('/mcp add <claude mcp add line>')}`);
+                return true;
+            }
+            console.log(`\n${c.primary.bold('MCP Servers')}\n`);
+            for (const s of servers) {
+                const status = s.connected ? c.success('●') : s.enabled ? c.warning('○') : c.error('○');
+                console.log(`  ${status} ${c.white.bold(s.name)} ${s.connected ? c.success('connected') : s.enabled ? c.muted('not connected') : c.error('disabled')}`);
+                if (s.error)
+                    console.log(`    ${c.error(s.error)}`);
+                if (s.tools.length) {
+                    console.log(`    ${c.muted('tools:')} ${s.tools.map(t => t.name).join(', ')}`);
+                }
+            }
+            console.log();
+            return true;
+        }
         case 'logout': {
             if (!isLoggedIn(config)) {
                 console.log(infoLine('Not signed in.'));
@@ -515,7 +650,8 @@ async function handleSlashCommand(input, agent, config, projectContext, rl, sess
                     return true;
                 }
                 config.model = value;
-                saveConfig({ model: value });
+                config.modelPinned = true;
+                saveConfig({ model: value, modelPinned: true });
                 console.log(successLine(`Default model changed to: ${value}`));
                 return true;
             }
@@ -598,6 +734,7 @@ async function handleSlashCommand(input, agent, config, projectContext, rl, sess
             }
             if (sub === 'reset') {
                 config.model = DEFAULT_MODEL;
+                config.modelPinned = false;
                 config.maxTokens = 32768;
                 config.temperature = 0.6;
                 config.topP = 0.95;
@@ -606,6 +743,7 @@ async function handleSlashCommand(input, agent, config, projectContext, rl, sess
                 config.requestsPerMinute = 10;
                 config.theme = 'nebula';
                 saveConfig({
+                    modelPinned: false,
                     maxTokens: 32768,
                     temperature: 0.6,
                     topP: 0.95,
@@ -848,43 +986,52 @@ function formatTaskTimeline(agent, elapsed, state) {
     const tail = state === 'cancelled' ? `cancelled after ${elapsed}` : `${state} in ${elapsed}`;
     return `${modelLabel} · ${toolLabel}${filesLabel} · ${tail}`;
 }
+function printTaskBreakdown(agent, elapsedMs, tokensUsed) {
+    const stats = agent.getLastTurnStats();
+    const totalSec = (elapsedMs / 1000).toFixed(1);
+    console.log(`\n${c.primary('┌')} ${c.white.bold('Task Summary')}`);
+    console.log(`${c.primary('│')} ${c.muted('Total time:')}     ${c.accent(totalSec + 's')}`);
+    console.log(`${c.primary('│')} ${c.muted('AI calls:')}       ${c.secondary(stats.modelCalls.toString())} ${c.dim('(~' + tokensUsed.toLocaleString() + ' tokens)')}`);
+    console.log(`${c.primary('│')} ${c.muted('Tools executed:')} ${c.secondary(stats.toolCalls.toString())}`);
+    if (stats.filesChanged > 0) {
+        console.log(`${c.primary('│')} ${c.muted('Files changed:')}  ${c.warning(stats.filesChanged.toString())}`);
+    }
+    // Rough cost estimate (assuming ~$0.003 per 1K tokens for Claude Sonnet)
+    const estimatedCost = (tokensUsed / 1000) * 0.003;
+    if (estimatedCost > 0.001) {
+        console.log(`${c.primary('│')} ${c.muted('Est. cost:')}     ${c.dim('~$' + estimatedCost.toFixed(4))}`);
+    }
+    console.log(`${c.primary('└')}${'─'.repeat(40)}\n`);
+}
 function selectModelInteractively(rl, config) {
     return new Promise((resolve) => {
-        const models = [];
-        const prompt = () => {
-            rl.question(c.muted('Enter number (or 0 to cancel): '), (answer) => {
-                const num = parseInt(answer, 10);
-                if (isNaN(num) || num < 0 || num > models.length) {
-                    prompt();
-                    return;
-                }
-                if (num === 0) {
-                    console.log(infoLine('Model selection cancelled.'));
-                    resolve();
-                    return;
-                }
-                const chosen = models[num - 1];
-                config.model = chosen.name;
-                saveConfig({ model: chosen.name });
-                console.log(successLine(`Switched to ${chosen.name} — ${chosen.display_name}`));
-                resolve();
-            });
-        };
-        console.log(`\n  ${c.accent.bold('Select a Model')}`);
         fetchModelsFromServer(config).then((fetched) => {
-            models.push(...fetched);
-            if (models.length === 0) {
+            if (fetched.length === 0) {
                 console.log(`  ${c.error('No models available.')}`);
                 resolve();
                 return;
             }
-            models.forEach((m, i) => {
-                const num = c.primary((i + 1).toString().padStart(2));
-                const def = m.is_default ? ` ${c.success('[DEFAULT]')}` : '';
-                console.log(`  ${num}) ${c.bold(m.name.padEnd(24))} ${c.dim(m.display_name)} ${c.muted(`(${(m.context_window / 1024).toFixed(0)}K)`)}${def}`);
-            });
-            console.log(`  ${c.muted(' 0)')} Cancel`);
-            prompt();
+            pickerTitle = 'Select a Model';
+            pickerActiveValue = config.model;
+            pickerItems = fetched.map(m => ({
+                name: m.name,
+                desc: `${m.display_name} (${(m.context_window / 1024).toFixed(0)}K)${m.is_default ? ' [DEFAULT]' : ''}`,
+            }));
+            pickerSel = Math.max(0, fetched.findIndex(m => m.name === config.model));
+            pickerActive = true;
+            pickerResolve = (chosen) => {
+                if (chosen) {
+                    config.model = chosen;
+                    config.modelPinned = true;
+                    saveConfig({ model: chosen, modelPinned: true });
+                    console.log(successLine(`Switched to ${chosen}`));
+                }
+                else {
+                    console.log(infoLine('Model selection cancelled.'));
+                }
+                resolve();
+            };
+            drawPickerFn?.();
         }).catch(() => {
             console.log(`  ${c.error('Failed to load models.')}`);
             resolve();
@@ -894,37 +1041,24 @@ function selectModelInteractively(rl, config) {
 function selectThemeInteractively(rl, config) {
     return new Promise((resolve) => {
         const themesList = Object.keys(THEMES);
-        const currentIndex = themesList.indexOf(config.theme);
-        let lastIndex = currentIndex === -1 ? 0 : currentIndex;
-        const prompt = () => {
-            rl.question(c.muted('Enter number (or 0 to cancel): '), (answer) => {
-                const num = parseInt(answer, 10);
-                if (isNaN(num) || num < 0 || num > themesList.length) {
-                    prompt();
-                    return;
-                }
-                if (num === 0) {
-                    console.log(infoLine('Theme selection cancelled.'));
-                    resolve();
-                    return;
-                }
-                const chosen = themesList[num - 1];
+        pickerTitle = 'Select a Theme';
+        pickerActiveValue = config.theme;
+        pickerItems = themesList.map(name => ({ name, desc: THEMES[name].description }));
+        pickerSel = Math.max(0, themesList.indexOf(config.theme));
+        pickerActive = true;
+        pickerResolve = (chosen) => {
+            if (chosen) {
                 setTheme(chosen);
                 config.theme = chosen;
                 drawBanner(config.model);
                 console.log(successLine(`Theme switched to "${chosen}".`));
-                resolve();
-            });
+            }
+            else {
+                console.log(infoLine('Theme selection cancelled.'));
+            }
+            resolve();
         };
-        console.log(`\n  ${c.accent.bold('Select a Theme')}`);
-        themesList.forEach((name, i) => {
-            const theme = THEMES[name];
-            const num = c.primary((i + 1).toString().padStart(2));
-            const active = i === currentIndex ? ` ${c.success('[ACTIVE]')}` : '';
-            console.log(`  ${num}) ${c.bold(name.padEnd(12))} ${c.muted('-')} ${c.dim(theme.description)}${active}`);
-        });
-        console.log(`  ${c.muted(' 0)')} Cancel`);
-        prompt();
+        drawPickerFn?.();
     });
 }
 // Notify the user when a long task finishes (> 10s). Terminal bell always;
@@ -964,14 +1098,34 @@ export async function startREPL(agent, config, projectContext, oneShot) {
     // A plain launch arg is a one-shot prompt: run it once and exit.
     const initialCommand = oneShot && oneShot.trim().startsWith('/') ? oneShot.trim() : undefined;
     if (oneShot && !initialCommand) {
+        const abortController = new AbortController();
+        // Set up Esc/Ctrl-C handler for one-shot mode too.
+        if (process.stdin.isTTY) {
+            const wasRaw = process.stdin.isRaw ?? false;
+            if (!wasRaw)
+                process.stdin.setRawMode(true);
+            process.stdin.resume();
+            const cancelHandler = (data) => {
+                const b = data[0];
+                if ((b === 0x1b && data.length === 1) || b === 0x03) {
+                    if (!abortController.signal.aborted) {
+                        abortController.abort();
+                        process.stdout.write(`\n${c.warning('  Cancelled')}\n`);
+                    }
+                    if (b === 0x03)
+                        process.exit(0);
+                }
+            };
+            process.stdin.on('data', cancelHandler);
+        }
         try {
-            await agent.send(oneShot, { autoApprove: config.autoApprove });
+            await agent.send(oneShot, { autoApprove: config.autoApprove, signal: abortController.signal });
+            process.exit(0);
         }
         catch (err) {
             console.error(errorLine(`Agent error: ${err}`));
             process.exit(1);
         }
-        return;
     }
     drawBanner(config.model);
     const rl = readline.createInterface({
@@ -1009,6 +1163,8 @@ export async function startREPL(agent, config, projectContext, oneShot) {
     let menuFragment = '';
     let menuSel = 0;
     let menuRows = 0; // menu lines currently drawn below input
+    // ── Interactive picker state (arrow-key selectors) ──────────────────────────
+    let pickerRows = 0;
     const inputCol = () => stripAnsi(currentPrompt).length + (rl.cursor ?? 0);
     const eraseMenu = () => {
         if (menuRows === 0)
@@ -1039,6 +1195,40 @@ export async function startREPL(agent, config, projectContext, oneShot) {
         process.stdout.write(out);
         menuRows = rows.length;
     };
+    const erasePicker = () => {
+        if (pickerRows === 0)
+            return;
+        let out = '\r';
+        for (let i = 0; i < pickerRows; i++)
+            out += '\n\x1b[2K';
+        out += `\x1b[${pickerRows}A\r`;
+        process.stdout.write(out);
+        pickerRows = 0;
+    };
+    const drawPicker = () => {
+        erasePicker();
+        if (!pickerActive || pickerItems.length === 0)
+            return;
+        const rows = [];
+        rows.push(`  ${c.accent.bold(pickerTitle)}  ${c.muted('(↑↓ · Enter · Esc)')}`);
+        rows.push('');
+        pickerItems.forEach((item, i) => {
+            const sel = i === pickerSel;
+            const active = item.name === pickerActiveValue;
+            const bullet = sel ? c.primary('●') : c.muted('○');
+            const name = sel ? c.white.bold(item.name) : c.white(item.name);
+            const tag = active ? ` ${c.success('[ACTIVE]')}` : '';
+            const desc = item.desc ? ` ${c.dim(item.desc)}` : '';
+            rows.push(`  ${bullet} ${name}${tag}${desc}`);
+        });
+        let out = '\r';
+        for (const r of rows)
+            out += `\n${r}`;
+        out += `\x1b[${rows.length}A\r`;
+        process.stdout.write(out);
+        pickerRows = rows.length;
+    };
+    drawPickerFn = drawPicker;
     const closeMenu = () => {
         if (!menuOpen && menuRows === 0)
             return;
@@ -1129,18 +1319,23 @@ export async function startREPL(agent, config, projectContext, oneShot) {
             if (text === '\r' || text === '\n') {
                 const item = menuItems[menuSel];
                 if (item) {
-                    // Fill the highlighted command. If it takes no args/subs (no trailing
-                    // space) submit it immediately; otherwise keep editing for the arg.
-                    const submit = !item.insert.endsWith(' ');
+                    const line = rl.line ?? '';
                     eraseMenu();
                     menuOpen = false;
-                    rl.write(null, { ctrl: true, name: 'e' });
-                    rl.write(null, { ctrl: true, name: 'u' });
-                    rl.write(item.insert);
-                    if (submit)
-                        forwardToReadline(Buffer.from('\r'));
-                    else
-                        updateMenu();
+                    // Line already exactly matches the selected command — submit directly.
+                    if (line === `/${item.name}`) {
+                        forwardToReadline(data);
+                    }
+                    else {
+                        const submit = !item.insert.endsWith(' ');
+                        rl.write(null, { ctrl: true, name: 'e' });
+                        rl.write(null, { ctrl: true, name: 'u' });
+                        rl.write(item.insert);
+                        if (submit)
+                            forwardToReadline(Buffer.from('\r'));
+                        else
+                            updateMenu();
+                    }
                 }
                 else {
                     closeMenu();
@@ -1149,6 +1344,33 @@ export async function startREPL(agent, config, projectContext, oneShot) {
                 return;
             }
         }
+        // ── Interactive picker (arrow-key selection like /theme) ──
+        if (pickerActive) {
+            if (text === '\x1b[A') {
+                pickerSel = (pickerSel - 1 + pickerItems.length) % pickerItems.length;
+                drawPicker();
+                return;
+            }
+            if (text === '\x1b[B') {
+                pickerSel = (pickerSel + 1) % pickerItems.length;
+                drawPicker();
+                return;
+            }
+            if (text === '\r' || text === '\n') {
+                const picked = pickerItems[pickerSel].name;
+                pickerActive = false;
+                erasePicker();
+                pickerResolve?.(picked);
+                return;
+            }
+            if (text === '\x1b') {
+                pickerActive = false;
+                erasePicker();
+                pickerResolve?.(null);
+                return;
+            }
+            return; // eat all other input while picker is active
+        }
         // Shift+Tab (CSI Z) → cycle agent⇄plan mode live, updating ONLY the mode
         // word in the header line directly above the prompt. No new line, no
         // reprinted prompt — the cursor and whatever the user has typed stay put.
@@ -1248,6 +1470,7 @@ export async function startREPL(agent, config, projectContext, oneShot) {
         if (multilineBuffer) {
             currentPrompt = CONTINUE_PROMPT;
             rl.setPrompt(CONTINUE_PROMPT);
+            rl.prompt();
         }
         else {
             printPromptHeader(agent.getMode());
@@ -1263,8 +1486,11 @@ export async function startREPL(agent, config, projectContext, oneShot) {
             }
             currentPrompt = prompt;
             rl.setPrompt(prompt);
+            rl.prompt();
+            // Rotating tip below the prompt
+            const tip = TIPS[tipIndex++ % TIPS.length];
+            process.stdout.write(`\x1b[s\n${c.dim('   ' + tip)}\x1b[u`);
         }
-        rl.prompt();
     };
     rl.on('close', () => {
         setBracketedPaste(false);

package/dist/skills.d.ts

@@ -22,6 +22,16 @@ export interface Skill {
     source: 'project' | 'user';
     /** The roots this skill was discovered under, e.g. ".ikie" or ".claude". */
     origin: string;
+    /** Tools the skill pre-approves for the session. */
+    allowedTools?: string[];
+    /** Tools the skill explicitly forbids. */
+    disallowedTools?: string[];
+    /** If true, do not show the skill in the catalog or offer it to the model. */
+    disableModelInvocation?: boolean;
+    /** If true, the user can invoke the skill directly (e.g. via /skill-name). */
+    userInvocable?: boolean;
+    /** Extra guidance on when the skill should be used. */
+    whenToUse?: string;
 }
 /**
  * Discover all available skills across project and user roots.
@@ -37,8 +47,14 @@ export declare function listSkillFiles(skill: Skill): string[];
  * Render the skill catalog for the system prompt: each skill's name +
  * description, so the model knows what exists and when to reach for one.
  * Returns '' when no skills are installed (so the section is omitted).
+ * Skips skills marked disable-model-invocation.
  */
 export declare function formatSkillsForPrompt(skills: Skill[]): string;
+/**
+ * Map Claude-style allowed-tools tokens to ikie tool names.
+ * Strips arguments, lowercases, and maps known tokens.
+ */
+export declare function mapAllowedTools(tokens: string[] | undefined): string[];
 /**
  * Build the full text returned to the model when it loads a skill via
  * `use_skill`: the instructions plus a manifest of bundled files and the