@v1nvn/statusline 0.30.8 → 0.30.9

package/README.md

@@ -1,8 +1,9 @@
 # @v1nvn/statusline
 
 The statusline package: the CLI that writes the two settings keys painting
-Claude Code's status line and agent panel, and the renderer those keys spawn —
-`dist/render.mjs`, synced into the plugin data dir and run with `node`. Pure
+Claude Code's status line and agent panel, plus the resolver those keys spawn
+and the renderer it imports — `dist/resolver.mjs` deployed into the plugin
+data dir, `dist/render.mjs` resolved from the installed plugin. Pure
 TypeScript, zero bash.
 
 User-facing docs: [root README § statusline](../../README.md#statusline).
@@ -22,7 +23,7 @@ offers the picker in chat, and writes the pick.
 In a terminal outside Claude Code — the wizard, the terminal guide:
 
 ```sh
-npx -y @v1nvn/statusline@0.30.8 configure
+npx -y @v1nvn/statusline@0.30.9 configure
 ```
 
 Pass one stacks the five theme bars: `j/k` focus · `w` width · enter picks.
@@ -35,31 +36,35 @@ One CLI, both ways: `/lab` inside a session runs these same commands; `npx`
 runs them in a terminal. Every subcommand takes `--home <dir>` to operate on
 another home instead of `$HOME`.
 
-| Command     | Does                                                                                                                                                                                                                                                                                                                                                     |
-| ----------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `configure` | the sole writer — writes both settings keys and syncs the bundled renderer into the data dir. Bare on a TTY: the wizard. With flags: `--theme <name>` (quiet, lean, classic, rich, custom) is the base design, item flags override it, `--layout` overrides its layout; a layout item nothing picks is an error naming it; a foreign key needs `--force` |
-| `preview`   | render the candidate bar and panel row through the same resolver the keys paint with, writing nothing; `--plain` strips the color escapes so glyphs survive chat                                                                                                                                                                                         |
-| `catalog`   | the themes block (`*` marks the theme the key names) then one line per item, `*` marking the resolved variant; `--themes` cuts to the block                                                                                                                                                                                                              |
-| `status`    | one row per fact — node, the data-dir renderer, both keys, the theme the key names, backup, captures — plus a verdict; exit 0 healthy, 1 needs action, every action row names its fix                                                                                                                                                                    |
-| `restore`   | both keys back to their pre-lab values from `backup.json`, then deletes the lab data — `--dry-run` prints the plan; `--force` splices over a key changed after the takeover                                                                                                                                                                              |
+| Command     | Does                                                                                                                                                                                                                                                                                                                                                       |
+| ----------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `configure` | the sole writer — writes both settings keys and deploys the bundled resolver into the data dir. Bare on a TTY: the wizard. With flags: `--theme <name>` (quiet, lean, classic, rich, custom) is the base design, item flags override it, `--layout` overrides its layout; a layout item nothing picks is an error naming it; a foreign key needs `--force` |
+| `preview`   | render the candidate bar and panel row through the same theme resolution the keys paint with, writing nothing; `--plain` strips the color escapes so glyphs survive chat                                                                                                                                                                                   |
+| `catalog`   | the themes block (`*` marks the theme the key names) then one line per item, `*` marking the resolved variant; `--themes` cuts to the block                                                                                                                                                                                                                |
+| `status`    | one row per fact — node, the renderer the install record resolves, both keys, the theme the key names, backup, captures — plus a verdict; exit 0 healthy, 1 needs action, every action row names its fix                                                                                                                                                   |
+| `restore`   | both keys back to their pre-lab values from `backup.json`, then deletes the lab data — `--dry-run` prints the plan; `--force` splices over a key changed after the takeover                                                                                                                                                                                |
 
 ```sh
-npx -y @v1nvn/statusline@0.30.8 preview --theme rich --plain          # chat-safe sketch, nothing written
-npx -y @v1nvn/statusline@0.30.8 configure --theme rich                 # the write — live on the next paint
-npx -y @v1nvn/statusline@0.30.8 configure --theme rich --bar percent   # one swap on top of the theme
-npx -y @v1nvn/statusline@0.30.8 catalog --themes
-npx -y @v1nvn/statusline@0.30.8 status
-npx -y @v1nvn/statusline@0.30.8 restore
+npx -y @v1nvn/statusline@0.30.9 preview --theme rich --plain          # chat-safe sketch, nothing written
+npx -y @v1nvn/statusline@0.30.9 configure --theme rich                 # the write — live on the next paint
+npx -y @v1nvn/statusline@0.30.9 configure --theme rich --bar percent   # one swap on top of the theme
+npx -y @v1nvn/statusline@0.30.9 catalog --themes
+npx -y @v1nvn/statusline@0.30.9 status
+npx -y @v1nvn/statusline@0.30.9 restore
 ```
 
 ## Develop
 
 ```sh
-yarn workspace @v1nvn/statusline build    # vite → dist/ (index.js + render.mjs)
+yarn workspace @v1nvn/statusline build    # vite → dist/ (index.js + render.mjs + resolver.mjs)
 yarn workspace @v1nvn/statusline test     # vitest
-yarn lint && yarn typecheck                   # from the repo root
+yarn lint && yarn typecheck               # from the repo root
+yarn build                                # root — every package, then syncs the plugin artifact
 ```
 
+`plugins/statusline/render.mjs` is a committed build artifact: the root
+`yarn build` copies `dist/render.mjs` there, and CI drift-gates the copy.
+
 Node ≥ 22. One workspace dep: `@v1nvn/agentic-core` (usage/exit helpers).
 
 ## Modules
@@ -78,8 +83,10 @@ Node ≥ 22. One workspace dep: `@v1nvn/agentic-core` (usage/exit helpers).
 | `src/wizard.ts` · `src/wizard-tui.ts`  | the terminal wizard — theme pass, then refinement of the pick's overrides                                    |
 | `src/payloads.ts` · `src/demo-repo.ts` | preview plumbing — fixtures anchored to the moment, in-process renders; demo git repo                        |
 | `src/render/entry.ts`                  | the `render.mjs` entry the keys spawn — argv to line or panel, both capture tees                             |
+| `src/render/resolver.ts`               | the deployed entry the keys spawn — resolves the install record, imports its render.mjs                      |
+| `src/render/install-record.ts`         | `resolveInstall` — the install record, newest usable entry wins                                              |
 | `src/render/argv.ts`                   | the renderer's argv grammar — `node:util` parseArgs, never commander                                         |
-| `src/render/theme.ts`                  | `resolvePaint` — the one theme resolver, shared by paint and display                                         |
+| `src/render/theme.ts`                  | `resolvePaint` — the one theme resolution, shared by paint and display                                       |
 | `src/render/engine.ts`                 | the line engine — compose, `vlen`, the fit ladder                                                            |
 | `src/render/items.ts`                  | the item registry — 16 items, defaults, rungs, `DEFAULT_LAYOUT`                                              |
 | `src/render/segments.ts`               | the per-item segment renderers                                                                               |
@@ -93,27 +100,29 @@ Node ≥ 22. One workspace dep: `@v1nvn/agentic-core` (usage/exit helpers).
 
 ## Contracts
 
-- `configure` is the sole writer: one run writes both keys and syncs the
-  bundled `render.mjs` into the data dir — its only other write is
+- `configure` is the sole writer: one run writes both keys and deploys the
+  bundled resolver as the data-dir `render.mjs` — its only other write is
   `backup.json`. `preview`, `catalog`, and `status` write nothing;
   `captures/` is the renderer's paint-time tee, not a CLI write.
 - The key value is one direct data-dir command:
   `node "$HOME/.claude/plugins/data/statusline-agentic/render.mjs" --theme=lean --bar=gauge || true`
-  — no glob resolver, no plugin-cache coupling; the panel key adds the `panel`
+  — the data-dir file is a resolver: it reads Claude Code's install record
+  (`installed_plugins.json`) and imports the newest installed plugin's
+  `render.mjs` with argv and stdin intact; the panel key adds the `panel`
   positional. Key spellings are pinned byte-exact by tests.
 - Decisions ride argv: `--theme` first, then one `--<item>=<alt>` per pick
   that differs from the theme's own, `--layout` only when passed. Ambient
   state stays env — `NO_COLOR`, `COLUMNS`, `HOME`.
 - The renderer resolves the theme at paint: item flags beat it, `--layout`
-  beats its layout — one resolver, no second path. `catalog` stars through
-  it, `preview` and the wizard render through it in-process, and `status`
-  reads the theme name straight from the key.
+  beats its layout — one resolution path, no second one. `catalog` stars
+  through it, `preview` and the wizard render through it in-process, and
+  `status` reads the theme name straight from the key.
 - The theme name rides the key: `status` and `catalog` read it straight from
   the key, swaps appended — `theme: lean +bar=gauge` — so a swap keeps the
   name.
-- The renderer bundle is dependency-free (node built-ins only) and parses its
-  own argv — never commander, never `@v1nvn/agentic-core` — so any node ≥ 18
-  the host has paints.
+- The render bundles are dependency-free (node built-ins only) and parse
+  their own argv — never commander, never `@v1nvn/agentic-core` — so any
+  node ≥ 18 the host has paints.
 - One splice home: the settings.json span primitives live in `configure.ts`;
   `restore` imports them.
 - `restore` never runs the renderer — it works uninstalled, deleting

package/dist/index.js

@@ -1,11 +1,10 @@
 #!/usr/bin/env node
 import { existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, renameSync, rmSync, rmdirSync, statSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
-import { delimiter, dirname, join, sep } from "node:path";
+import { basename, delimiter, dirname, join, sep } from "node:path";
 import { execFileSync, spawnSync } from "node:child_process";
 import { Command } from "commander";
 import { fileURLToPath } from "node:url";
-import { createHash } from "node:crypto";
 //#region ../core/dist/index.js
 function parseQuietly(program, args, recover) {
 	try {
@@ -1332,7 +1331,7 @@ function catalog(options) {
 //#region src/cli.ts
 var VERSION = {
 	name: "@v1nvn/statusline",
-	version: "0.30.8",
+	version: "0.30.9",
 	description: "Browse statusline variants and configure the live status line and agent panel — the statusline CLI behind the statusline plugin.",
 	type: "module",
 	bin: "dist/index.js",
@@ -1467,11 +1466,10 @@ function parseArgs(args) {
 		...typeof options.plain === "boolean" ? { plain: options.plain } : {}
 	};
 }
-//#endregion
-//#region src/configure.ts
-var BUNDLED_RENDERER = fileURLToPath(new URL("../dist/render.mjs", import.meta.url));
-function syncRenderer(home) {
-	const source = readFileSync(BUNDLED_RENDERER);
+fileURLToPath(new URL("../dist/render.mjs", import.meta.url));
+var BUNDLED_RESOLVER = fileURLToPath(new URL("../dist/resolver.mjs", import.meta.url));
+function syncResolver(home) {
+	const source = readFileSync(BUNDLED_RESOLVER);
 	const dest = renderMjsPath(home);
 	if (existsSync(dest) && readFileSync(dest).equals(source)) return;
 	mkdirSync(dirname(dest), { recursive: true });
@@ -1480,7 +1478,7 @@ function syncRenderer(home) {
 	renameSync(tmp, dest);
 }
 var SETTINGS_KEYS = ["statusLine", "subagentStatusLine"];
-function isObject(value) {
+function isObject$1(value) {
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function readOrNull(file) {
@@ -1498,11 +1496,11 @@ function parseSettings(file, raw) {
 	} catch (e) {
 		throw new Error(`${file} is not valid JSON`, { cause: e });
 	}
-	if (!isObject(parsed)) throw new Error(`${file} does not hold a settings object`);
+	if (!isObject$1(parsed)) throw new Error(`${file} does not hold a settings object`);
 	return parsed;
 }
 function memberCommand(value) {
-	if (!isObject(value) || value.type !== "command") return null;
+	if (!isObject$1(value) || value.type !== "command") return null;
 	return typeof value.command === "string" ? value.command : null;
 }
 function isOurMember(key, value) {
@@ -1722,7 +1720,7 @@ function configure(options) {
 	}, options.force ?? false);
 	if (plan.adds.length > 0 || plan.repoints.length > 0) writeBackupIfAbsent(options.home, plan);
 	commitSettings(plan);
-	syncRenderer(options.home);
+	syncResolver(options.home);
 }
 //#endregion
 //#region src/demo-repo.ts
@@ -2031,7 +2029,7 @@ var PANEL_STEP_S = 300;
 function anchoredP1(repoDir, now) {
 	const payload = JSON.parse(readFileSync(join(PAYLOADS_DIR, "p1.json"), "utf8"));
 	const cache = payload.prompt_cache;
-	if (isObject(cache)) {
+	if (isObject$1(cache)) {
 		if (cache.warm === true) {
 			cache.expires_at = now + P1_WARM_IN;
 			cache.last_miss_at = now + P1_WARM_IN - 3900;
@@ -2041,9 +2039,9 @@ function anchoredP1(repoDir, now) {
 		}
 	}
 	const limits = payload.rate_limits;
-	if (isObject(limits)) for (const [limitKey, offset] of Object.entries(P1_RESETS_IN)) {
+	if (isObject$1(limits)) for (const [limitKey, offset] of Object.entries(P1_RESETS_IN)) {
 		const limit = limits[limitKey];
-		if (isObject(limit)) limit.resets_at = now + offset;
+		if (isObject$1(limit)) limit.resets_at = now + offset;
 	}
 	payload.workspace.current_dir = repoDir;
 	return `${JSON.stringify(payload, null, 2)}\n`;
@@ -2154,7 +2152,7 @@ function readBackup(home) {
 	} catch (e) {
 		throw new Error(`${file} is not valid JSON`, { cause: e });
 	}
-	if (!isObject(parsed) || typeof parsed.createdFile !== "boolean" || !isObject(parsed.keys)) throw new Error(`${file} is not a lab backup`);
+	if (!isObject$1(parsed) || typeof parsed.createdFile !== "boolean" || !isObject$1(parsed.keys)) throw new Error(`${file} is not a lab backup`);
 	const keys = {};
 	for (const key of SETTINGS_KEYS) {
 		const saved = parsed.keys[key];
@@ -2263,6 +2261,60 @@ function restore(options) {
 	};
 }
 //#endregion
+//#region src/render/install-record.ts
+var RECORD_FILE = join(".claude", "plugins", "installed_plugins.json");
+var UNREADABLE = "installed_plugins.json unreadable";
+var NONE_USABLE = "no statusline@agentic install with a render.mjs";
+function isObject(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function ourEntries(home) {
+	let raw;
+	try {
+		raw = readFileSync(join(home, RECORD_FILE), "utf8");
+	} catch {
+		return null;
+	}
+	let parsed;
+	try {
+		parsed = JSON.parse(raw);
+	} catch {
+		return null;
+	}
+	const plugins = isObject(parsed) ? parsed.plugins : void 0;
+	const ours = isObject(plugins) ? plugins["statusline@agentic"] : null;
+	return Array.isArray(ours) ? ours : ours === void 0 ? [] : null;
+}
+function stamp(value) {
+	const ms = typeof value === "string" ? Date.parse(value) : NaN;
+	return Number.isNaN(ms) ? 0 : ms;
+}
+function isNewer(candidate, incumbent) {
+	const updated = stamp(candidate.lastUpdated) - stamp(incumbent.lastUpdated);
+	return updated > 0 || updated === 0 && stamp(candidate.installedAt) > stamp(incumbent.installedAt);
+}
+function usable(value) {
+	return isObject(value) && typeof value.installPath === "string" && existsSync(join(value.installPath, "render.mjs"));
+}
+function resolveInstall(home) {
+	const entries = ourEntries(home);
+	if (entries === null) return {
+		kind: "unresolved",
+		reason: UNREADABLE
+	};
+	const installed = entries.filter(usable);
+	if (installed.length === 0) return {
+		kind: "unresolved",
+		reason: NONE_USABLE
+	};
+	const best = installed.reduce((incumbent, candidate) => isNewer(candidate, incumbent) ? candidate : incumbent);
+	return {
+		installPath: best.installPath,
+		kind: "resolved",
+		version: typeof best.version === "string" ? best.version : basename(best.installPath)
+	};
+}
+//#endregion
 //#region src/status.ts
 function keyState(key, value) {
 	if (value === void 0) return { kind: "absent" };
@@ -2319,33 +2371,25 @@ function driftFindings(config) {
 function nodeOnPath(pathVar) {
 	return pathVar.split(delimiter).filter((dir) => dir !== "").map((dir) => join(dir, "node")).find(existsSync) ?? null;
 }
-function rendererHash(bytes) {
-	return createHash("sha256").update(bytes).digest("hex").slice(0, 12);
-}
 function rendererState(home) {
-	if (!existsSync(BUNDLED_RENDERER)) return { kind: "no-bundle" };
-	const cli = readFileSync(BUNDLED_RENDERER);
-	const dataFile = renderMjsPath(home);
-	if (!existsSync(dataFile)) return { kind: "missing" };
-	const hash = rendererHash(readFileSync(dataFile));
-	return hash === rendererHash(cli) ? {
-		hash,
-		kind: "current"
+	if (!existsSync(renderMjsPath(home))) return { kind: "missing" };
+	const record = resolveInstall(home);
+	return record.kind === "resolved" ? {
+		kind: "resolves",
+		version: record.version
 	} : {
-		cli: rendererHash(cli),
-		data: hash,
-		kind: "stale"
+		kind: "unresolved",
+		reason: record.reason
 	};
 }
-function rendererRow(state) {
-	if (state.kind === "current") return `renderer: current — ${state.hash}`;
-	if (state.kind === "stale") return `renderer: stale — data ${state.data}, this CLI ${state.cli} — fix: rerun configure --force --theme classic`;
-	if (state.kind === "no-bundle") return "renderer: this CLI ships no render.mjs — fix: rerun /lab to refresh the CLI";
-	return "renderer: missing — fix: rerun configure --force --theme classic";
+function rendererRow(state, theme) {
+	if (state.kind === "resolves") return `renderer: resolves → ${state.version}`;
+	if (state.kind === "missing") return `renderer: missing — fix: rerun configure --force --theme ${theme}`;
+	return `renderer: unresolved — ${state.reason} — fix: claude plugin install statusline@agentic`;
 }
-function configRow(findings) {
+function configRow(findings, theme) {
 	if (findings.length === 0) return "config: no drift";
-	return `config: drift — ${findings.map(findingText).join(", ")} — fix: rerun configure --theme classic`;
+	return `config: drift — ${findings.map(findingText).join(", ")} — fix: rerun configure --theme ${theme}`;
 }
 function backupRow(home) {
 	let backup;
@@ -2386,20 +2430,21 @@ function status(options) {
 	const main = keyState("statusLine", members.statusLine);
 	const subagent = keyState("subagentStatusLine", members.subagentStatusLine);
 	const config = readKeyConfig(options.home);
+	const theme = config.theme ?? "classic";
 	const panelConfig = parsePanelCommand(memberCommand(members.subagentStatusLine));
 	const findings = main.kind === "ours" ? driftFindings(config) : [];
 	const node = nodeOnPath(options.path ?? process.env.PATH ?? "");
 	const renderer = rendererState(options.home);
 	const rows = [
 		node === null ? "node: missing — fix: install node ≥ 18 from nodejs.org, then restart Claude Code" : `node: on PATH (${node})`,
-		rendererRow(renderer),
+		rendererRow(renderer, theme),
 		keyRow("statusLine", main, configDetail(config)),
 		keyRow("subagentStatusLine", subagent, panelDetail(panelConfig)),
-		...main.kind === "ours" ? [configRow(findings), ...themeRow(config)] : [],
+		...main.kind === "ours" ? [configRow(findings, theme), ...themeRow(config)] : [],
 		backupRow(options.home),
 		capturesRow(options.home)
 	];
-	const healthy = node !== null && renderer.kind === "current" && main.kind === "ours" && subagent.kind === "ours" && findings.length === 0;
+	const healthy = node !== null && renderer.kind === "resolves" && main.kind === "ours" && subagent.kind === "ours" && findings.length === 0;
 	return {
 		healthy,
 		rows: [...rows, healthy ? "healthy" : "unhealthy"]