@rulvar/cli 1.111.0 → 1.113.0

package/dist/cli.js

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

package/dist/index.d.ts

@@ -171,6 +171,13 @@ interface AssembledCli {
   * same way the engine hashed the genesis args.
   */
   argsHashSalt?: string;
+  /**
+  * The configured price table's version (RV706), surfaced so the
+  * invoice and inspect surfaces can name the CURRENT table in a
+  * composed provenance instead of leaving the tail's rates anonymous.
+  * Absent when the config declares no table.
+  */
+  currentPricingVersion?: string;
 }
 declare function assembleEngine(options: {
   config: CliConfig;

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-eA5_NvlK.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-Ghdg-hbD.js";
 import { ConfigError, InvalidResolutionError, JournalCompatibilityError, LeaseHeldError, Replayer, RulvarError, buildDeriverRegistry, compileSecretMasker, costReportFromJournal, journalPricingSnapshot, maskSecrets, normalizeEntry, readRunMeta, scanJournalCompatibility, validateSchemaSpec } from "@rulvar/core";
 //#region src/server.ts
 /**

package/dist/{io-eA5_NvlK.js → io-Ghdg-hbD.js}

@@ -111,12 +111,14 @@ function assembleEngine(options) {
 		return pricing === void 0 ? void 0 : priceUsdOf(pricing, usage);
 	};
 	const argsHashSalt = engineOptions.security?.argsHashSalt;
+	const currentPricingVersion = engineOptions.pricing?.pricingVersion;
 	return {
 		engine,
 		store,
 		workflows,
 		priceUsd,
-		...argsHashSalt === void 0 ? {} : { argsHashSalt }
+		...argsHashSalt === void 0 ? {} : { argsHashSalt },
+		...currentPricingVersion === void 0 ? {} : { currentPricingVersion }
 	};
 }
 /**
@@ -1103,7 +1105,7 @@ async function inspectCommand(argv, context) {
 	const inspectSnapshot = journalPricingSnapshot(entries);
 	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 pins composed with the current table${pinVersionsSuffix(inspectSnapshot)}`);
+	if (inspectSnapshot !== void 0) context.io.out("pricing: run-settle pins composed with the current table" + pinVersionsSuffix(inspectSnapshot, assembled.currentPricingVersion));
 	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)`);
@@ -1144,9 +1146,14 @@ 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 === void 0 ? assembled.priceUsd : snapshot.composedPriceUsd(assembled.priceUsd), { pricing: snapshot === void 0 ? { source: "current-table" } : {
+	const currentVersion = assembled.currentPricingVersion === void 0 ? {} : { currentPricingVersion: assembled.currentPricingVersion };
+	const invoice = invoiceFromJournal(entries, snapshot === void 0 ? assembled.priceUsd : snapshot.composedPriceUsd(assembled.priceUsd), { pricing: snapshot === void 0 ? {
+		source: "current-table",
+		...currentVersion
+	} : {
 		source: "composed",
 		...snapshot.pricingVersion === void 0 ? {} : { pricingVersion: snapshot.pricingVersion },
+		...currentVersion,
 		rows: snapshot.rows,
 		segments: snapshot.segments,
 		pinnedThroughSeq: snapshot.pinnedThroughSeq
@@ -1159,7 +1166,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(snapshot === void 0 ? "pricing rates: current table (no snapshot in the journal)" : `pricing rates: run-settle pins composed with the current table${pinVersionsSuffix(snapshot)}`);
+	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, assembled.currentPricingVersion));
 	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;
@@ -1175,14 +1182,20 @@ 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.
+* ` (v-a, v-b; current v-live)` across the pins in journal order,
+* deduplicated (RV611), plus the CLI's own current table version
+* (RV706): the composed fold prices the tail past the last pin at the
+* current table, so the text form names BOTH halves of the
+* composition. Empty when no pin carried a version and the config
+* declares no table; the pre-RV706 forms are preserved byte for byte
+* in that case and when only the pins carry versions.
 */
-function pinVersionsSuffix(snapshot) {
+function pinVersionsSuffix(snapshot, currentPricingVersion) {
 	const versions = [...new Set(snapshot.segments.map((segment) => segment.pricingVersion).filter((version) => version !== void 0))];
-	return versions.length === 0 ? "" : ` (${versions.join(", ")})`;
+	const parts = [];
+	if (versions.length > 0) parts.push(versions.join(", "));
+	if (currentPricingVersion !== void 0) parts.push(`current ${currentPricingVersion}`);
+	return parts.length === 0 ? "" : ` (${parts.join("; ")})`;
 }
 function renderPreflight(report, io) {
 	io.out("preflight: effective limits and admission projection (zero provider dispatches)");

package/package.json

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