@vigent/cli 0.2.0 → 0.2.2

package/README.md

@@ -12,7 +12,7 @@ A vim-style, lightweight terminal app for running several coding agents at once,
 npm install -g @vigent/cli
 ```
 
-The package is `@vigent/cli` (npm doesn't accept the plain name `vigent`, which it finds too close to `vitest`); the command is `vigent`.
+The package is `@vigent/cli` (npm doesn't accept the plain name `vigent`, which it finds too close to `vitest`); the command is `vigent`. Run `vigent` in a project, or `vigent <folder>` (`vigent .`, `vigent ~/code/app`) from anywhere.
 
 Requires Node.js 20 or newer and git. Then, inside any git repository:
 
@@ -94,7 +94,7 @@ The sidebar's ENGINES block shows each one: `●` signed in, `◐` installed but
 | `codex` | `codex exec --json` (`exec resume` to continue) | `-c sandbox_mode="workspace-write"` |
 | `opencode` | `opencode run --format json --dir <worktree>` | none |
 
-**Model and effort:** `:model` (`<Space>M`) opens a picker with the models the agent's engine offers, and you can type any name. `:effort` (`<Space>e`) sets the reasoning effort (pi: thinking level). Both apply from the next prompt, show in the winbar and survive a restart. With no agent open, they set the defaults for new agents.
+**Model and effort:** `:model` (`<Space>M`) opens a picker with the models the agent's engine offers (Claude Code's model names, Codex's own catalog from `codex debug models`, OpenCode's `opencode models`, or pi's for the providers you have a key for). In the picker, `j`/`k` move, `g`/`G` jump to the top or bottom, Enter picks and `q` or Esc closes. Press `/` to search, or to type any model name. `:effort` (`<Space>e`) sets the reasoning effort (pi: thinking level). Both apply from the next prompt, show in the winbar and survive a restart. With no agent open, they set the defaults for new agents.
 
 ![:model on a Claude Code agent](https://raw.githubusercontent.com/farming-labs/vigent/main/docs/screenshots/model-picker.png)
 
@@ -201,8 +201,11 @@ vigent theme import kanagawa        # any colorscheme your editor can load (plug
 vigent theme import ./molokai.vim   # a .vim file, no editor needed
 vigent theme new mine --from nord   # start your own theme, pre-filled with nord's colors
 vigent --theme lazyvim              # LazyVim's look, on your terminal's own (transparent) background
+vigent --theme nvim                 # follow your Neovim: the colorscheme your config sets
 ```
 
+**Follow your editor:** with `theme = "nvim"` (or `"vim"`) in config.toml, vigent uses whatever colorscheme your Neovim config and plugins set, whether that's AstroNvim's `astrodark`, LazyVim's `tokyonight` or anything else. Change it in Neovim, and vigent picks it up the next time it starts. vigent keeps a copy (`themes/nvim.json`) so it opens instantly, and checks Neovim in the background.
+
 Inside vigent, `:colorscheme` opens a picker with live preview. `:hi Group guifg=… guibg=…` changes any color on the spot, `:set transparent` lets your terminal's background (its blur, opacity or wallpaper) show through any theme, and `:theme save mine` keeps what's on screen as your own theme file. To keep settings, put them in `~/.config/vigent/config.toml` (`vigent config init` writes a starter file):
 
 ```toml
@@ -210,7 +213,7 @@ theme = "tokyonight"
 
 [ui]
 sidebar_width = 34
-icons = "unicode"      # or "ascii"
+icons = "unicode"      # or "nerd" (Nerd Font icons), "ascii"
 transparent = true     # the terminal's background, with any theme
 
 [highlights]           # applied on top of any theme
@@ -218,6 +221,8 @@ Normal = { bg = "NONE" }
 CursorLine = "guibg=#2a2f3a"
 ```
 
