@rulvar/cli 1.59.4 → 1.61.0

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { r as runCli, t as processIo } from "./io-DzlCfHd9.js";
+import { r as runCli, t as processIo } from "./io-Dp8Qkr9V.js";
 import { sanitizeTerminalText } from "@rulvar/core";
 import { inspect } from "node:util";
 //#region src/cli.ts

package/dist/index.d.ts

@@ -31,6 +31,17 @@ declare function runCommand(argv: string[], context: CommandContext): Promise<nu
 declare function resumeCommand(argv: string[], context: CommandContext): Promise<number>;
 declare function runsLsCommand(argv: string[], context: CommandContext): Promise<number>;
 declare function inspectCommand(argv: string[], context: CommandContext): Promise<number>;
+/**
+* rulvar invoice (P1.3): the per-dispatch reconciliation export from
+* the journal's providerCalls ledger, one row per billable provider
+* call with the provider's response id when the adapter surfaced one,
+* plus the gross/net ledger totals (`totalUsd` here is the GROSS
+* figure: abandoned subtrees included, exactly what a provider invoice
+* bills). --json prints the machine-readable InvoiceExport; the text
+* form prints one line per row. Pricing folds at read time from the
+* assembled price table, the same numbers rulvar inspect reports.
+*/
+declare function invoiceCommand(argv: string[], context: CommandContext): Promise<number>;
 //#endregion
 //#region src/config.d.ts
 /** The shape both the config module and a workflow module may export. */
@@ -375,4 +386,4 @@ declare function toOtel(run: {
   result: Promise<RunOutcome<unknown>>;
 }, tracer: TracerLike, options?: ToOtelOptions): Promise<number>;
 //#endregion
-export { type AssembledCli, type CliConfig, type CliIo, type CommandContext, type CreateServerOptions, type CreateWorkerOptions, DEFAULT_MAX_PENDING_EVENTS_PER_CLIENT, DEFAULT_STORE_DIR, DEFAULT_WORKER_TTL_MS, HELP, type KbSweepCliConfig, type LoadedWorkflowModule, type OtelContextApi, type RulvarServer, type SpanLike, type ToOtelOptions, type TracerLike, type Worker, assembleEngine, attachProgress, createServer, createWorker, driveRun, inspectCommand, loadCliConfig, loadWorkflowModule, looksLikeFile, processIo, renderEventLine, reportOutcome, resumeCommand, runCli, runCommand, runsLsCommand, strictExitCode, toOtel };
+export { type AssembledCli, type CliConfig, type CliIo, type CommandContext, type CreateServerOptions, type CreateWorkerOptions, DEFAULT_MAX_PENDING_EVENTS_PER_CLIENT, DEFAULT_STORE_DIR, DEFAULT_WORKER_TTL_MS, HELP, type KbSweepCliConfig, type LoadedWorkflowModule, type OtelContextApi, type RulvarServer, type SpanLike, type ToOtelOptions, type TracerLike, type Worker, assembleEngine, attachProgress, createServer, createWorker, driveRun, inspectCommand, invoiceCommand, loadCliConfig, loadWorkflowModule, looksLikeFile, processIo, renderEventLine, reportOutcome, resumeCommand, runCli, runCommand, runsLsCommand, strictExitCode, toOtel };

package/dist/index.js

