icopilot 2.2.0 → 2.3.2

package/dist/ui/prompt.js

@@ -1,27 +1,186 @@
 import readline from 'node:readline';
-import { theme } from './theme.js';
+import { theme, safeUnicode } from './theme.js';
+import { defaultContext } from '../util/completion.js';
 import { attachKeybindings, applyKeybindingConfig, } from '../util/keybindings.js';
-/** Minimal readline-based prompt (history-enabled, with optional keybindings). */
+// ─── Slash command completer ───────────────────────────────────────────────
+function slashCompleter(line) {
+    const ctx = defaultContext();
+    if (/^\/[\w-]*$/.test(line)) {
+        const partial = line.slice(1).toLowerCase();
+        const hits = ctx.slashCommands.filter((cmd) => cmd.startsWith(partial)).map((cmd) => `/${cmd}`);
+        return [hits, line];
+    }
+    const subMatch = line.match(/^(\/[\w-]+)\s+(\S*)$/);
+    if (subMatch) {
+        const cmd = subMatch[1].slice(1);
+        const partial = subMatch[2];
+        const subs = ctx.slashSubcommands[cmd] ?? [];
+        const hits = subs.filter((s) => s.startsWith(partial)).map((h) => `${subMatch[1]} ${h}`);
+        if (hits.length)
+            return [hits, line];
+    }
+    return [[], line];
+}
+// ─── Input box helpers ─────────────────────────────────────────────────────
+const PLACEHOLDER = 'Enter @ to mention files or / for commands...';
+function boxWidth() {
+    return Math.max(60, (process.stdout.columns || 80) - 6);
+}
+function drawBoxTop() {
+    const w = boxWidth();
+    const colorEnabled = theme.dim('') !== ''; // cheap color-enabled check
+    const line = colorEnabled ? theme.dim(`  ╭${'─'.repeat(w)}╮`) : `  ╭${'─'.repeat(w)}╮`;
+    process.stdout.write(line + '\n');
+}
+function drawBoxBottom() {
+    const w = boxWidth();
+    const line = theme.dim(`  ╰${'─'.repeat(w)}╯`);
+    process.stdout.write('\n' + line + '\n');
+}
+// ─── Persistent footer (scroll-region docked) ──────────────────────────────
+const FOOTER_KEYS = safeUnicode
+    ? '  Ctrl+C Exit  │  Tab Autocomplete  │  @file Context  │  Ctrl+R Clear'
+    : '  Ctrl+C Exit  |  Tab Autocomplete  |  @file Context  |  Ctrl+R Clear';
+let footerInstalled = false;
+function footerLine(cols) {
+    const text = FOOTER_KEYS;
+    // Dim the key names and leave separators brighter
+    const formatted = text
+        .replace(/Ctrl\+[A-Z]/g, (m) => `\x1b[1m${m}\x1b[0m\x1b[2m`)
+        .replace(/Tab/g, '\x1b[1mTab\x1b[0m\x1b[2m')
+        .replace(/@file/g, '\x1b[1m@file\x1b[0m\x1b[2m');
+    const pad = Math.max(0, cols - text.length);
+    return `\x1b[2m${formatted}${' '.repeat(pad)}\x1b[0m`;
+}
+function installFooter() {
+    if (!process.stdout.isTTY)
+        return;
+    const rows = process.stdout.rows ?? 24;
+    const cols = process.stdout.columns ?? 80;
+    // Reserve bottom 2 rows: separator + hotkey bar
+    process.stdout.write(`\x1b[1;${rows - 2}r`); // set scroll region
+    process.stdout.write('\x1b7'); // save cursor (DEC)
+    process.stdout.write(`\x1b[${rows - 1};1H\x1b[2K`);
+    process.stdout.write(theme.dim('─'.repeat(cols)));
+    process.stdout.write(`\x1b[${rows};1H\x1b[2K`);
+    process.stdout.write(footerLine(cols));
+    process.stdout.write('\x1b8'); // restore cursor (DEC)
+    footerInstalled = true;
+}
+function removeFooter() {
+    if (!footerInstalled)
+        return;
+    process.stdout.write('\x1b[r'); // reset scroll region to full terminal
+    footerInstalled = false;
+}
+// ─── Main factory ──────────────────────────────────────────────────────────
 export function createPrompt(keybindingMode) {
     const mode = keybindingMode ?? applyKeybindingConfig();
+    const isTTY = Boolean(process.stdin.isTTY && process.stdout.isTTY);
+    let promptActive = false;
+    let activeGhost = '';
+    // Install the sticky footer + handle terminal resize
+    if (isTTY)
+        installFooter();
+    const onResize = () => {
+        if (isTTY && footerInstalled)
+            installFooter();
+    };
+    process.on('SIGWINCH', onResize);
+    // ── Ghost text helpers ────────────────────────────────────────────────
+    const clearGhost = () => {
+        if (!activeGhost || !isTTY)
+            return;
+        process.stdout.write(`${' '.repeat(activeGhost.length)}\x1b[${activeGhost.length}D`);
+        activeGhost = '';
+    };
+    const drawGhost = (suffix) => {
+        if (!suffix || !isTTY)
+            return;
+        activeGhost = suffix;
+        process.stdout.write(`\x1b[2m${suffix}\x1b[0m\x1b[${suffix.length}D`);
+    };
+    // STEP 1 — clear ghost BEFORE readline redraws (prependListener fires first)
+    const onKeypressClear = (_ch, key) => {
+        if (!promptActive)
+            return;
+        if (key?.name === 'return' || key?.name === 'enter')
+            return;
+        clearGhost();
+    };
+    if (isTTY) {
+        readline.emitKeypressEvents(process.stdin);
+        process.stdin.prependListener('keypress', onKeypressClear);
+    }
+    // STEP 2 — readline (registers its own keypress handler after ours)
     const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout,
         terminal: true,
-        // Future DX: path completion can be added here without changing callers.
+        completer: isTTY ? slashCompleter : undefined,
         historySize: 500,
     });
