@vigent/cli 0.2.2 → 0.2.3

package/README.md

@@ -82,7 +82,7 @@ pi runs inside vigent. Claude Code, Codex and OpenCode are the CLIs you may alre
 :checkhealth                                " installed? signed in? how to connect the rest
 ```
 
-The sidebar's ENGINES block shows each one: `●` signed in, `◐` installed but not signed in (with the command to sign in, like `codex login`), `○` not installed. Without `--engine`, new agents use `engine` from the config. Its default, `"auto"`, picks pi if it has an API key, otherwise the first signed-in CLI. A CLI agent survives a restart too: vigent saves the CLI's conversation id and continues that conversation. Its earlier messages stay in the CLI's own history.
+The sidebar's ENGINES block shows each one: `●` signed in, `◐` installed but not signed in (with the command to sign in, like `codex login`), `○` not installed. Without `--engine`, new agents use `engine` from the config. Its default, `"auto"`, picks pi if it has an API key, otherwise the first signed-in CLI. **`:engine`** (`<Space>E`, or `E` on the dashboard) switches it while vigent runs: a menu lists auto, pi, Claude Code, Codex and OpenCode with which are ready, and `:engine claude` sets it directly. Agents already open keep their engine, since their conversation lives there; `:new <task>` starts one on the new engine. A CLI agent survives a restart too: vigent saves the CLI's conversation id and continues that conversation. Its earlier messages stay in the CLI's own history.
 
 ![:checkhealth with Claude Code signed in and Codex waiting for codex login](https://raw.githubusercontent.com/farming-labs/vigent/main/docs/screenshots/checkhealth.png)
 
@@ -206,7 +206,7 @@ vigent --theme nvim                 # follow your Neovim: the colorscheme your c
 
 **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):
+Inside vigent, `:colorscheme` (`<Space>t`) opens a picker with live preview: `j`/`k` move and preview, Enter keeps it, `q` or Esc puts the old one back, and `/` searches. `: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
 theme = "tokyonight"

package/dist/app.js

@@ -17,7 +17,7 @@ import * as fs from "node:fs";
 import { setDetached } from "./agents.js";
 import { VERSION_TEXT } from "./version.js";
 import { backendName, formatBytes, riftriBackends, RIFTRI_INSTALL } from "./riftri.js";
-import { ENGINE_NAMES, isEngineId } from "./engines.js";
+import { defaultEngine as defaultEngineFor, ENGINE_NAMES, isEngineId } from "./engines.js";
 import { copyToClipboard } from "./clipboard.js";
 import { splitView, unifiedView } from "./diffview.js";
 import { TREE_GLYPHS } from "./tree.js";
@@ -756,6 +756,13 @@ export class App {
                 else
                     this.openModelPicker();
                 return;
+            case "engine":
+            case "eng":
+                if (arg)
+                    this.chooseEngine(arg);
+                else
+                    this.openEnginePicker();
+                return;
             case "effort":
             case "think":
                 if (arg)
@@ -996,6 +1003,37 @@ export class App {
             this.tui.requestRender();
         });
     }