@@ -1,4 +1,4 @@
-import { _ as looksLikeFile, a as resumeCommand, c as driveRun, d as attachProgress, f as renderEventLine, g as loadWorkflowModule, h as loadCliConfig, i as inspectCommand, l as reportOutcome, m as assembleEngine, n as HELP, o as runCommand, p as DEFAULT_STORE_DIR, r as runCli, s as runsLsCommand, t as processIo, u as strictExitCode } from "./io-DzlCfHd9.js";
+import { _ as loadWorkflowModule, a as invoiceCommand, c as runsLsCommand, d as strictExitCode, f as attachProgress, g as loadCliConfig, h as assembleEngine, i as inspectCommand, l as driveRun, m as DEFAULT_STORE_DIR, n as HELP, o as resumeCommand, p as renderEventLine, r as runCli, s as runCommand, t as processIo, u as reportOutcome, v as looksLikeFile } from "./io-Dp8Qkr9V.js";
 import { ConfigError, InvalidResolutionError, JournalCompatibilityError, LeaseHeldError, Replayer, RulvarError, buildDeriverRegistry, compileSecretMasker, costReportFromJournal, maskSecrets, normalizeEntry, readRunMeta, scanJournalCompatibility, validateSchemaSpec } from "@rulvar/core";
 //#region src/server.ts
 /**
@@ -961,4 +961,4 @@ async function toOtel(run, tracer, options = {}) {
 	return created;
 }
 //#endregion
-export { DEFAULT_MAX_PENDING_EVENTS_PER_CLIENT, DEFAULT_STORE_DIR, DEFAULT_WORKER_TTL_MS, HELP, assembleEngine, attachProgress, createServer, createWorker, driveRun, inspectCommand, loadCliConfig, loadWorkflowModule, looksLikeFile, processIo, renderEventLine, reportOutcome, resumeCommand, runCli, runCommand, runsLsCommand, strictExitCode, toOtel };
+export { DEFAULT_MAX_PENDING_EVENTS_PER_CLIENT, DEFAULT_STORE_DIR, DEFAULT_WORKER_TTL_MS, HELP, assembleEngine, attachProgress, createServer, createWorker, driveRun, inspectCommand, invoiceCommand, loadCliConfig, loadWorkflowModule, looksLikeFile, processIo, renderEventLine, reportOutcome, resumeCommand, runCli, runCommand, runsLsCommand, strictExitCode, toOtel };

package/dist/{io-DzlCfHd9.js → io-Dp8Qkr9V.js}

@@ -1,4 +1,4 @@
-import { ConfigError, FileModelKnowledgeStore, INBOX_PROPOSAL_TTL_DAYS, JsonlFileStore, LeaseHeldError, auditRuns, claimExpired, claimExpiry, compilePermissionPreset, costReportFromJournal, createEngine, hashRunArgs, hashRunOutput, lastRunSettle, parseModelRef, priceUsdOf, proposalStatement, readRunMeta, reconcileRunMeta, remeasureQueue, resolvePricing, runProfile, sanitizeTerminalText } from "@rulvar/core";
+import { ConfigError, FileModelKnowledgeStore, INBOX_PROPOSAL_TTL_DAYS, JsonlFileStore, LeaseHeldError, auditRuns, claimExpired, claimExpiry, compilePermissionPreset, costReportFromJournal, createEngine, hashRunArgs, hashRunOutput, invoiceFromJournal, lastRunSettle, parseModelRef, priceUsdOf, proposalStatement, readRunMeta, reconcileRunMeta, remeasureQueue, resolvePricing, runProfile, sanitizeTerminalText } from "@rulvar/core";
 import { join, resolve } from "node:path";
 import { existsSync, statSync } from "node:fs";
 import { pathToFileURL } from "node:url";
@@ -474,6 +474,11 @@ const GRAMMAR = {
 		positionals: ["<runId>"],
 		flags: [STORE]
 	},
+	invoice: {
+		command: "invoice",
+		positionals: ["<runId>"],
+		flags: [STORE, { name: "json" }]
+	},
 	plan: {
 		command: "plan",
 		positionals: ["\"<goal>\""],
@@ -585,6 +590,7 @@ function helpCommandLines() {
 		GRAMMAR["runs ls"],
 		GRAMMAR["runs audit"],
 		GRAMMAR.inspect,
+		GRAMMAR.invoice,
 		GRAMMAR.plan
 	];
 	const heads = top.map((grammar) => [
@@ -1074,6 +1080,7 @@ async function inspectCommand(argv, context) {
 	context.io.out(`open suspensions: ${openSuspensions}`);
 	const cost = costReportFromJournal(entries, assembled.priceUsd);
 	context.io.out(`cost: $${cost.totalUsd.toFixed(4)}`);
+	if (cost.abandoned.usd > 0) context.io.out(`gross: $${cost.grossUsd.toFixed(4)} (abandoned: $${cost.abandoned.usd.toFixed(4)}; see rulvar invoice)`);
 	for (const [model, usd] of Object.entries(cost.byModel)) context.io.out(`  ${model}: $${usd.toFixed(4)}`);
 	for (const item of cost.unpriced) context.io.out(`  unpriced: ${item.model} (${item.usage.inputTokens + item.usage.outputTokens} tok)`);
 	for (const entry of entries) {
@@ -1084,6 +1091,46 @@ async function inspectCommand(argv, context) {
 	return 0;
 }
 /**
+* rulvar invoice (P1.3): the per-dispatch reconciliation export from
+* the journal's providerCalls ledger, one row per billable provider
+* call with the provider's response id when the adapter surfaced one,
+* plus the gross/net ledger totals (`totalUsd` here is the GROSS
+* figure: abandoned subtrees included, exactly what a provider invoice
+* bills). --json prints the machine-readable InvoiceExport; the text
+* form prints one line per row. Pricing folds at read time from the
+* assembled price table, the same numbers rulvar inspect reports.
+*/
+async function invoiceCommand(argv, context) {
+	const parsed = parseCommand(GRAMMAR.invoice, argv);
+	const runId = parsed.positionals[0];
+	const store = parsed.values.store;
+	const json = parsed.values.json === true;
+	const assembled = assembleEngine({
+		config: await loadCliConfig(context.cwd),
+		...store === void 0 ? {} : { storePath: store },
+		cwd: context.cwd
+	});
+	const meta = await readRunMeta(assembled.store, runId);
+	if (meta === void 0) throw new ConfigError(`run '${runId}' not found in the store`);
+	const invoice = invoiceFromJournal(await assembled.store.load(runId), assembled.priceUsd);
+	if (json) {
+		context.io.out(JSON.stringify(invoice, null, 2));
+		return 0;
+	}
+	context.io.out(`run ${meta.runId}: invoice (${meta.status})`);
+	context.io.out(`gross: $${invoice.totalUsd.toFixed(4)} | net: $${invoice.netUsd.toFixed(4)} | abandoned: $${invoice.abandonedUsd.toFixed(4)}${invoice.usageApprox === true ? " (approx)" : ""}`);
+	context.io.out(`rows: ${invoice.rows.length} (reconciliation failures: ${invoice.reconciliationFailures})`);
+	for (const row of invoice.rows) {
+		const usd = row.usd === void 0 ? "unpriced" : `$${row.usd.toFixed(4)}`;
+		const tokens = row.usage.inputTokens + row.usage.outputTokens;
+		const id = row.responseId ?? "no-id";
+		const flags = `${row.usageApprox === true ? " approx" : ""}${row.abandoned === true ? " abandoned" : ""}`;
+		context.io.out(`#${row.entrySeq}.${row.ordinal} ${row.servedBy}${row.role === void 0 ? "" : ` ${row.role}`}${row.attempt === void 0 ? "" : ` attempt=${row.attempt}`} ${row.outcome} ${id} ${tokens} tok ${usd}${flags} [${row.reconciliation}]`);
+	}
+	for (const item of invoice.unpriced) context.io.out(`unpriced: ${item.model} (${item.usage.inputTokens + item.usage.outputTokens} tok)`);
+	return 0;
+}
+/**
 * rulvar plan (M6-T11; grammar in grammar.ts): plans a workflow script
 * through @rulvar/planner (loaded dynamically: the CLI's static
 * dependency stays @rulvar/core only), prints the accepted script and
@@ -1546,6 +1593,11 @@ accounting, localized determinism warnings, and the output digest;
 --assert-no-live exits 1 unless the replay is pure, and
 --compare-output-hash exits 1 unless the replayed result's digest
 equals the journaled one.
+invoice prints the per-dispatch reconciliation export: one row per
+billable provider call (failed and retried attempts included) with the
+provider's response id when the adapter surfaced one, plus the
+gross/net ledger totals (gross includes abandoned subtrees, exactly
+what the provider bills); --json emits the machine-readable form.
 plan asks the planner model (role plan) to write a workflow script,
 lints and self-repairs it, then runs it in the worker sandbox; --dry-run
 prints the accepted script without running. Both stages are paid runs
@@ -1582,6 +1634,7 @@ async function runCli(argv, options) {
 				throw new ConfigError(RUNS_FAMILY_USAGE);
 			}
 			case "inspect": return await inspectCommand(rest, context);
+			case "invoice": return await invoiceCommand(rest, context);
 			case "plan": return await planCommand(rest, context);
 			case "kb": return await kbCommand(rest, context);
 			case void 0:
@@ -1632,4 +1685,4 @@ function processIo() {
 	};
 }
 //#endregion
-export { looksLikeFile as _, resumeCommand as a, driveRun as c, attachProgress as d, renderEventLine as f, loadWorkflowModule as g, loadCliConfig as h, inspectCommand as i, reportOutcome as l, assembleEngine as m, HELP as n, runCommand as o, DEFAULT_STORE_DIR as p, runCli as r, runsLsCommand as s, processIo as t, strictExitCode as u };
+export { loadWorkflowModule as _, invoiceCommand as a, runsLsCommand as c, strictExitCode as d, attachProgress as f, loadCliConfig as g, assembleEngine as h, inspectCommand as i, driveRun as l, DEFAULT_STORE_DIR as m, HELP as n, resumeCommand as o, renderEventLine as p, runCli as r, runCommand as s, processIo as t, reportOutcome as u, looksLikeFile as v };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rulvar/cli",
-  "version": "1.59.4",
+  "version": "1.61.0",
   "description": "Rulvar shell: run/resume/runs/inspect/plan/kb commands, TUI progress, createServer, createWorker, OTel exporter.",
   "type": "module",
   "license": "Apache-2.0",
@@ -22,17 +22,17 @@
     "access": "public"
   },
   "dependencies": {
-    "@rulvar/core": "1.59.4"
+    "@rulvar/core": "1.61.0"
   },
   "devDependencies": {
     "@types/node": "^22.20.0",
     "tsdown": "^0.22.3",
     "typescript": "~6.0.3",
-    "@rulvar/planner": "1.59.4",
-    "@rulvar/plan": "1.59.4",
-    "@rulvar/evals": "1.59.4",
-    "@rulvar/store-sqlite": "1.59.4",
-    "@rulvar/testing": "1.59.4"
+    "@rulvar/testing": "1.61.0",
+    "@rulvar/planner": "1.61.0",
+    "@rulvar/store-sqlite": "1.61.0",
+    "@rulvar/plan": "1.61.0",
+    "@rulvar/evals": "1.61.0"
   },
   "bin": {
     "rulvar": "./dist/cli.js"