-    // Attach keybindings if configured
-    if (mode !== 'default') {
+    // STEP 3 — draw ghost AFTER readline finishes its redraw (setImmediate)
+    const onKeypressDraw = (_ch, key) => {
+        if (!promptActive || !isTTY)
+            return;
+        if (key?.ctrl || key?.meta)
+            return;
+        if (key?.name === 'return' || key?.name === 'enter' || key?.name === 'tab')
+            return;
+        if (key?.name === 'up' || key?.name === 'down')
+            return;
+        setImmediate(() => {
+            if (!promptActive)
+                return;
+            const line = rl.line ?? '';
+            if (line === '') {
+                drawGhost(PLACEHOLDER);
+                return;
+            }
+            if (!/^\/\w/.test(line))
+                return;
+            const [hits] = slashCompleter(line);
+            if (!hits.length)
+                return;
+            const ghost = hits[0].slice(line.length);
+            if (!ghost)
+                return;
+            drawGhost(ghost);
+        });
+    };
+    if (isTTY)
+        process.stdin.on('keypress', onKeypressDraw);
+    if (mode !== 'default')
         attachKeybindings(rl, mode);
-    }
     return {
-        read(prompt) {
+        read(promptStr) {
             return new Promise((resolve) => {
-                rl.question(prompt, (answer) => resolve(answer));
+                promptActive = true;
+                drawBoxTop();
+                rl.question(promptStr, (answer) => {
+                    promptActive = false;
+                    clearGhost();
+                    drawBoxBottom();
+                    resolve(answer);
+                });
+                // Show placeholder after readline renders the empty prompt
+                setImmediate(() => {
+                    if (promptActive && !rl.line) {
+                        drawGhost(PLACEHOLDER);
+                    }
+                });
             });
         },
         close() {
+            promptActive = false;
+            clearGhost();
+            removeFooter();
+            process.off('SIGWINCH', onResize);
+            if (isTTY) {
+                process.stdin.removeListener('keypress', onKeypressClear);
+                process.stdin.removeListener('keypress', onKeypressDraw);
+            }
             rl.close();
         },
         getKeybindingMode() {
@@ -29,9 +188,12 @@ export function createPrompt(keybindingMode) {
         },
     };
 }
+// ─── Prompt prefix (left border of input box) ─────────────────────────────
 export function prefix(mode) {
-    const safeUnicode = process.platform !== 'win32' || Boolean(process.env.WT_SESSION);
-    const label = mode === 'plan' ? 'Plan' : 'Copilot';
-    const tag = safeUnicode ? theme.badge(label) : `[${label}]`;
-    return `${tag} ${theme.user(safeUnicode ? '›' : '>')} `;
+    const arrow = safeUnicode ? '❯' : '>';
+    const border = theme.dim('│');
+    if (mode === 'plan') {
+        return `  ${border} ${theme.badge('plan')} ${theme.user(arrow)} `;
+    }
+    return `  ${border} ${theme.user(arrow)} `;
 }

package/dist/ui/render.js

@@ -1,4 +1,5 @@
 import { theme } from './theme.js';
+import { box } from './box.js';
 import { lazy } from '../util/lazy.js';
 let markdownConfigured = false;
 const loadMarked = lazy(async () => import('marked'));
@@ -24,9 +25,11 @@ export async function ensureMarkdown() {
  *  Tracks fenced ``` code blocks across token boundaries and renders the
  *  inside of a fence in `theme.hl` so the user can visually distinguish code
  *  from prose during streaming, without waiting for the full markdown render. */
+import { syntaxHighlightShell } from '../tools/shell.js';
 export class StreamSink {
     buf = '';
     inCode = false;
+    codeLang = '';
     lineBuf = '';
     write(token) {
         this.buf += token;
@@ -42,13 +45,26 @@ export class StreamSink {
         this.lineBuf = '';
         const trimmed = line.trimStart();
         if (trimmed.startsWith('```')) {
-            // toggle on the fence boundary; print fence dimmed
-            this.inCode = !this.inCode;
+            // Toggle fence; capture the language tag
+            if (!this.inCode) {
+                this.codeLang = trimmed.slice(3).trim().toLowerCase();
+                this.inCode = true;
+            }
+            else {
+                this.inCode = false;
+                this.codeLang = '';
+            }
             process.stdout.write(theme.dim(line));
             return;
         }
         if (this.inCode) {
-            process.stdout.write(theme.hl(line));
+            const isShell = ['sh', 'bash', 'zsh', 'shell', 'fish', ''].includes(this.codeLang);
+            if (isShell) {
+                process.stdout.write(syntaxHighlightShell(line));
+            }
+            else {
+                process.stdout.write(theme.hl(line));
+            }
             return;
         }
         process.stdout.write(line);
@@ -94,3 +110,16 @@ export async function renderMarkdownString(md) {
         return md;
     }
 }
