@vigent/cli 0.3.1 → 0.3.2

package/README.md

@@ -4,7 +4,7 @@ A vim-style, lightweight terminal app for running several coding agents at once,
 
 **Website:** [vigent.farming-labs.dev](https://vigent.farming-labs.dev) · **Docs:** [vigent.farming-labs.dev/docs](https://vigent.farming-labs.dev/docs)
 
-![vigent running a Claude Code agent in its own worktree, with the sessions and engines sidebars](docs/screenshots/showcase.png)
+![vigent running a Claude Code agent in its own worktree, with the sessions and engines sidebars](https://vigent.farming-labs.dev/showcase.png)
 
 ## Install
 
@@ -97,7 +97,7 @@ Copies go to the system clipboard through the terminal (OSC 52), so they work ov
 
 ## Engines: pi, Claude Code, Codex, OpenCode
 
-pi runs inside vigent. Claude Code, Codex and OpenCode are the CLIs you may already use: vigent runs them as installed, in the agent's worktree, so each one uses its own login and settings. vigent never reads their credentials; it only runs their version and sign-in status commands to show what's connected.
+pi runs inside vigent. Claude Code, Codex and OpenCode are the CLIs you may already use: vigent runs them as installed, in the agent's worktree, so each one uses its own login and settings. vigent never reads their credentials; it only runs their version and sign-in status commands to show what's connected. If `ANTHROPIC_API_KEY` is set and Claude Code is also signed in with a Claude account, vigent runs Claude Code without that variable, so it uses your account (a key that isn't scoped to a workspace, or is out of credit, would otherwise fail every request). `:checkhealth` says so: *signed in (Claude account; ANTHROPIC_API_KEY left out)*.
 
 ```vim
 :new fix the race --engine codex            " this agent runs Codex

package/dist/app.js

@@ -64,6 +64,7 @@ const ICONS = {
         here: "●",
         unread: "◆",
         serve: "⇄ ",
+        light: "✦",
         ok: "●",
         warn: "◐",
         off: "○",
@@ -87,6 +88,7 @@ const ICONS = {
         here: NERD.circle,
         unread: NERD.bell,
         serve: "\uf10b ",
+        light: "\uf0e7",
         ok: NERD.check,
         warn: NERD.warning,
         off: NERD.circleO,
@@ -110,6 +112,7 @@ const ICONS = {
         here: "*",
         unread: "!",
         serve: "~ ",
+        light: "*",
         ok: "+",
         warn: "~",
         off: "-",
@@ -1478,7 +1481,7 @@ export class App {
                 this.refreshStorage();
             const by = s.engine !== "pi" ? ` · ${ENGINE_NAMES[s.engine]}` : "";
             if (wt?.path) {
-                const how = wt.riftri ? ` · riftri ${wt.riftri}` : wt.riftriSkipped ? " · full copy (riftri declined: :checkhealth)" : "";
+                const how = wt.riftri ? " · lightweight copy" : wt.riftriSkipped ? " · full copy (:checkhealth says why)" : "";
                 this.setMessage(`'${name}'${by} on ${wt.branch} in ${this.shortPath(wt.path)}${wt.base ? ` (from ${wt.base})` : ""}${how}`, wt.riftriSkipped ? "WarningMsg" : "ModeMsg");
             }
             else if (wt) {
@@ -2549,7 +2552,7 @@ export class App {
         const s = this.focusedSession;
         const left = s ? ` ${this.icons.open_agent} ${s.name}` : ` ${this.icons.open_agent} [no agent]`;
         const model = s ? `  ${s.engine !== "pi" && s.model !== ENGINE_NAMES[s.engine] ? `${ENGINE_NAMES[s.engine]} · ` : ""}${s.model}${s.effort ? ` · ${s.effort}` : ""}` : "";
-        const where = s?.worktree?.path ? `${this.shortPath(s.worktree.path)}${s.worktree.riftri ? " · riftri" : ""}` : s ? "this checkout" : "";
+        const where = s?.worktree?.path ? `${this.shortPath(s.worktree.path)}${s.worktree.riftri ? ` ${this.icons.light}` : ""}` : s ? "this checkout" : "";
         const ext = s && "extensionStatus" in s ? [...s.extensionStatus.values()].join(" · ") : "";
         const status = (s?.state === "paused" ? "  paused" : s?.queue.length ? `  ${this.icons.queued}${s.queue.length} queued` : "") + (ext ? `  ${ext}` : "");
         // the path gives way first (from its start: the end names the worktree), always two spaces before it

package/dist/cli-engines.js

@@ -321,7 +321,7 @@ export class CliSession extends Session {
         try {
             child = spawn(this.opts.bin ?? this.adapter.bin, args, {
                 cwd: this.cwd,
-                env: this.opts.env ?? process.env,
+                env: typeof this.opts.env === "function" ? this.opts.env() : (this.opts.env ?? process.env),
                 stdio: ["ignore", "pipe", "pipe"],
             });
         }

package/dist/cli.js

@@ -9,7 +9,7 @@ import { App } from "./app.js";
 import { FOCUS_REPORTING_OFF, FOCUS_REPORTING_ON } from "./notify.js";
 import { staleBuild, VERSION_TEXT } from "./version.js";
 import { CliSession } from "./cli-engines.js";
-import { defaultEngine, detectEngines, ENGINE_BINS, isEngineId, onPath, piConnected, quickEngines } from "./engines.js";
+import { defaultEngine, detectEngines, ENGINE_BINS, isEngineId, onPath, piConnected, quickEngines, engineEnv } from "./engines.js";
 import { CONFIG_TEMPLATE, configPath, loadConfig } from "./config.js";
 import { createDemoSessions } from "./demo.js";
 import { buildKeymap, KEY_MODES } from "./keys.js";
@@ -306,6 +306,8 @@ async function main() {
         resumeId,
         effort,
         extraArgs: config.engines[engine]?.args,
+        // e.g. Claude Code without ANTHROPIC_API_KEY when it has a Claude account (see detectClaude)
+        env: () => engineEnv(app.engines?.find((e) => e.id === engine)),
         onResumeId: (id) => {
             if (!wt?.path)
                 return;

package/dist/engines.js

@@ -12,6 +12,15 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { PI_INSTALL, piInstalled } from "./pi-sdk.js";
 export const ENGINE_IDS = ["pi", "claude", "codex", "opencode"];
+/** The environment to run an engine's CLI with: everything but what detection said to leave out. */
+export function engineEnv(engine, env = process.env) {
+    if (!engine?.dropEnv?.length)
+        return env;
+    const out = { ...env };
+    for (const k of engine.dropEnv)
+        delete out[k];
+    return out;
+}
 export const ENGINE_NAMES = {
     pi: "pi",
     claude: "Claude Code",
@@ -127,8 +136,33 @@ async function detectClaude(env, timeoutMs) {
     try {
         const st = JSON.parse(s.stdout);
         if (st.loggedIn) {
-            const how = st.authMethod === "api_key" || st.apiKeySource ? "API key" : "Claude account";
-            return { ...base, installed: true, connected: true, version, detail: `signed in (${how})`, connect: undefined };
+            const usesKey = st.authMethod === "api_key" || !!st.apiKeySource;
+            // ANTHROPIC_API_KEY wins over a signed-in Claude account. When there is an account too,
+            // leave the key out, so Claude Code runs on the login you use it with (an unscoped or
+            // spent key otherwise fails every request, e.g. "not scoped to a workspace")
+            if (usesKey && env.ANTHROPIC_API_KEY) {
+                const without = { ...env };
+                delete without.ANTHROPIC_API_KEY;
+                const account = await run("claude", ["auth", "status", "--json"], timeoutMs, without);
+                try {
+                    const a = JSON.parse(account.stdout);
+                    if (a.loggedIn && a.authMethod !== "api_key" && !a.apiKeySource) {
+                        return {
+                            ...base,
+                            installed: true,
+                            connected: true,
+                            version,
+                            detail: "signed in (Claude account; ANTHROPIC_API_KEY left out)",
+                            connect: undefined,
+                            dropEnv: ["ANTHROPIC_API_KEY"],
+                        };
+                    }
+                }
+                catch {
+                    // no account to fall back to: the key it is
+                }
+            }
+            return { ...base, installed: true, connected: true, version, detail: `signed in (${usesKey ? "API key" : "Claude account"})`, connect: undefined };
         }
         return { ...base, installed: true, connected: false, version, detail: "not signed in" };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vigent/cli",
-  "version": "0.3.1",
+  "version": "0.3.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",