+    /** `:engine`: which engine new agents run on, with what's ready on this machine. */
+    openEnginePicker() {
+        const ids = ["auto", "pi", "claude", "codex", "opencode"];
+        const items = ids.map((id) => ({ value: id, note: this.engineNote(id) }));
+        this.openChoices("Engine for new agents", items, this.preferredEngine, false, (v) => this.chooseEngine(v));
+    }
+    /** "Claude Code · ready", "Codex · not signed in: codex login", "auto: … (now Claude Code)" */
+    engineNote(id) {
+        if (id === "auto")
+            return `pick for me (now ${ENGINE_NAMES[defaultEngineFor(this.engines)]})`;
+        const e = this.engines?.find((x) => x.id === id);
+        if (!e)
+            return ENGINE_NAMES[id];
+        const status = e.connected ? "ready" : !e.installed ? "not installed" : e.connect ? `not signed in: ${e.connect}` : "not signed in";
+        return `${ENGINE_NAMES[id]} · ${status}`;
+    }
+    /** `:engine <name>`: new agents run on it. Agents already open keep theirs (their conversation lives there). */
+    chooseEngine(value) {
+        if (value !== "auto" && !isEngineId(value)) {
+            this.setMessage("engines: auto, pi, claude, codex, opencode", "ErrorMsg");
+            return;
+        }
+        this.preferredEngine = value;
+        const now = this.defaultEngine();
+        const e = this.engines?.find((x) => x.id === now);
+        const warn = e && !e.connected ? ` (${e.installed ? `not signed in${e.connect ? `: run ${e.connect}` : ""}` : "not installed"})` : "";
+        const s = this.focusedSession;
+        const open = s && s.engine !== now ? ` · '${s.name}' stays on ${ENGINE_NAMES[s.engine]}; :new <task> starts one on ${ENGINE_NAMES[now]}` : "";
+        this.setMessage(`new agents run on ${ENGINE_NAMES[now]}${value === "auto" ? " (auto)" : ""}${warn}${open} · :settings, w keeps it`, warn ? "WarningMsg" : "ModeMsg");
+        this.repaint();
+    }
     /** `:model`: pick from what the engine offers, or type any name. */
     openModelPicker(t = this.modelTarget()) {
         const current = t.session
@@ -1089,7 +1127,7 @@ export class App {
                 change: (d) => {
                     this.preferredEngine = cycle(["auto", "pi", "claude", "codex", "opencode"], this.preferredEngine, d);
                 },
-                hint: "auto: pi with an API key, else the first signed-in CLI · :checkhealth shows which are ready",
+                hint: "auto: pi with an API key, else the first signed-in CLI · :engine picks it from anywhere",
             },
             {
                 section: "Agents",
@@ -1974,6 +2012,9 @@ export class App {
             case "e":
                 this.openEffortPicker();
                 return true;
+            case "E":
+                this.openEnginePicker();
+                return true;
             case "c":
                 this.openHealth();
                 return true;
@@ -2442,6 +2483,7 @@ const EX_HELP = [
     [":checkhealth", "which engines are installed and signed in"],
     [":model [name]", "pick the agent's model (no agent: for new agents)"],
     [":effort [level]", "pick its reasoning effort: low … max (pi: thinking level)"],
+    [":engine [name]", "pick the engine new agents run on: auto, pi, claude, codex, opencode"],
     [":settings", "theme, look, engine, worktrees and keys in one place (w saves)"],
     [":w [file]", "save the transcript as Markdown"],
     [":worktrees", "list agent worktrees"],
@@ -2520,6 +2562,7 @@ const DASHBOARD = [
     ["s", "⚙", "Settings", NERD.gear],
     ["m", "◆", "Model", NERD.chip],
     ["e", "↯", "Effort", NERD.bolt],
+    ["E", "⚑", "Engine: pi, Claude Code, Codex, OpenCode", NERD.wrench],
     ["c", "✓", "Check engines", NERD.check],
     ["?", "⌘", "Keys", NERD.keyboard],
     ["q", "×", "Quit", NERD.power],

package/dist/keys.js

@@ -129,6 +129,7 @@ export const DEFAULT_KEYS = {
         "<leader>s": ":settings<CR>",
         "<leader>M": ":model<CR>",
         "<leader>e": ":effort<CR>",
+        "<leader>E": ":engine<CR>",
         ZZ: "app.quit",
         ZQ: "app.quit_force",
         q: "app.quit_hint",

package/dist/picker.js

@@ -12,6 +12,11 @@ export const PICKER_ICONS = {
     ascii: { tl: "+", tr: "+", bl: "+", br: "+", h: "-", v: "|", lt: "+", rt: "+", current: "*", prompt: ">" },
 };
 const VISIBLE = 14;
+/**
+ * `:colorscheme`, vim-style with live preview: `j`/`k` (↓/↑, Ctrl-n/p, Tab)
+ * move and preview, `g`/`G` jump, Enter keeps it, `q`/Esc puts the old one
+ * back. `/` starts a search: type to filter, Esc ends it.
+ */
 export class ThemePicker {
     painter;
     themes;
@@ -22,6 +27,8 @@ export class ThemePicker {
     requestRender;
     look;
     query = "";
+    /** typing goes to the search (after `/`) */
+    searching = false;
     index = 0;
     scroll = 0;
     constructor(painter, themes, current, icons, onPreview, onDone, requestRender, look = () => undefined) {
@@ -52,42 +59,63 @@ export class ThemePicker {
     }
     handleInput(data) {
         const key = parseKey(data) ?? "";
-        switch (key) {
-            case "escape":
-            case "ctrl+c":
-                this.onDone(null);
-                return;
-            case "enter":
-            case "return": {
-                const items = this.filtered();
-                this.onDone(items[this.index] ?? null);
-                return;
+        if (key === "ctrl+c")
+            return this.onDone(null);
+        if (key === "enter" || key === "return") {
+            this.onDone(this.filtered()[this.index] ?? null);
+            return;
+        }
+        if (["down", "tab", "ctrl+n", "ctrl+j"].includes(key))
+            this.move(1);
+        else if (["up", "shift+tab", "ctrl+p", "ctrl+k"].includes(key))
+            this.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);
+                    this.resetSelection();
+                }
+                else
+                    this.searching = false;
             }
-            case "down":
-            case "tab":
-            case "ctrl+n":
-            case "ctrl+j":
-                this.move(1);
-                break;
-            case "up":
-            case "shift+tab":
-            case "ctrl+p":
-            case "ctrl+k":
-                this.move(-1);
-                break;
-            case "backspace":
-                this.query = this.query.slice(0, -1);
-                this.resetSelection();
-                break;
-            case "ctrl+u":
+            else if (key === "ctrl+u") {
                 this.query = "";
                 this.resetSelection();
-                break;
-            default:
-                if (data.length >= 1 && !data.startsWith("\x1b") && data >= " ") {
-                    this.query += data;
-                    this.resetSelection();
-                }
+            }
+            else if (data.length >= 1 && !data.startsWith("\x1b") && data >= " ") {
+                this.query += data;
+                this.resetSelection();
+            }
+        }
+        else {
+            switch (data) {
+                case "j":
+                    this.move(1);
+                    break;
+                case "k":
+                    this.move(-1);
+                    break;
+                case "g":
+                    this.move(-this.index);
+                    break;
+                case "G":
+                    this.move(this.filtered().length - 1 - this.index);
+                    break;
+                case "/":
+                    this.searching = true;
+                    break;
+                case "q":
+                    return this.onDone(null);
+                default:
+                    if (key === "escape") {
+                        if (!this.query)
+                            return this.onDone(null);
+                        this.query = ""; // first Esc drops the filter, the next one closes
+                        this.resetSelection();
+                    }
+            }
         }
         this.requestRender();
     }
@@ -120,15 +148,22 @@ export class ThemePicker {
             border(I.v);
         const items = this.filtered();
         const title = " Colorschemes ";
-        const count = ` ${items.length === 0 ? 0 : this.index + 1}/${items.length} `;
+        const keys = this.searching ? "type to filter · Esc done" : "j/k move · Enter pick · q close";
+        const count = ` ${items.length === 0 ? 0 : this.index + 1}/${items.length} · ${keys} `;
         const top = border(I.tl + I.h) +
             P.on("FloatTitle", bg) +
             title +
             RESET +
             border(I.h.repeat(Math.max(0, inner - 1 - visibleWidth(title))) + I.tr);
         const lines = [top];
-        const prompt = `${I.prompt} ${this.query}`;
-        lines.push(row(P.on("Title", bg) + ` ${I.prompt} ` + RESET + P.on("NormalFloat", bg) + this.query + P.on("PmenuSel", undefined) + " " + RESET, visibleWidth(prompt) + 2));
+        if (this.searching) {
+            const prompt = `${I.prompt} ${this.query}`;
+            lines.push(row(P.on("Title", bg) + ` ${I.prompt} ` + RESET + P.on("NormalFloat", bg) + this.query + P.on("PmenuSel", undefined) + " " + RESET, visibleWidth(prompt) + 2));
+        }
+        else {
+            const hint = truncateToWidth(this.query ? `/${this.query}` : "/ to search", Math.max(0, inner - 4), "…");
+            lines.push(row(P.on("Comment", bg) + ` ${I.prompt} ${hint}` + RESET, visibleWidth(hint) + 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++) {

package/dist/session.js

@@ -272,13 +272,16 @@ export class PiSession extends Session {
         }
         session.subscribe((event) => this.onEvent(event));
     }
+    /** the run ended on a failed request (shown as an error, not as silence) */
+    failed = false;
     onEvent(event) {
         switch (event.type) {
             case "agent_start":
+                this.failed = false;
                 this.setState("running");
                 break;
             case "agent_end":
-                this.setState("idle");
+                this.setState(this.failed ? "error" : "idle");
                 this.refreshStat(0);
                 break;
             case "message_start": {
@@ -309,6 +312,12 @@ export class PiSession extends Session {
                         this.items.pop(); // a turn that only called tools
                     this.emit();
                 }
+                // a failed request ends the reply with an error instead of throwing: say so
+                const err = piError(event.message);
+                if (err) {
+                    this.failed = true;
+                    this.pushInfo(err);
+                }
                 break;
             }
             case "tool_execution_start": {
@@ -419,6 +428,9 @@ export function itemsFromMessages(messages) {
             }
             if (m.usage)
                 tokens += (m.usage.input ?? 0) + (m.usage.output ?? 0);
+            const err = piError(m);
+            if (err)
+                items.push({ kind: "info", text: err });
         }
         else if (m?.role === "toolResult") {
             const item = byCallId.get(m.toolCallId);
@@ -428,6 +440,18 @@ export function itemsFromMessages(messages) {
     }
     return { items, tokens };
 }
+/**
+ * The error of a reply whose request failed (pi ends it with stopReason
+ * "error" and an errorMessage), with a hint when the key or login was refused.
+ */
+export function piError(message) {
+    if (message?.role !== "assistant" || message.stopReason !== "error")
+        return undefined;
+    const text = String(message.errorMessage ?? "").trim() || "the request failed";
+    const auth = /\b(401|403)\b|auth|api[ _-]?key|unauthori[sz]ed|forbidden|credential|expired|login/i.test(text);
+    const hint = auth ? " · pi's API key or login was refused; :checkhealth shows the engines, and :new <task> --engine claude starts one on Claude Code" : "";
+    return `error: ${text}${hint}`;
+}
 function extractText(content) {
     if (typeof content === "string")
         return content;

package/package.json

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