+**Icons and fonts:** `icons = "nerd"` (or `:settings`, Icons) uses Nerd Font icons like AstroNvim and LazyVim: a git branch icon, status and engine icons, an icon per tool call (terminal, pencil, file, search…) and file-type icons in the diff view, colored from your theme. vigent draws in your terminal's font, the same as Neovim in a terminal, so for these icons set your terminal's font to a [Nerd Font](https://www.nerdfonts.com) (for example JetBrainsMono Nerd Font).
+
 25 built in, including `lazyvim` (LazyVim's look, transparent), the tokyonight, catppuccin and rose-pine families, `dracula`, `onedark`, `everforest`, `nightfox`, `gruvbox`, `kanagawa`, `nord`, `monokai-pro`, `ayu-mirage`, and GitHub and solarized in dark and light. The picker shows each one's colors:
 
 ![the colorscheme picker: every theme with its colors, dark / light / transparent](https://raw.githubusercontent.com/farming-labs/vigent/main/docs/screenshots/colorscheme-swatches.png)

package/dist/app.js

@@ -24,7 +24,8 @@ import { TREE_GLYPHS } from "./tree.js";
 import { transcriptMarkdown } from "./export.js";
 import { renderMarkdown } from "./markdown.js";
 import { ChoicePicker, PICKER_ICONS, ThemePicker } from "./picker.js";
-import { EFFORTS, effortChoices, modelChoices } from "./choices.js";
+import { EFFORTS, effortChoicesFor, modelChoices } from "./choices.js";
+import { ICON_SETS, NERD, toolIcon } from "./icons.js";
 import { mergeWorktree, openPullRequest } from "./review.js";
 import { BUILTIN_THEMES, extractPalette, listThemes, loadTheme, RESET, sgr, themeFileFor, themesDir } from "./theme.js";
 import { parseHighlightCommand } from "./vimcolors.js";
@@ -58,6 +59,27 @@ const ICONS = {
         warn: "◐",
         off: "○",
     },
+    nerd: {
+        spinner: ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"],
+        state: { waiting: NERD.hourglass, idle: NERD.circleO, paused: NERD.pause, error: NERD.times },
+        tee: "├╴",
+        last: "└╴",
+        pipe: "│ ",
+        sep: "│",
+        worktree: `${NERD.branch} `,
+        prompt: "❯ ",
+        folded: NERD.caretRight,
+        open: NERD.caretDown,
+        cursor: "▍",
+        minus: "−",
+        bullet: "•",
+        queued: NERD.clock,
+        open_agent: "▸",
+        here: NERD.circle,
+        ok: NERD.check,
+        warn: NERD.warning,
+        off: NERD.circleO,
+    },
     ascii: {
         spinner: ["|", "/", "-", "\\"],
         state: { waiting: "~", idle: "o", paused: "=", error: "x" },
@@ -948,7 +970,8 @@ export class App {
     /** `:effort <level>` */
     chooseEffort(level, t = this.modelTarget()) {
         const allowed = ["default", ...EFFORTS[t.engine]];
-        if (!allowed.includes(level)) {
+        // Codex's levels differ per model and version; Codex itself says if one doesn't fit
+        if (!allowed.includes(level) && !(t.engine === "codex" && /^[a-z]+$/.test(level))) {
             this.setMessage(`${ENGINE_NAMES[t.engine]} takes: ${allowed.join(", ")}`, "ErrorMsg");
             return;
         }
@@ -985,8 +1008,16 @@ export class App {
     /** `:effort`: the reasoning effort / thinking levels the engine accepts. */
     openEffortPicker(t = this.modelTarget()) {
         const current = (t.session ? t.session.effort : this.newAgentEffort[t.engine]) ?? "default";
-        this.openChoices(`Effort · ${t.label}`, effortChoices(t.engine), current, false, (v) => this.chooseEffort(v, t));
+        this.openChoices(`Effort · ${t.label}`, this.effortChoices(t.engine, this.modelOf(t)), current, false, (v) => this.chooseEffort(v, t));
+    }
+    /** the model an agent (or new agents) asked for, if any */
+    modelOf(t) {
+        if (!t.session)
+            return this.newAgentModel[t.engine];
+        return "chosenModel" in t.session ? t.session.chosenModel : t.session.model;
     }
+    /** where effort levels come from (replaced in tests) */
+    effortChoices = (engine, model) => effortChoicesFor(engine, model);
     /** where model lists come from (replaced in tests) */
     modelChoices = (engine) => modelChoices(engine);
     openChoices(title, items, current, custom, done) {
@@ -1033,7 +1064,13 @@ export class App {
                 },
                 hint: "the terminal's own background shows through (its blur, opacity or wallpaper)",
             },
-            { section: "Look", label: "Icons", value: () => ui.icons, change: () => ((ui.icons = ui.icons === "unicode" ? "ascii" : "unicode"), refresh()), hint: "ascii for fonts without box-drawing characters" },
+            {
+                section: "Look",
+                label: "Icons",
+                value: () => ui.icons,
+                change: () => ((ui.icons = ICON_SETS[(ICON_SETS.indexOf(ui.icons) + 1) % ICON_SETS.length]), refresh()),
+                hint: "nerd: Nerd Font icons (needs a Nerd Font) · ascii: fonts without box-drawing characters",
+            },
             { section: "Look", label: "24-bit color", value: () => onOff(ui.termguicolors), change: () => ((ui.termguicolors = !ui.termguicolors), refresh()), hint: "off: the nearest of the 256 standard colors (vim's 'termguicolors')" },
             { section: "Layout", label: "Sidebar", value: () => onOff(ui.sidebar), change: () => ((ui.sidebar = !ui.sidebar), refresh()) },
             {
@@ -1575,7 +1612,7 @@ export class App {
             }
             const width = this.terminal.columns - 4;
             const unified = unifiedView(text);
-            const side = splitView(text, width - 3);
+            const side = splitView(text, width - 3, this.ui.icons === "nerd");
             const n = unified.jumps.length;
             const title = (layout) => `${wt.branch} vs ${wt.base ?? "base"} · ${n} hunk${n === 1 ? "" : "s"} · ]c [c jump · s ${layout}`;
             const views = [
@@ -2042,7 +2079,7 @@ export class App {
         const rows = [];
         const add = (text, plain, indent = center(plain)) => rows.push({ text: indent + text, plain: indent + plain });
         // LazyVim's dashboard: a big logo, then one key per action
-        const logo = this.ui.icons === "unicode" && paneW >= LOGO[0].length + 2 && paneH >= 22;
+        const logo = this.ui.icons !== "ascii" && paneW >= LOGO[0].length + 2 && paneH >= 22;
         if (logo) {
             const groups = ["Function", "Function", "Special", "Special", "Keyword", "Keyword"];
             LOGO.forEach((l, i) => add(P.p(groups[i] ?? "Title", l), l));
@@ -2054,7 +2091,7 @@ export class App {
         const tagline = "coding agents, the vim way · each one in its own git worktree";
         add(P.p("Comment", tagline), tagline);
         add("", "");
-        const actions = DASHBOARD.map(([key, icon, label]) => [key, this.ui.icons === "unicode" ? icon : "", label]);
+        const actions = DASHBOARD.map(([key, icon, label, nerd]) => [key, this.ui.icons === "nerd" ? nerd : this.ui.icons === "unicode" ? icon : "", label]);
         const labelW = Math.max(...actions.map(([, , l]) => l.length));
         const blockW = 2 + labelW + 6;
         const indent = center("x".repeat(blockW));
@@ -2075,7 +2112,7 @@ export class App {
             });
             add(text, plain, indentE);
             const ready = this.engines.filter((e) => e.connected).length;
-            const foot = `${this.ui.icons === "unicode" ? "⚡ " : ""}vigent ${VERSION_TEXT} · ${listThemes().length} themes · ${ready} of ${this.engines.length} engines ready`;
+            const foot = `${this.ui.icons === "nerd" ? `${NERD.bolt} ` : this.ui.icons === "unicode" ? "⚡ " : ""}vigent ${VERSION_TEXT} · ${listThemes().length} themes · ${ready} of ${this.engines.length} engines ready`;
             add(P.p("Comment", foot), foot);
         }
         if (!this.workspace.root) {
@@ -2245,7 +2282,8 @@ export class App {
                 case "tool": {
                     const t = item.tool;
                     const fold = t.folded ? I.folded : I.open;
-                    push(P.p("NonText", ` ${fold} `) + P.p("VigentTool", t.name) + P.p("Comment", ` ${t.summary}`), ` ${fold} ${t.name} ${t.summary}`, { item: n });
+                    const icon = this.ui.icons === "nerd" ? `${toolIcon(t.name)} ` : "";
+                    push(P.p("NonText", ` ${fold} `) + P.p("Special", icon) + P.p("VigentTool", t.name) + P.p("Comment", ` ${t.summary}`), ` ${fold} ${icon}${t.name} ${t.summary}`, { item: n });
                     if (!t.folded && t.output) {
                         const block = nextBlock++;
                         const outLines = t.output.split("\n");
@@ -2474,14 +2512,15 @@ const LOGO = [
     "  ╚═══╝  ╚═╝ ╚═════╝ ╚══════╝╚═╝  ╚═══╝   ╚═╝   ",
 ];
 /** The dashboard's keys (active while no agent is open): key, icon, label. */
+/** key, unicode icon, label, Nerd Font icon */
 const DASHBOARD = [
-    ["i", "✎", "New agent: type a task, Enter"],
-    ["n", "+", "New agent by name"],
-    ["t", "◐", "Theme"],
-    ["s", "⚙", "Settings"],
-    ["m", "◆", "Model"],
-    ["e", "↯", "Effort"],
-    ["c", "✓", "Check engines"],
-    ["?", "⌘", "Keys"],
-    ["q", "×", "Quit"],
+    ["i", "✎", "New agent: type a task, Enter", NERD.pencil],
+    ["n", "+", "New agent by name", NERD.plus],
+    ["t", "◐", "Theme", NERD.palette],
+    ["s", "⚙", "Settings", NERD.gear],
+    ["m", "◆", "Model", NERD.chip],
+    ["e", "↯", "Effort", NERD.bolt],
+    ["c", "✓", "Check engines", NERD.check],
+    ["?", "⌘", "Keys", NERD.keyboard],
+    ["q", "×", "Quit", NERD.power],
 ];

package/dist/choices.js

@@ -1,14 +1,17 @@
 /**
  * What `:model` and `:effort` offer, per engine. Model lists come from the
- * engine itself where it can say (pi-ai's catalog, `opencode models`); any
+ * engine itself where it can say (pi-ai's catalog, `codex debug models`,
+ * `opencode models`); any
  * name can still be typed in the picker.
  */
 import { execFile } from "node:child_process";
+import { ENGINE_BINS } from "./engines.js";
 /** Reasoning effort / thinking levels each engine accepts. */
 export const EFFORTS = {
     pi: ["off", "minimal", "low", "medium", "high", "xhigh"],
     claude: ["low", "medium", "high", "xhigh", "max"],
-    codex: ["minimal", "low", "medium", "high", "xhigh"],
+    // what Codex's models take between them; each model's own levels come from `codex debug models`
+    codex: ["minimal", "low", "medium", "high", "xhigh", "max", "ultra"],
     opencode: ["minimal", "low", "medium", "high", "max"],
 };
 export function effortChoices(engine) {
@@ -36,7 +39,10 @@ export async function modelChoices(engine, env = process.env) {
                 { value: "haiku", note: "latest Haiku" },
             ];
         case "codex":
-            return [{ value: "default", note: "Codex's own choice (type any model name)" }];
+            return [
+                { value: "default", note: "Codex's own choice" },
+                ...(await codexModels(env)).map((m) => ({ value: m.slug, note: m.description ? `${m.name} · ${m.description}` : m.name })),
+            ];
         case "opencode":
             return [{ value: "default", note: "OpenCode's own choice" }, ...(await opencodeModels(env)).map((value) => ({ value }))];
         case "pi": {
@@ -71,3 +77,61 @@ function opencodeModels(env) {
         });
     });
 }
+let codexCatalog;
+/**
+ * The models your Codex offers, from `codex debug models` (its own catalog,
+ * so it follows your Codex version and account). Asked once per run; empty
+ * when Codex isn't installed or can't say.
+ */
+export function codexModels(env = process.env) {
+    if (env !== process.env)
+        return readCodexModels(env);
+    codexCatalog ??= readCodexModels(env).then((list) => {
+        if (!list.length)
+            codexCatalog = undefined; // try again next time
+        return list;
+    });
+    return codexCatalog;
+}
+function readCodexModels(env) {
+    return new Promise((resolve) => {
+        execFile(ENGINE_BINS.codex, ["debug", "models"], { env, timeout: 20000, maxBuffer: 16 * 1024 * 1024 }, (err, stdout) => {
+            if (err)
+                return resolve([]);
+            resolve(parseCodexModels(String(stdout)));
+        });
+    });
+}
+/** The models `codex debug models` lists for people to pick (not the hidden ones). */
+export function parseCodexModels(json) {
+    try {
+        const models = JSON.parse(json)?.models ?? [];
+        return models
+            .filter((m) => m && typeof m.slug === "string" && (m.visibility === undefined || m.visibility === "list"))
+            .map((m) => ({
+            slug: m.slug,
+            name: typeof m.display_name === "string" ? m.display_name : m.slug,
+            description: typeof m.description === "string" ? m.description : undefined,
+            efforts: Array.isArray(m.supported_reasoning_levels)
+                ? m.supported_reasoning_levels.map((l) => (typeof l === "string" ? l : l?.effort)).filter((e) => typeof e === "string")
+                : [],
+        }));
+    }
+    catch {
+        return [];
+    }
+}
+/**
+ * `:effort` for an agent: the levels its engine takes. For Codex, the levels
+ * of the model it uses (all of Codex's levels when that's its default).
+ */
+export async function effortChoicesFor(engine, model, env = process.env) {
+    if (engine !== "codex")
+        return effortChoices(engine);
+    const catalog = await codexModels(env);
+    const own = catalog.find((m) => m.slug === model)?.efforts;
+    const levels = own?.length ? own : [...new Set(catalog.flatMap((m) => m.efforts))];
+    if (!levels.length)
+        return effortChoices(engine);
+    return [{ value: "default", note: "what the model uses" }, ...EFFORTS.codex.filter((e) => levels.includes(e)).map((value) => ({ value })), ...levels.filter((e) => !EFFORTS.codex.includes(e)).map((value) => ({ value }))];
+}

package/dist/cli.js

@@ -14,6 +14,7 @@ import { createDemoSessions } from "./demo.js";
 import { buildKeymap, KEY_MODES } from "./keys.js";
 import { formatBytes, prepareViews, riftriBackends, riftriGc, riftriHealth, riftriStateDir } from "./riftri.js";
 import { DemoSession, PiSession } from "./session.js";
+import { followedColorscheme, followTheme, isFollow, refreshFollow } from "./follow.js";
 import { BUILTIN_THEMES, listThemes, loadTheme, Painter, themesDir } from "./theme.js";
 import { themeNewTemplate } from "./theme-new.js";
 import { branchName, createWorktree, findWorktree, listWorktrees, removeWorktree, repoRoot, worktreesDir, } from "./worktree.js";
@@ -21,7 +22,7 @@ const HELP = `vigent — vim-native agent orchestrator (pi engine)
 
 usage:
   vigent --version                           which vigent this is (and the commit, from a clone)
-  vigent [--demo] [--theme <name>] [--model <id>] [--engine pi|claude|codex|opencode]
+  vigent [folder] [--demo] [--theme <name>] [--model <id>] [--engine pi|claude|codex|opencode]
 
 engines (what runs new agents; :checkhealth shows which are signed in):
   pi        built in, uses ANTHROPIC_API_KEY / OPENAI_API_KEY / ... or pi's login
@@ -206,7 +207,9 @@ async function main() {
         const keys = buildKeymap(config.leader, config.keys);
         warnings.push(...keys.warnings);
         try {
-            if (config.theme)
+            if (isFollow(config.theme))
+                followTheme(config.theme);
+            else if (config.theme)
                 loadTheme(config.theme);
         }
         catch (err) {
@@ -229,6 +232,17 @@ async function main() {
         console.log(`created ${file}`);
         return 0;
     }
+    // `vigent <folder>` (like `code .` or `nvim .`) opens that folder; with none, the current one.
+    const VALUE_FLAGS = ["--theme", "--model", "--engine"];
+    const folder = argv.find((a, i) => !a.startsWith("-") && !VALUE_FLAGS.includes(argv[i - 1]));
+    if (folder !== undefined) {
+        const dir = path.resolve(folder);
+        if (!fs.existsSync(dir) || !fs.statSync(dir).isDirectory()) {
+            console.error(`vigent: '${folder}' is not a folder (usage: vigent [folder])`);
+            return 1;
+        }
+        process.chdir(dir);
+    }
     const { config, warnings } = loadConfig();
     const stale = staleBuild();
     if (stale)
@@ -248,7 +262,8 @@ async function main() {
     const themeName = flag(argv, "--theme") ?? config.theme ?? "default";
     let theme = BUILTIN_THEMES.default;
     try {
-        theme = loadTheme(themeName);
+        // theme = "nvim" / "vim": your editor's colorscheme (kept up to date below)
+        theme = isFollow(themeName) ? followTheme(themeName) : loadTheme(themeName);
     }
     catch (err) {
         if (flag(argv, "--theme")) {
@@ -415,6 +430,13 @@ async function main() {
     tui.start();
     if (warnings.length > 0)
         app.notify(warnings.join(" · "));
+    if (isFollow(themeName)) {
+        const editor = themeName;
+        refreshFollow(editor, (t) => {
+            app.setTheme(t);
+            app.notify(`colorscheme from ${editor}: ${followedColorscheme(editor) ?? editor}`, "Comment");
+        });
+    }
     tui.requestRender(true);
     return undefined;
 }

package/dist/config.js

@@ -8,7 +8,7 @@
  *   sidebar_width = 30
  *   number = true
  *   tilde = true
- *   icons = "unicode"        # or "ascii"
+ *   icons = "unicode"        # or "nerd" (a Nerd Font), "ascii"
  *
  *   [highlights]             # applied on top of whichever theme is active
  *   Normal = { bg = "NONE" } # transparent background
@@ -19,6 +19,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import { parse as parseToml } from "smol-toml";
 import { EFFORTS } from "./choices.js";
+import { ICON_SETS } from "./icons.js";
 import { isEngineId } from "./engines.js";
 import { WORKTREE_BACKENDS } from "./riftri.js";
 import { KEY_MODES } from "./keys.js";
@@ -223,8 +224,8 @@ export function setOption(ui, name, value) {
             return;
         }
         case "icons":
-            if (value !== "unicode" && value !== "ascii")
-                return `'${name}' should be "unicode" or "ascii"`;
+            if (!ICON_SETS.includes(value))
+                return `'${name}' should be "unicode", "nerd" or "ascii"`;
             ui.icons = value;
             return;
         case "transparent":
@@ -316,6 +317,8 @@ export const CONFIG_TEMPLATE = `# vigent config: ~/.config/vigent/config.toml
 # Built-in: default, lazyvim (transparent), tokyonight, tokyonight-moon, gruvbox,
 # catppuccin, catppuccin-latte, nord, rose-pine, kanagawa. Or any theme in ~/.config/vigent/themes, e.g. one made
 # with  vigent theme import  (your nvim/vim colorscheme) or  vigent theme new.
+# "nvim" (or "vim") follows your editor: the colorscheme your config and plugins
+# set (AstroNvim, LazyVim, NvChad...), updated each time vigent starts.
 theme = "default"
 
 # Model used for new pi agents.
@@ -347,7 +350,7 @@ sidebar = true
 sidebar_width = 30
 number = true          # session numbers in the sidebar
 tilde = true           # ~ on empty sidebar rows
-icons = "unicode"      # "ascii" for fonts without box-drawing characters
+icons = "unicode"      # "nerd" for Nerd Font icons (like AstroNvim/LazyVim), "ascii" for fonts without box-drawing characters
 timeoutlen = 1000      # ms to wait for the rest of a multi-key mapping
 # termguicolors = false  # for terminals without 24-bit color: use the nearest of 256
 # transparent = true    # use the terminal's background with any theme ("auto": the theme decides)

package/dist/diffview.js

@@ -8,6 +8,7 @@
  * Both return the line indices of hunk headers so ]c / [c can jump.
  */
 import { truncateToWidth, visibleWidth } from "@mariozechner/pi-tui";
+import { fileIcon } from "./icons.js";
 function lineGroup(line) {
     if (line.startsWith("+++") || line.startsWith("---"))
         return "Title";
@@ -38,8 +39,8 @@ function cell(no, text, width, group) {
         [group, body + " ".repeat(Math.max(0, width - 5 - visibleWidth(body)))],
     ];
 }
-/** Side-by-side layout for a window `width` columns wide (inside its border). */
-export function splitView(text, width) {
+/** Side-by-side layout for a window `width` columns wide (inside its border). With `icons`, file names get their Nerd Font icon. */
+export function splitView(text, width, icons = false) {
     const col = Math.max(12, Math.floor((width - 3) / 2));
     const lines = [];
     const jumps = [];
@@ -63,7 +64,9 @@ export function splitView(text, width) {
         }
         const file = /^\+\+\+ (?:b\/)?(.*)$/.exec(line);
         if (file) {
-            lines.push([["Title", file[1] === "/dev/null" ? "(deleted file)" : file[1]]]);
+            const name = file[1] === "/dev/null" ? "(deleted file)" : file[1];
+            const [glyph, group] = fileIcon(name);
+            lines.push(icons ? [[group, `${glyph} `], ["Title", name]] : [["Title", name]]);
             continue;
         }
         if (/^(---|index |new file|deleted file|similarity|rename |\\ No newline)/.test(line))

package/dist/follow.js

@@ -0,0 +1,75 @@
+/**
+ * `theme = "nvim"` (or `"vim"`): vigent uses the colorscheme your editor
+ * uses, with your config and plugins (AstroNvim, LazyVim, NvChad...).
+ *
+ * The editor's colors are kept as the theme file `nvim.json` (`vim.json`).
+ * At start vigent shows that copy at once, and imports again in the
+ * background: when you've changed your editor's colorscheme since, the new
+ * one replaces it while vigent runs. The first time there's no copy yet, so
+ * vigent imports before it opens.
+ */
+import { spawn } from "node:child_process";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { importTheme } from "./import.js";
+import { loadTheme, themesDir } from "./theme.js";
+export const FOLLOW_EDITORS = ["nvim", "vim"];
+export function isFollow(theme) {
+    return FOLLOW_EDITORS.includes(theme ?? "");
+}
+/** The theme file that holds the editor's colors. */
+export function followFile(editor, dir = themesDir()) {
+    return path.join(dir, `${editor}.json`);
+}
+/** The colorscheme the copy came from (e.g. "astrodark"), if it says. */
+export function followedColorscheme(editor, dir = themesDir()) {
+    try {
+        const c = JSON.parse(fs.readFileSync(followFile(editor, dir), "utf8")).colorscheme;
+        return typeof c === "string" && c ? c : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+/** The editor's theme: the copy from last time, or (the first time) an import now. Throws if the editor can't say. */
+export function followTheme(editor, dir = themesDir()) {
+    const file = followFile(editor, dir);
+    if (!fs.existsSync(file))
+        importTheme({ editor, as: editor, outDir: dir });
+    return loadTheme(file);
+}
+/** The copy's colors in a fixed order (the editor lists its groups in any order). */
+function read(file) {
+    try {
+        const sorted = (v) => v && typeof v === "object" && !Array.isArray(v)
+            ? Object.fromEntries(Object.keys(v).sort().map((k) => [k, sorted(v[k])]))
+            : v;
+        return JSON.stringify(sorted(JSON.parse(fs.readFileSync(file, "utf8"))));
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * Import the editor's colorscheme again without blocking (in a child
+ * `vigent theme import`); `onChange` gets the theme when it differs from the copy.
+ */
+export function refreshFollow(editor, onChange, cli = process.argv[1]) {
+    const file = followFile(editor);
+    const before = read(file);
+    const child = spawn(process.execPath, [cli, "theme", "import", `--${editor}`, "--as", editor], { stdio: "ignore" });
+    child.on("error", () => { });
+    child.on("exit", (code) => {
+        if (code !== 0)
+            return;
+        const after = read(file);
+        if (after === undefined || after === before)
+            return;
+        try {
+            onChange(loadTheme(file));
+        }
+        catch {
+            // a copy that doesn't load: keep what's on screen
+        }
+    });
+}

package/dist/icons.js

@@ -0,0 +1,104 @@
+/**
+ * Nerd Font icons (`icons = "nerd"`), the glyphs AstroNvim, LazyVim and
+ * nvim-web-devicons draw. They need a Nerd Font in the terminal
+ * (https://www.nerdfonts.com); codepoints are Nerd Fonts v3.
+ */
+export const ICON_SETS = ["unicode", "nerd", "ascii"];
+export const NERD = {
+    branch: "", // nf-dev-git_branch
+    check: "", // nf-fa-check
+    times: "", // nf-fa-times
+    warning: "", // nf-fa-warning
+    circle: "", // nf-fa-circle
+    circleO: "", // nf-fa-circle_o
+    pause: "", // nf-fa-pause
+    clock: "", // nf-fa-clock_o
+    hourglass: "", // nf-fa-hourglass_half
+    search: "", // nf-fa-search
+    pencil: "", // nf-fa-pencil_square_o
+    plus: "", // nf-fa-plus
+    palette: "", // nf-fa-palette
+    gear: "", // nf-fa-gear
+    chip: "", // nf-fa-microchip
+    bolt: "", // nf-fa-bolt
+    keyboard: "", // nf-fa-keyboard_o
+    power: "", // nf-fa-power_off
+    terminal: "", // nf-oct-terminal
+    file: "", // nf-fa-file
+    fileText: "", // nf-fa-file_text
+    globe: "", // nf-fa-globe
+    wrench: "", // nf-fa-wrench
+    list: "", // nf-fa-list
+    caretRight: "", // nf-fa-caret_right
+    caretDown: "", // nf-fa-caret_down
+};
+/** An icon for a tool call, by the tool's name (Claude Code, Codex, OpenCode and pi names). */
+export function toolIcon(name) {
+    const n = name.toLowerCase();
+    if (/bash|shell|exec|command|run/.test(n))
+        return NERD.terminal;
+    if (/edit|write|patch|apply/.test(n))
+        return NERD.pencil;
+    if (/read|view|cat|open/.test(n))
+        return NERD.fileText;
+    if (/grep|glob|search|find|^ls$|list/.test(n))
+        return NERD.search;
+    if (/web|fetch|http|url/.test(n))
+        return NERD.globe;
+    if (/todo|plan|task/.test(n))
+        return NERD.list;
+    return NERD.wrench;
+}
+/**
+ * A file's icon and the highlight group to color it with, by name or
+ * extension (like nvim-web-devicons, colored from the theme).
+ */
+export function fileIcon(file) {
+    const base = file.split(/[/\\]/).pop()?.toLowerCase() ?? "";
+    const byName = {
+        "package.json": ["", "DiagnosticError"], // nf-dev-npm
+        "package-lock.json": ["", "DiagnosticError"],
+        dockerfile: ["", "DiagnosticInfo"], // nf-linux-docker
+        ".gitignore": ["", "DiagnosticWarn"], // nf-dev-git
+        makefile: ["", "Comment"], // nf-dev-gnu
+        license: ["", "DiagnosticWarn"], // nf-seti-license
+    };
+    if (byName[base])
+        return byName[base];
+    const ext = base.includes(".") ? base.slice(base.lastIndexOf(".") + 1) : "";
+    const byExt = {
+        ts: ["", "Function"], // nf-seti-typescript
+        tsx: ["", "Function"], // nf-dev-react
+        mts: ["", "Function"],
+        js: ["", "DiagnosticWarn"], // nf-dev-javascript
+        jsx: ["", "Function"],
+        mjs: ["", "DiagnosticWarn"],
+        cjs: ["", "DiagnosticWarn"],
+        json: ["", "DiagnosticWarn"], // nf-seti-json
+        md: ["", "Normal"], // nf-dev-markdown
+        py: ["", "DiagnosticWarn"], // nf-dev-python
+        rs: ["", "Special"], // nf-dev-rust
+        go: ["", "Function"], // nf-seti-go
+        lua: ["", "Function"], // nf-seti-lua
+        vim: ["", "String"], // nf-seti-vim
+        html: ["", "Special"], // nf-dev-html5
+        css: ["", "Function"], // nf-dev-css3
+        scss: ["", "Statement"],
+        sh: ["", "String"], // nf-oct-terminal
+        bash: ["", "String"],
+        zsh: ["", "String"],
+        toml: ["", "Comment"], // nf-seti-config
+        yml: ["", "Comment"],
+        yaml: ["", "Comment"],
+        lock: ["", "Comment"], // nf-fa-lock
+        svg: ["", "DiagnosticWarn"], // nf-fa-file_image_o
+        png: ["", "Constant"],
+        jpg: ["", "Constant"],
+        java: ["", "DiagnosticError"], // nf-dev-java
+        rb: ["", "DiagnosticError"], // nf-dev-ruby
+        c: ["", "Function"], // nf-custom-c
+        cpp: ["", "Function"], // nf-custom-cpp
+        h: ["", "Statement"],
+    };
+    return byExt[ext] ?? [NERD.file, "Comment"];
+}

package/dist/import.js

@@ -255,6 +255,7 @@ export function importTheme(opts = {}) {
     const dir = opts.outDir ?? themesDir();
     fs.mkdirSync(dir, { recursive: true });
     const file = path.join(dir, `${name}.json`);
-    fs.writeFileSync(file, `${JSON.stringify({ name, background, source: via, groups }, null, "\t")}\n`);
+    const colorscheme = dump?.name || undefined;
+    fs.writeFileSync(file, `${JSON.stringify({ name, background, source: via, colorscheme, groups }, null, "\t")}\n`);
     return { name, file, groups: Object.keys(groups).length, via };
 }

package/dist/picker.js

@@ -8,6 +8,7 @@ import { fuzzyFilter, parseKey, truncateToWidth, visibleWidth } from "@mariozech
 import { RESET, sgr } from "./theme.js";
 export const PICKER_ICONS = {
     unicode: { tl: "╭", tr: "╮", bl: "╰", br: "╯", h: "─", v: "│", lt: "├", rt: "┤", current: "●", prompt: "❯" },
+    nerd: { tl: "╭", tr: "╮", bl: "╰", br: "╯", h: "─", v: "│", lt: "├", rt: "┤", current: "\uf00c", prompt: "\uf002" },
     ascii: { tl: "+", tr: "+", bl: "+", br: "+", h: "-", v: "|", lt: "+", rt: "+", current: "*", prompt: ">" },
 };
 const VISIBLE = 14;
@@ -171,9 +172,10 @@ export class ThemePicker {
     }
 }
 /**
- * A filterable list (`:model`, `:effort`). Type to filter, ↑/↓ (Ctrl-n/p,
- * Tab) to move, Enter picks. With `custom`, Enter on text that matches
- * nothing picks the text itself (a model the list doesn't know).
+ * A list to pick from (`:model`, `:effort`), vim-style. `j`/`k` (↓/↑, Ctrl-n/p,
+ * Tab) move, `g`/`G` jump to the top/bottom, Enter picks, `q`/Esc closes.
+ * `/` starts a search: type to filter, Esc ends it. With `custom`, Enter on a
+ * search that matches nothing picks the text itself (a model the list doesn't know).
  */
 export class ChoicePicker {
     painter;
@@ -184,6 +186,8 @@ export class ChoicePicker {
     onDone;
     requestRender;
     query = "";
+    /** typing goes to the search (after `/`) */
+    searching = false;
     index = 0;
     scroll = 0;
     items = [];
@@ -215,45 +219,70 @@ export class ChoicePicker {
     handleInput(data) {
         const key = parseKey(data) ?? "";
         const items = this.filtered();
-        switch (key) {
-            case "escape":
-            case "ctrl+c":
-                this.onDone(null);
-                return;
-            case "enter":
-            case "return": {
-                const picked = items[this.index]?.value ?? (this.custom && this.query.trim() ? this.query.trim() : undefined);
-                if (picked !== undefined)
-                    this.onDone(picked);
-                return;
-            }
-            case "down":
-            case "tab":
-            case "ctrl+n":
-            case "ctrl+j":
-                if (items.length)
-                    this.index = (this.index + 1) % items.length;
-                break;
-            case "up":
-            case "shift+tab":
-            case "ctrl+p":
-            case "ctrl+k":
-                if (items.length)
-                    this.index = (this.index - 1 + items.length) % items.length;
-                break;
-            case "backspace":
-                this.query = this.query.slice(0, -1);
+        const move = (by) => {
+            if (items.length)
+                this.index = (this.index + by + items.length) % items.length;
+        };
+        if (key === "ctrl+c")
+            return this.onDone(null);
+        if (key === "enter" || key === "return") {
+            const picked = items[this.index]?.value ?? (this.custom && this.query.trim() ? this.query.trim() : undefined);
+            if (picked !== undefined)
+                this.onDone(picked);
+            return;
+        }
+        if (["down", "tab", "ctrl+n", "ctrl+j"].includes(key))
+            move(1);
+        else if (["up", "shift+tab", "ctrl+p", "ctrl+k"].includes(key))
+            move(-1);
+        else if (this.searching) {
+            if (key === "escape")
+                this.searching = false; // the filter stays; j/k move through it
+            else if (key === "backspace") {
+                if (this.query)
+                    this.query = this.query.slice(0, -1);
+                else
+                    this.searching = false;
                 this.index = 0;
-                break;
-            case "ctrl+u":
+            }
+            else if (key === "ctrl+u") {
                 this.query = "";
                 this.index = 0;
-                break;
-            default:
-                if (data.length >= 1 && !data.startsWith("\x1b") && data >= " ") {
-                    this.query += data;
+            }
+            else if (data.length >= 1 && !data.startsWith("\x1b") && data >= " ") {
+                this.query += data;
+                this.index = 0;
+            }
+        }
+        else {
+            switch (data) {
+                case "j":
+                    move(1);
+                    break;
+                case "k":
+                    move(-1);
+                    break;
+                case "g":
                     this.index = 0;
-                }
+                    break;
+                case "G":
+                    this.index = Math.max(0, items.length - 1);
+                    break;
+                case "/":
+                    this.searching = true;
+                    break;
+                case "q":
+                    return this.onDone(null);
+                default:
+                    if (key === "escape") {
+                        if (this.query) {
+                            this.query = ""; // first Esc drops the filter, the next one closes
+                            this.index = 0;
+                        }
+                        else
+                            return this.onDone(null);
+                    }
+            }
         }
         if (this.index < this.scroll)
             this.scroll = this.index;
@@ -272,7 +301,14 @@ export class ChoicePicker {
         const items = this.filtered();
         const title = ` ${this.title} `;
         const lines = [border(I.tl + I.h) + P.on("FloatTitle", bg) + title + RESET + border(I.h.repeat(Math.max(0, inner - 1 - visibleWidth(title))) + I.tr)];
-        lines.push(row(P.on("Title", bg) + ` ${I.prompt} ` + RESET + P.on("NormalFloat", bg) + this.query + P.on("PmenuSel", undefined) + " " + RESET, visibleWidth(this.query) + 4));
+        if (this.searching) {
+            lines.push(row(P.on("Title", bg) + ` ${I.prompt} ` + RESET + P.on("NormalFloat", bg) + this.query + P.on("PmenuSel", undefined) + " " + RESET, visibleWidth(this.query) + 4));
+        }
+        else {
+            const hint = this.query ? `/${this.query}` : `/ to search${this.custom ? " or type any name" : ""}`;
+            const text = truncateToWidth(hint, Math.max(0, inner - 4), "…");
+            lines.push(row(P.on("Comment", bg) + ` ${I.prompt} ${text}` + RESET, visibleWidth(text) + 3));
+        }
         lines.push(border(I.lt + I.h.repeat(inner) + I.rt));
         const shown = items.slice(this.scroll, this.scroll + VISIBLE);
         for (let i = 0; i < VISIBLE; i++) {
@@ -294,7 +330,8 @@ export class ChoicePicker {
             const note = c.note ? truncateToWidth(`  ${c.note}`, Math.max(0, inner - 2 - visibleWidth(name)), "…") : "";
             lines.push(row(P.on(group, rowBg) + ` ${name}` + P.on("Comment", rowBg) + note + RESET, 1 + visibleWidth(name) + visibleWidth(note), rowBg));
         }
-        const count = ` ${items.length ? this.index + 1 : 0}/${items.length}${this.custom ? " · type any name" : ""} `;
+        const keys = this.searching ? "type to filter · Esc done" : "j/k move · Enter pick · q close";
+        const count = ` ${items.length ? this.index + 1 : 0}/${items.length} · ${keys} `;
         lines.push(border(I.bl + I.h.repeat(Math.max(0, inner - visibleWidth(count) - 1))) + P.on("Comment", bg) + count + RESET + border(I.h + I.br));
         return lines;
     }

package/dist/tree.js

@@ -9,6 +9,7 @@
  */
 export const TREE_GLYPHS = {
     unicode: { tee: "├─ ", last: "└─ ", pipe: "│  ", blank: "   " },
+    nerd: { tee: "├─ ", last: "└─ ", pipe: "│  ", blank: "   " },
     ascii: { tee: "|- ", last: "`- ", pipe: "|  ", blank: "   " },
 };
 function textOf(content) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vigent/cli",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "A vim-style terminal app for running coding agents side by side, each in its own git worktree. Built on pi.",
   "keywords": [
     "vim",