@djolex999/vir-cli 0.7.1 → 0.8.0

package/dist/cli.js

@@ -5,7 +5,7 @@ import select from "@inquirer/select";
 import chalk from "chalk";
 import { Command } from "commander";
 import { createInterface } from "node:readline/promises";
-import { stdin, stdout, argv, exit } from "node:process";
+import { stdin, stdout, argv } from "node:process";
 import { existsSync, mkdirSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { basename, dirname, join } from "node:path";
@@ -21,7 +21,9 @@ import { parseSession } from "./pipeline/parser.js";
 import { scoreSession } from "./pipeline/filter.js";
 import { scrub } from "./pipeline/scrubber.js";
 import { filterToolCalls } from "./pipeline/toolCallFilter.js";
-import { Distiller } from "./pipeline/distiller.js";
+import { Distiller, normalizeModelName, resolveModelShorthand, } from "./pipeline/distiller.js";
+import { composeFromSources, estimateComposeCostTokens, gatherSources, } from "./pipeline/composer.js";
+import { computeCost } from "./cost/pricing.js";
 import { summarizeAll, summarizeProject } from "./pipeline/summarizer.js";
 import { embeddingForNote, isOllamaAvailable, } from "./search/embedder.js";
 import { search, vaultRoot } from "./search/retriever.js";
@@ -29,6 +31,8 @@ import { buildQueryResults, errorPayload } from "./output/json.js";
 import { synthesize } from "./search/synthesizer.js";
 import { runMcpServer } from "./mcp/server.js";
 import { runReview } from "./cli/review.js";
+import { runAction } from "./cli/runAction.js";
+import { runReconcile } from "./cli/reconcile.js";
 import { installToClaudeCode, isClaudeAvailable, isInstalled, uninstallFromClaudeCode, } from "./mcp/install.js";
 import { install as installDaemon, status as daemonStatus, uninstall as uninstallDaemon, } from "./daemon/index.js";
 import { StateDb } from "./state/db.js";
@@ -49,9 +53,9 @@ program
 program
     .command("init")
     .description("Interactive setup")
-    .action(async () => {
+    .action(runAction(async () => {
     await cmdInit();
-});
+}));
 program
     .command("run")
     .description("Run pipeline once")
@@ -62,7 +66,7 @@ program
     .option("--yes", "Skip the cost confirmation prompt")
     .option("--force-model <model>", "Override the distill model for this run only: haiku | sonnet")
     .option("--dry-run", "Estimate per-session cost after filtering, then exit before any LLM call")
-    .action(async (opts) => {
+    .action(runAction(async (opts) => {
     const cfg = loadConfig();
     const daemon = opts.daemon === true;
     const rewriteOnly = opts.rewriteOnly === true;
@@ -70,10 +74,11 @@ program
     const dryRun = opts.dryRun === true;
     if (opts.forceModel && !["haiku", "sonnet"].includes(opts.forceModel)) {
         console.error(chalk.red(`--force-model must be 'haiku' or 'sonnet', got '${opts.forceModel}'`));
-        exit(1);
+        process.exitCode = 1;
+        return;
     }
     const skipPrompt = opts.yes === true || daemon || rewriteOnly || articlesOnly || dryRun;
-    await runPipeline(cfg, {
+    const summary = await runPipeline(cfg, {
         full: opts.full,
         quiet: daemon,
         logToFile: daemon,
@@ -85,7 +90,13 @@ program
             ? undefined
             : async (newCount) => confirmCostIfNeeded(cfg, newCount),
     });
-});
+    // Surface per-session distill failures via a non-zero exit so external
+    // callers (and the user) don't get false "success" — the silent-success
+    // bug that hid Kie's 200-with-error responses pre-0.7.2.
+    if (summary.errored > 0 || summary.articlesErrored > 0) {
+        process.exitCode = 1;
+    }
+}));
 async function confirmCostIfNeeded(cfg, newCount) {
     if (newCount <= 20)
         return true;
@@ -108,7 +119,7 @@ program
     .option("--since <duration>", "Time window, e.g. 7d, 24h, 2w", "7d")
     .option("--by-session", "Show the full per-session distribution")
     .option("--top <n>", "How many top sessions to show (default 5)", "5")
-    .action((opts) => {
+    .action(runAction(async (opts) => {
     ui.header("cost");
     ui.blank();
     const since = opts.since ?? "7d";
@@ -118,7 +129,8 @@ program
     }
     catch {
         console.error(chalk.red(`invalid --since value: ${since}`));
-        exit(1);
+        process.exitCode = 1;
+        return;
     }
     const records = readCostLog(cutoffMs);
     if (records.length === 0) {
@@ -146,22 +158,24 @@ program
         const label = s.project ? `${s.project}/${id}` : id;
         ui.line(`  ${ui.dim(ui.BULLET)} ${ui.text(label.padEnd(42))} ${ui.dim(`${s.calls}×`)}  ${ui.warn(ui.formatUsd(s.cost))}`);
     }
-});
+}));
 program
     .command("calibrate <sessionId>")
     .description("Distill ONE session to stdout for A/B model comparison — never writes vault or DB")
     .option("--model <model>", "Distill model: haiku | sonnet", "sonnet")
-    .action(async (sessionId, opts) => {
+    .action(runAction(async (sessionId, opts) => {
     const cfg = loadConfig();
     const model = opts.model ?? "sonnet";
     if (!["haiku", "sonnet"].includes(model)) {
         console.error(chalk.red(`--model must be 'haiku' or 'sonnet', got '${model}'`));
-        exit(1);
+        process.exitCode = 1;
+        return;
     }
     const found = scanSessions(cfg.claudeProjectsDir).find((s) => basename(s.path, ".jsonl") === sessionId);
     if (!found) {
         console.error(chalk.red(`session not found under ${cfg.claudeProjectsDir}: ${sessionId}`));
-        exit(1);
+        process.exitCode = 1;
+        return;
     }
     // Same pipeline as production up to (but NOT including) writer.write / db.record.
     // classify always runs on Haiku (matches production); only distill varies.
@@ -190,23 +204,23 @@ program
     else {
         console.log(`\n## cost\n(no distill cost record found for ${sessionId})`);
     }
-});
+}));
 const schedule = program
     .command("schedule")
     .description("Manage the background daemon (launchd / systemd / cron)");
 schedule
     .command("install")
     .description("Install + start the scheduled daemon")
-    .action(async () => {
+    .action(runAction(async () => {
     const cfg = loadConfig();
     await installDaemon(cfg);
     const ds = await daemonStatus();
     console.log(chalk.green(`installed via ${ds.method}: ${ds.configPath ?? "(no path)"} (active=${ds.active})`));
-});
+}));
 schedule
     .command("uninstall")
     .description("Stop + remove the scheduled daemon")
-    .action(async () => {
+    .action(runAction(async () => {
     const before = await daemonStatus();
     await uninstallDaemon();
     if (before.installed) {
@@ -215,14 +229,14 @@ schedule
     else {
         console.log(chalk.yellow("no vir daemon found"));
     }
-});
+}));
 program
     .command("sync-claude [project]")
     .description("Update Vir blocks in CLAUDE.md files (global + per-project)")
     .option("--dry-run", "Show diff only, never write")
     .option("--force", "Apply without confirmation")
     .option("--global", "Only update ~/.claude/CLAUDE.md")
-    .action(async (projectArg, opts) => {
+    .action(runAction(async (projectArg, opts) => {
     const cfg = loadConfig();
     const db = new StateDb();
     try {
@@ -269,11 +283,11 @@ program
     finally {
         db.close();
     }
-});
+}));
 program
     .command("dedupe")
     .description("Interactive duplicate detection + merge")
-    .action(async () => {
+    .action(runAction(async () => {
     const cfg = loadConfig();
     const db = new StateDb();
     try {
@@ -339,14 +353,14 @@ program
     finally {
         db.close();
     }
-});
+}));
 program
     .command("lint")
     .description("Run orphan, staleness, and contradiction checks on the vault")
     .option("--orphans", "Run only the orphan check (free)")
     .option("--stale", "Run only the staleness check (free)")
     .option("--contradictions", "Run only the contradiction check (Haiku tokens)")
-    .action(async (opts) => {
+    .action(runAction(async (opts) => {
     const cfg = loadConfig();
     const db = new StateDb();
     try {
@@ -429,12 +443,12 @@ program
     finally {
         db.close();
     }
-});
+}));
 program
     .command("summarize [project]")
     .description("Generate or regenerate a project knowledge summary")
     .option("--all", "Regenerate summaries for every project with notes")
-    .action(async (project, opts) => {
+    .action(runAction(async (project, opts) => {
     const cfg = loadConfig();
     const db = new StateDb();
     try {
@@ -452,7 +466,8 @@ program
         }
         if (!project) {
             console.error(chalk.red("usage: vir summarize <project> | --all"));
-            exit(1);
+            process.exitCode = 1;
+            return;
         }
         const res = await summarizeProject(cfg, project, db);
         if (!res) {
@@ -465,12 +480,12 @@ program
     finally {
         db.close();
     }
-});
+}));
 program
     .command("embed")
     .description("Generate Ollama embeddings for distilled notes")
     .option("--force", "Regenerate even if embedding already exists")
-    .action(async (opts) => {
+    .action(runAction(async (opts) => {
     const cfg = loadConfig();
     ui.header("embed");
     ui.blank();
@@ -479,7 +494,8 @@ program
         ui.line(ui.dim("  brew install ollama"));
         ui.line(ui.dim("  ollama pull nomic-embed-text"));
         ui.line(ui.dim("  ollama serve"));
-        exit(1);
+        process.exitCode = 1;
+        return;
     }
     const db = new StateDb();
     try {
@@ -530,7 +546,7 @@ program
     finally {
         db.close();
     }
-});
+}));
 // JSON path for `vir query --json`: stdout gets a single JSON array on success
 // (`[]` when nothing matched), exit 0. On failure stdout stays EMPTY so the
 // plugin can `JSON.parse(stdout)` unguarded — the error goes to stderr as a
@@ -570,7 +586,7 @@ program
     .description("Search the vault: embedding/TF-IDF retrieval + Claude synthesis")
     .option("--json", "Emit machine-readable JSON for programmatic consumers")
     .option("--limit <n>", "Number of notes to retrieve", "8")
-    .action(async (question, opts) => {
+    .action(runAction(async (question, opts) => {
     const limit = Math.max(1, Number.parseInt(opts.limit ?? "8", 10) || 8);
     if (opts.json) {
         await runQueryJson(question, limit);
@@ -623,11 +639,100 @@ program
     finally {
         db.close();
     }
-});
+}));
+program
+    .command("compose <topic>")
+    .description("Synthesize a topic page from related vault notes")
+    .option("--limit <n>", "Top N notes to synthesize from (max 50)", "20")
+    .option("--model <model>", "Synthesis model: haiku | sonnet")
+    .option("--dry-run", "Show top sources + estimated cost, exit before LLM")
+    .option("--yes", "Skip the cost confirmation prompt")
+    .action(runAction(async (topic, opts) => {
+    const cfg = loadConfig();
+    if (opts.model && !["haiku", "sonnet"].includes(opts.model)) {
+        console.error(chalk.red(`--model must be 'haiku' or 'sonnet', got '${opts.model}'`));
+        process.exitCode = 1;
+        return;
+    }
+    const limit = Math.min(50, Math.max(1, Number.parseInt(opts.limit ?? "20", 10) || 20));
+    const db = new StateDb();
+    try {
+        ui.header("compose");
+        ui.divider();
+        console.log(ui.text(topic));
+        ui.divider();
+        ui.blank();
+        const sp = ui.spinner("searching vault for related notes").start();
+        const sources = await gatherSources(cfg, db, topic, limit);
+        sp.stop();
+        if (sources.length === 0) {
+            ui.row(ui.warn(ui.WARN_GLYPH), ui.text("no related notes found — nothing to synthesize"));
+            ui.line(ui.dim("  run `vir run` to distill more sessions first"));
+            return;
+        }
+        for (const s of sources.slice(0, 10))
+            ui.sourceRow(s.title, s.score);
+        ui.divider();
+        const model = normalizeModelName(resolveModelShorthand(opts.model ?? cfg.models.distill), cfg.provider);
+        const { inputTokens, outputTokens } = estimateComposeCostTokens(topic, sources);
+        const estCost = computeCost(cfg.provider, model, inputTokens, outputTokens, cfg.pricing);
+        ui.summary({
+            sources: { value: sources.length, color: ui.info },
+            model: { value: model, color: ui.accent },
+            "est. cost": { value: ui.formatUsd(estCost), color: ui.warn },
+        });
+        ui.divider();
+        if (opts.dryRun) {
+            ui.line(ui.dim("  dry run — no synthesis performed; actuals may vary ±30%"));
+            return;
+        }
+        if (opts.yes !== true) {
+            const proceed = await confirm({
+                message: `synthesize with ${model} (~${ui.formatUsd(estCost)})?`,
+                default: true,
+            });
+            if (!proceed) {
+                ui.line(ui.dim("aborted"));
+                return;
+            }
+        }
+        const writer = new VaultWriter(cfg, db);
+        const sp2 = ui.spinner("synthesizing topic page").start();
+        let result;
+        try {
+            result = await composeFromSources(cfg, db, topic, sources, writer, {
+                forceModel: opts.model,
+            });
+            sp2.stop();
+        }
+        catch (err) {
+            sp2.fail(ui.errorColor(err.message));
+            process.exitCode = 1;
+            return;
+        }
+        ui.row(ui.success(ui.CHECK), ui.text(`wrote ${result.relPath}`));
+        ui.blank();
+        // Actual cost from the record callLLM just appended for this compose.
+        const rec = [...readCostLog()]
+            .reverse()
+            .find((r) => r.stage === "compose" && r.session === result.slug);
+        ui.summary({
+            title: { value: result.title, color: ui.text },
+            sources: { value: result.sourceCount, color: ui.info },
+            confidence: { value: result.confidence.toFixed(2), color: ui.info },
+            ...(rec
+                ? { cost: { value: ui.formatUsd(rec.estimated_cost_usd), color: ui.warn } }
+                : {}),
+        });
+    }
+    finally {
+        db.close();
+    }
+}));
 program
     .command("status")
     .description("Show processing status + knowledge base breakdown")
-    .action(async () => {
+    .action(runAction(async () => {
     const cfg = configExists() ? loadConfig() : null;
     if (!cfg) {
         ui.header("status");
@@ -643,25 +748,34 @@ program
     renderKnowledge(knowledge);
     ui.blank();
     renderDaemon(ds, cfg.cadenceHours);
-});
+}));
+program
+    .command("reconcile")
+    .description("Retry sessions that silently failed pre-0.7.2 (null/empty content despite skipped=0)")
+    .option("--dry-run", "Report recoverable count + estimated cost + false-cost collateral; exit before any LLM call")
+    .option("--yes", "Skip the cost confirmation prompt")
+    .action(runAction(async (opts) => {
+    const cfg = loadConfig();
+    await runReconcile(cfg, { dryRun: opts.dryRun, yes: opts.yes });
+}));
 program
     .command("review")
     .description("Walk through new distilled notes and approve/edit/reject")
     .option("--all", "Review all notes, including verified ones")
     .option("--project <slug>", "Filter by project")
     .option("--limit <n>", "Max notes to review in this session", "50")
-    .action(runReview);
+    .action(runAction(runReview));
 program
     .command("doctor")
     .description("Run diagnostic checks on Vir installation")
     .option("--json", "Emit machine-readable JSON for programmatic consumers")
-    .action(async (opts) => {
+    .action(runAction(async (opts) => {
     if (opts.json) {
         await runDoctorJson();
         return;
     }
     await runDoctor();
-});
+}));
 const mcpCmd = program
     .command("mcp")
     .description("MCP server + Claude Code registration")
@@ -685,35 +799,35 @@ const runMcp = async () => {
 mcpCmd
     .command("run")
     .description("Run the MCP server over stdio")
-    .action(runMcp);
+    .action(runAction(runMcp));
 mcpCmd
     .command("install")
     .description("Register Vir with Claude Code")
     .option("--scope <scope>", "user or project", "user")
-    .action(async (opts) => {
+    .action(runAction(async (opts) => {
     await installToClaudeCode(opts.scope);
-});
+}));
 mcpCmd
     .command("uninstall")
     .description("Unregister Vir from Claude Code")
-    .action(async () => {
+    .action(runAction(async () => {
     await uninstallFromClaudeCode();
-});
+}));
 mcpCmd
     .command("status")
     .description("Check Vir MCP registration")
-    .action(async () => {
+    .action(runAction(async () => {
     if (!(await isClaudeAvailable())) {
         ui.row(ui.warn(ui.WARN_GLYPH), ui.text("claude CLI not detected"), "install: https://claude.com/claude-code");
         return;
     }
     const installed = await isInstalled();
     ui.row(installed ? ui.success(ui.CHECK) : ui.errorColor(ui.CROSS), ui.text(installed ? "registered with Claude Code" : "not registered"), installed ? undefined : "run: vir mcp install");
-});
+}));
 // Backwards compat: `vir mcp` with no subcommand runs the server. The MCP
 // registration (`claude mcp add vir vir mcp`) invokes exactly this, so it must
 // keep launching the stdio server — don't change it to print help.
-mcpCmd.action(runMcp);
+mcpCmd.action(runAction(runMcp));
 function renderKnowledge(k) {
     if (k.total === 0) {
         ui.box([
@@ -994,7 +1108,8 @@ async function cmdInit() {
         for (const issue of parsed.error.issues) {
             console.error(`  - ${issue.path.join(".")}: ${issue.message}`);
         }
-        exit(1);
+        process.exitCode = 1;
+        return;
     }
     saveConfig(parsed.data);
     ui.blank();
@@ -1056,8 +1171,12 @@ function safeLoad() {
         return null;
     }
 }
+// Safety net for anything that escapes the per-action `runAction` wrapper (e.g.
+// commander-internal rejections before the action handler is reached). Set
+// `process.exitCode` instead of calling `process.exit` so buffered stdout/stderr
+// can drain before the process exits.
 program.parseAsync(argv).catch((err) => {
     console.error(chalk.red(err.message ?? String(err)));
-    exit(1);
+    process.exitCode = 1;
 });
 //# sourceMappingURL=cli.js.map