@rulvar/cli 1.107.0 → 1.108.0

package/dist/cli.js

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

package/dist/index.d.ts

@@ -43,8 +43,9 @@ declare function inspectCommand(argv: string[], context: CommandContext): Promis
 * request and the rows sum to gross; an aggregate-priced remainder or
 * legacy entry makes the export say `row usd is non-additive`, and
 * `allocatedUsd` is the additive column that sums to gross in every
-* case. Pricing folds at read time from the assembled price table, the
-* same numbers rulvar inspect reports.
+* case. Pricing folds at read time from the run's settle pins composed
+* with the assembled price table (RV611), the same numbers rulvar
+* inspect reports and the engine's own settle mirrors.
 */
 declare function invoiceCommand(argv: string[], context: CommandContext): Promise<number>;
 /**

package/dist/index.js

@@ -1,4 +1,4 @@
-import { _ as loadCliConfig, a as invoiceCommand, c as runCommand, d as reportOutcome, f as strictExitCode, g as assembleEngine, h as DEFAULT_STORE_DIR, i as inspectCommand, l as runsLsCommand, m as renderEventLine, n as HELP, o as preflightCommand, p as attachProgress, r as runCli, s as resumeCommand, t as processIo, u as driveRun, v as loadWorkflowModule, y as looksLikeFile } from "./io-B4I9hIzW.js";
+import { _ as loadCliConfig, a as invoiceCommand, c as runCommand, d as reportOutcome, f as strictExitCode, g as assembleEngine, h as DEFAULT_STORE_DIR, i as inspectCommand, l as runsLsCommand, m as renderEventLine, n as HELP, o as preflightCommand, p as attachProgress, r as runCli, s as resumeCommand, t as processIo, u as driveRun, v as loadWorkflowModule, y as looksLikeFile } from "./io-eA5_NvlK.js";
 import { ConfigError, InvalidResolutionError, JournalCompatibilityError, LeaseHeldError, Replayer, RulvarError, buildDeriverRegistry, compileSecretMasker, costReportFromJournal, journalPricingSnapshot, maskSecrets, normalizeEntry, readRunMeta, scanJournalCompatibility, validateSchemaSpec } from "@rulvar/core";
 //#region src/server.ts
 /**
@@ -526,7 +526,9 @@ function createServer(options) {
 			message: `run '${runId}' not found`
 		} });
 		const entries = (await journal.load(runId)).map((raw) => normalizeEntry(raw));
-		return json(200, costReportFromJournal(entries, journalPricingSnapshot(entries)?.priceUsd ?? options.priceUsd ?? (() => void 0)));
+		const settleSnapshot = journalPricingSnapshot(entries);
+		const currentPriceUsd = options.priceUsd ?? (() => void 0);
+		return json(200, costReportFromJournal(entries, settleSnapshot === void 0 ? currentPriceUsd : settleSnapshot.composedPriceUsd(currentPriceUsd)));
 	}
 	async function route(req) {
 		const path = new URL(req.url).pathname;

package/dist/{io-B4I9hIzW.js → io-eA5_NvlK.js}

@@ -1101,9 +1101,9 @@ async function inspectCommand(argv, context) {
 	for (const [kind, count] of [...byKind.entries()].sort((a, b) => a[0].localeCompare(b[0]))) context.io.out(`  ${kind}: ${count}`);
 	context.io.out(`open suspensions: ${openSuspensions}`);
 	const inspectSnapshot = journalPricingSnapshot(entries);
-	const cost = costReportFromJournal(entries, inspectSnapshot?.priceUsd ?? assembled.priceUsd);
+	const cost = costReportFromJournal(entries, inspectSnapshot === void 0 ? assembled.priceUsd : inspectSnapshot.composedPriceUsd(assembled.priceUsd));
 	context.io.out(`cost: $${cost.totalUsd.toFixed(4)}`);
-	if (inspectSnapshot !== void 0) context.io.out("pricing: run-settle snapshot" + (inspectSnapshot.pricingVersion === void 0 ? "" : ` (${inspectSnapshot.pricingVersion})`));
+	if (inspectSnapshot !== void 0) context.io.out(`pricing: run-settle pins composed with the current table${pinVersionsSuffix(inspectSnapshot)}`);
 	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)`);
@@ -1126,8 +1126,9 @@ async function inspectCommand(argv, context) {
 * request and the rows sum to gross; an aggregate-priced remainder or
 * legacy entry makes the export say `row usd is non-additive`, and
 * `allocatedUsd` is the additive column that sums to gross in every
-* case. Pricing folds at read time from the assembled price table, the
-* same numbers rulvar inspect reports.
+* case. Pricing folds at read time from the run's settle pins composed
+* with the assembled price table (RV611), the same numbers rulvar
+* inspect reports and the engine's own settle mirrors.
 */
 async function invoiceCommand(argv, context) {
 	const parsed = parseCommand(GRAMMAR.invoice, argv);
@@ -1143,10 +1144,12 @@ async function invoiceCommand(argv, context) {
 	if (meta === void 0) throw new ConfigError(`run '${runId}' not found in the store`);
 	const entries = await assembled.store.load(runId);
 	const snapshot = journalPricingSnapshot(entries);
-	const invoice = invoiceFromJournal(entries, snapshot?.priceUsd ?? assembled.priceUsd, { pricing: snapshot === void 0 ? { source: "current-table" } : {
-		source: "snapshot",
+	const invoice = invoiceFromJournal(entries, snapshot === void 0 ? assembled.priceUsd : snapshot.composedPriceUsd(assembled.priceUsd), { pricing: snapshot === void 0 ? { source: "current-table" } : {
+		source: "composed",
 		...snapshot.pricingVersion === void 0 ? {} : { pricingVersion: snapshot.pricingVersion },
-		rows: snapshot.rows
+		rows: snapshot.rows,
+		segments: snapshot.segments,
+		pinnedThroughSeq: snapshot.pinnedThroughSeq
 	} });
 	if (json) {
 		context.io.out(JSON.stringify(invoice, null, 2));
@@ -1156,7 +1159,7 @@ async function invoiceCommand(argv, context) {
 	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}${invoice.usageUnknownRows === void 0 ? "" : `; usage unknown: ${invoice.usageUnknownRows}`})`);
 	context.io.out(`pricing basis: ${invoice.pricingBasis} ` + (invoice.rowUsdNonAdditive ? "(row usd is non-additive: an aggregate-priced remainder or legacy entry is in the fold; allocatedUsd sums to gross)" : "(rows are additive: every provider call priced per request; allocatedUsd agrees and sums to gross)"));
-	context.io.out(invoice.pricing?.source === "snapshot" ? "pricing rates: run-settle snapshot" + (invoice.pricing.pricingVersion === void 0 ? "" : ` (${invoice.pricing.pricingVersion})`) : "pricing rates: current table (no snapshot in the journal)");
+	context.io.out(snapshot === void 0 ? "pricing rates: current table (no snapshot in the journal)" : `pricing rates: run-settle pins composed with the current table${pinVersionsSuffix(snapshot)}`);
 	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;
@@ -1171,6 +1174,16 @@ async function invoiceCommand(argv, context) {
 function usdOf(value) {
 	return value === void 0 ? "n/a" : `$${value.toFixed(4)}`;
 }
+/**
+* ` (v-a, v-b)` across the pins in journal order, deduplicated (RV611):
+* one version per rotation, so the inspect and invoice text forms name
+* every table that priced the fold, not only the last. Empty when no
+* pin carried a version.
+*/
+function pinVersionsSuffix(snapshot) {
+	const versions = [...new Set(snapshot.segments.map((segment) => segment.pricingVersion).filter((version) => version !== void 0))];
+	return versions.length === 0 ? "" : ` (${versions.join(", ")})`;
+}
 function renderPreflight(report, io) {
 	io.out("preflight: effective limits and admission projection (zero provider dispatches)");
 	const perProvider = report.concurrency.perProvider;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rulvar/cli",
-  "version": "1.107.0",
+  "version": "1.108.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.107.0"
+    "@rulvar/core": "1.108.0"
   },
   "devDependencies": {
     "@types/node": "^22.20.1",
     "tsdown": "^0.22.14",
     "typescript": "~6.0.3",
-    "@rulvar/testing": "1.107.0",
-    "@rulvar/store-sqlite": "1.107.0",
-    "@rulvar/plan": "1.107.0",
-    "@rulvar/planner": "1.107.0",
-    "@rulvar/evals": "1.107.0"
+    "@rulvar/testing": "1.108.0",
+    "@rulvar/planner": "1.108.0",
+    "@rulvar/store-sqlite": "1.108.0",
+    "@rulvar/plan": "1.108.0",
+    "@rulvar/evals": "1.108.0"
   },
   "bin": {
     "rulvar": "./dist/cli.js"