+/** Render an AI response string inside a GitHub Copilot CLI-style bordered panel. */
+export async function boxResponse(md) {
+    if (!md.trim())
+        return;
+    try {
+        const markdown = await ensureMarkdown();
+        const rendered = markdown.parse(md).trimEnd();
+        process.stdout.write(box(rendered, { title: 'Copilot', style: 'response' }));
+    }
+    catch {
+        process.stdout.write(box(md.trimEnd(), { title: 'Copilot', style: 'response' }));
+    }
+}

package/dist/ui/theme.js

@@ -1,6 +1,5 @@
 import chalk, { Chalk, supportsColor } from 'chalk';
 import { config } from '../config.js';
-const plain = (text) => text;
 function colorEnabled() {
     if (config.theme === 'none')
         return false;
@@ -30,27 +29,86 @@ export function selectTheme() {
     return config.theme;
 }
 export const theme = {
-    brand: style((c, name) => (name === 'light' ? c.hex('#0F6CBD').bold : c.hex('#58A6FF').bold)),
-    user: style((c, name) => (name === 'light' ? c.hex('#0F6CBD').bold : c.hex('#58A6FF').bold)),
-    assistant: style((c, name) => (name === 'light' ? c.green.bold : c.green)),
+    brand: style((c, n) => (n === 'light' ? c.hex('#0F6CBD').bold : c.hex('#58A6FF').bold)),
+    user: style((c, n) => (n === 'light' ? c.hex('#0F6CBD').bold : c.hex('#58A6FF').bold)),
+    assistant: style((c, n) => (n === 'light' ? c.green.bold : c.green)),
     system: style((c) => c.gray.italic),
-    warn: style((c, name) => (name === 'light' ? c.hex('#92400E') : c.yellow)),
+    warn: style((c, n) => (n === 'light' ? c.hex('#92400E') : c.yellow)),
     err: style((c) => c.red.bold),
-    ok: style((c, name) => (name === 'light' ? c.hex('#166534').bold : c.green.bold)),
+    ok: style((c, n) => (n === 'light' ? c.hex('#166534').bold : c.green.bold)),
     dim: style((c) => c.gray),
-    hl: style((c, name) => (name === 'light' ? c.hex('#0A5CA8') : c.hex('#79C0FF'))),
+    hl: style((c, n) => (n === 'light' ? c.hex('#0A5CA8') : c.hex('#79C0FF'))),
+    ghost: style((c) => c.gray.dim),
+    hint: style((c) => c.gray.italic),
     badge: (s) => {
         if (!colorEnabled())
-            return ` ${s} `;
+            return `[${s}]`;
         const p = palette();
         return p.name === 'light'
             ? p.c.bgHex('#0F6CBD').white.bold(` ${s} `)
             : p.c.bgHex('#1F6FEB').white.bold(` ${s} `);
     },
 };
-export function banner(version, model) {
-    const title = theme.brand('GitHub Copilot');
-    const sep = colorEnabled() ? '•' : '-';
-    const sub = theme.dim(`v${version}  ${sep}  model: ${theme.hl(model)}`);
-    return `\n${title}  ${sub}\n${theme.dim('Type /help for commands. @file to inject a file. Ctrl-C to interrupt.')}\n`;
+export const safeUnicode = process.platform !== 'win32' || Boolean(process.env.WT_SESSION);
+// ─── Pixel-art logo ────────────────────────────────────────────────────────
+// 5-row "ICOPILOT" in full-block characters (2-space gaps between letters).
+//   I=2   C=4   O=4   P=4   I=2   L=4   O=4   T=4
+const LOGO_ROWS = [
+    '██  ████  ████  ████  ██  █     ████  ████',
+    '██  ██    █  █  █  █  ██  █     █  █   ██ ',
+    '██  ██    █  █  ████  ██  █     █  █   ██ ',
+    '██  ██    █  █  █     ██  █     █  █   ██ ',
+    '██  ████  ████  █     ██  ████  ████   ██ ',
+];
+// ─── Pilot mascot (5 rows) ─────────────────────────────────────────────────
+// Purple frame (#A371F7), cyan accents (#39D2D2).
+function buildMascot(c) {
+    const fr = (s) => c.hex('#A371F7')(s);
+    const cy = (s) => c.hex('#39D2D2')(s);
+    return [
+        fr(' ╭─────╮ '),
+        fr(' │') + cy('◉') + fr('   ') + cy('◉') + fr('│ '),
+        fr(' │') + c.hex('#A371F7')(' ─── ') + fr('│ '),
+        fr(' ╰──') + cy('┬') + fr('──╯ '),
+        cy('  ▶') + c.hex('#A371F7')(' pilot '),
+    ];
+}
+export function banner(version, model, sessionDir) {
+    if (!colorEnabled()) {
+        return [
+            '',
+            'iCopilot  v' + version + '  model: ' + model,
+            '/help for commands · @file to add context · Tab to autocomplete',
+            '',
+        ].join('\n');
+    }
+    const { c, name } = palette();
+    const green = name === 'light' ? '#166534' : '#3FB950';
+    // Render logo rows in light-blue (#58A6FF)
+    const logoRows = LOGO_ROWS.map((r) => c.hex('#58A6FF').bold(r));
+    const mascotRows = buildMascot(c);
+    // Side-by-side: mascot (10 visible chars) + logo
+    const combined = logoRows.map((lr, i) => `  ${mascotRows[i] ?? '          '}  ${lr}`).join('\n');
+    const sessDir = sessionDir ?? '~/.icopilot/sessions/';
+    const diag1 = `  ${c.hex(green)('●')} ` +
+        `${c.gray('Connected to')} ${c.hex('#58A6FF').bold('GitHub Models')} ` +
+        `${c.gray('[' + model + ']')}`;
+    const diag2 = `  ${c.hex(green)('●')} ` +
+        `${c.gray('Session:')} ${c.hex('#58A6FF')('Active')} ` +
+        `${c.gray('(' + sessDir + ')')}`;
+    const hints = safeUnicode
+        ? `${c.gray('/help')} for commands  ${c.gray('@file')} to add context  ${c.gray('Tab')} to autocomplete`
+        : `/help for commands  @file to add context  Tab to autocomplete`;
+    return [
+        '',
+        combined,
+        '',
+        `  ${c.gray('v' + version)}  ${c.gray('·')}  ${c.hex('#58A6FF')(model)}`,
+        '',
+        diag1,
+        diag2,
+        '',
+        `  ${hints}`,
+        '',
+    ].join('\n');
 }

package/package.json

@@ -1,79 +1,79 @@
 {
-    "name": "icopilot",
-    "version": "2.2.0",
-    "description": "iCopilot — terminal-native agentic CLI powered by GitHub Models",
-    "type": "module",
-    "bin": {
-        "icopilot": "bin/icopilot.js",
-        "icli": "bin/icopilot.js"
-    },
-    "main": "dist/index.js",
-    "scripts": {
-        "build": "tsc -p .",
-        "dev": "tsc -p . --watch",
-        "start": "node bin/icopilot.js",
-        "lint": "eslint \"src/**/*.ts\" \"tests/**/*.ts\"",
-        "lint:fix": "eslint --fix \"src/**/*.ts\" \"tests/**/*.ts\"",
-        "format": "prettier --write \"src/**/*.ts\" \"tests/**/*.ts\" \"*.md\"",
-        "format:check": "prettier --check \"src/**/*.ts\" \"tests/**/*.ts\"",
-        "test": "vitest run",
-        "test:watch": "vitest",
-        "coverage": "vitest run --coverage",
-        "typecheck": "tsc -p . --noEmit",
-        "prepare": "tsc -p .",
-        "release": "node scripts/release.mjs",
-        "release:patch": "node scripts/release.mjs patch",
-        "release:minor": "node scripts/release.mjs minor",
-        "release:major": "node scripts/release.mjs major",
-        "changelog": "node scripts/changelog.mjs",
-        "smoke": "node scripts/smoke.mjs",
-        "test:smoke": "vitest run tests/smoke --config vitest.smoke.config.ts",
-        "screenshots": "node scripts/screenshots.mjs",
-        "perf:cold-start": "node scripts/cold-start.mjs"
-    },
-    "engines": {
-        "node": ">=18.17.0"
-    },
-    "dependencies": {
-        "@inquirer/prompts": "^5.3.8",
-        "chalk": "^5.3.0",
-        "commander": "^12.1.0",
-        "diff": "^5.2.0",
-        "dotenv": "^16.4.5",
-        "fast-glob": "^3.3.2",
-        "gpt-tokenizer": "^2.1.2",
-        "marked": "^13.0.3",
-        "marked-terminal": "^7.1.0",
-        "openai": "^4.56.0",
-        "ora": "^8.0.1",
-        "proxy-agent": "^6.5.0",
-        "simple-git": "^3.25.0",
-        "yaml": "^2.9.0"
-    },
-    "devDependencies": {
-        "@types/diff": "^5.2.1",
-        "@types/marked-terminal": "^6.1.1",
-        "@types/node": "^20.14.10",
-        "@typescript-eslint/eslint-plugin": "^7.18.0",
-        "@typescript-eslint/parser": "^7.18.0",
-        "@vitest/coverage-v8": "^1.6.0",
-        "eslint": "^8.57.0",
-        "eslint-config-prettier": "^9.1.0",
-        "eslint-plugin-prettier": "^5.2.1",
-        "prettier": "^3.3.3",
-        "typescript": "^5.5.4",
-        "vitest": "^1.6.0"
-    },
-    "license": "MIT",
-    "files": [
-        "bin",
-        "dist",
-        "README.md",
-        "CHANGELOG.md",
-        "LICENSE"
-    ],
-    "repository": {
-        "type": "git",
-        "url": ""
-    }
+  "name": "icopilot",
+  "version": "2.3.2",
+  "description": "iCopilot — terminal-native agentic CLI powered by GitHub Models",
+  "type": "module",
+  "bin": {
+    "icopilot": "bin/icopilot.js",
+    "icli": "bin/icopilot.js"
+  },
+  "main": "dist/index.js",
+  "scripts": {
+    "build": "tsc -p .",
+    "dev": "tsc -p . --watch",
+    "start": "node bin/icopilot.js",
+    "lint": "eslint \"src/**/*.ts\" \"tests/**/*.ts\"",
+    "lint:fix": "eslint --fix \"src/**/*.ts\" \"tests/**/*.ts\"",
+    "format": "prettier --write \"src/**/*.ts\" \"tests/**/*.ts\" \"*.md\"",
+    "format:check": "prettier --check \"src/**/*.ts\" \"tests/**/*.ts\"",
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "coverage": "vitest run --coverage",
+    "typecheck": "tsc -p . --noEmit",
+    "prepare": "tsc -p .",
+    "release": "node scripts/release.mjs",
+    "release:patch": "node scripts/release.mjs patch",
+    "release:minor": "node scripts/release.mjs minor",
+    "release:major": "node scripts/release.mjs major",
+    "changelog": "node scripts/changelog.mjs",
+    "smoke": "node scripts/smoke.mjs",
+    "test:smoke": "vitest run tests/smoke --config vitest.smoke.config.ts",
+    "screenshots": "node scripts/screenshots.mjs",
+    "perf:cold-start": "node scripts/cold-start.mjs"
+  },
+  "engines": {
+    "node": ">=18.17.0"
+  },
+  "dependencies": {
+    "@inquirer/prompts": "^5.3.8",
+    "chalk": "^5.3.0",
+    "commander": "^12.1.0",
+    "diff": "^5.2.0",
+    "dotenv": "^16.4.5",
+    "fast-glob": "^3.3.2",
+    "gpt-tokenizer": "^2.1.2",
+    "marked": "^13.0.3",
+    "marked-terminal": "^7.1.0",
+    "openai": "^4.56.0",
+    "ora": "^8.0.1",
+    "proxy-agent": "^6.5.0",
+    "simple-git": "^3.25.0",
+    "yaml": "^2.9.0"
+  },
+  "devDependencies": {
+    "@types/diff": "^5.2.1",
+    "@types/marked-terminal": "^6.1.1",
+    "@types/node": "^20.14.10",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
+    "@typescript-eslint/parser": "^7.18.0",
+    "@vitest/coverage-v8": "^1.6.0",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.2.1",
+    "prettier": "^3.3.3",
+    "typescript": "^5.5.4",
+    "vitest": "^1.6.0"
+  },
+  "license": "MIT",
+  "files": [
+    "bin",
+    "dist",
+    "README.md",
+    "CHANGELOG.md",
+    "LICENSE"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/i4Edu/icli"
+  }
 }