@rulvar/cli 1.128.0 → 1.130.0

package/dist/cli.js

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

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-CsvU0Iog.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-CT8sNWMl.js";
 import { ConfigError, InvalidResolutionError, JournalCompatibilityError, LeaseHeldError, Replayer, RulvarError, buildDeriverRegistry, compileSecretMasker, costReportFromJournal, journalPricingSnapshot, maskSecrets, normalizeEntry, readRunMeta, scanJournalCompatibility, validateSchemaSpec } from "@rulvar/core";
 //#region src/server.ts
 /**
@@ -940,6 +940,8 @@ async function toOtel(run, tracer, options = {}) {
 	let toolMint = 0;
 	const openToolPairs = /* @__PURE__ */ new Map();
 	const toolPairOf = (spanId, toolName) => `${spanId} ${toolName}`;
+	const openToolById = /* @__PURE__ */ new Map();
+	const toolIdOf = (spanId, toolCallId) => `${spanId} ${toolCallId}`;
 	const { contextApi, setSpan } = options;
 	const masker = options.patterns === void 0 ? void 0 : compileSecretMasker(options.patterns, "toOtel patterns");
 	const maskText = (text) => masker === void 0 ? maskSecrets(text) : masker.maskText(text);
@@ -964,11 +966,11 @@ async function toOtel(run, tracer, options = {}) {
 		openBySpanId.set(key, open);
 		stack.push(open);
 	};
-	const endSpan = (spanId, ts, status, message) => {
+	const endSpan = (spanId, ts, status, message, unsettled = false) => {
 		const open = openBySpanId.get(spanId);
 		if (open === void 0) return;
 		if (status !== void 0) open.span.setAttribute("rulvar.status", status);
-		open.span.setStatus(status !== void 0 && status !== "ok" && status !== "skipped" ? {
+		open.span.setStatus(status !== void 0 && status !== "ok" && status !== "skipped" || unsettled ? {
 			code: STATUS_ERROR,
 			...message === void 0 ? {} : { message }
 		} : { code: STATUS_OK });
@@ -991,7 +993,8 @@ async function toOtel(run, tracer, options = {}) {
 				if (runOpen !== void 0 && event.salvagedPartialChildren !== void 0) runOpen.span.setAttribute("rulvar.run.salvagedPartialChildren", JSON.stringify(event.salvagedPartialChildren));
 				if (runOpen !== void 0 && event.salvagedTerminalOutputChildren !== void 0) runOpen.span.setAttribute("rulvar.run.salvagedTerminalOutputChildren", JSON.stringify(event.salvagedTerminalOutputChildren));
 				if (runOpen !== void 0 && event.acceptanceChildren !== void 0) runOpen.span.setAttribute("rulvar.run.acceptanceChildren", JSON.stringify(event.acceptanceChildren));
-				endSpan(event.spanId, event.ts, event.status);
+				if (runOpen !== void 0 && event.settled === false) runOpen.span.setAttribute("rulvar.run.settled", false);
+				endSpan(event.spanId, event.ts, event.status, event.settled === false ? "settlement failed: nothing durable records this terminal; resume re-settles" : void 0, event.settled === false);
 				break;
 			}
 			case "agent:phase:start":
@@ -1019,15 +1022,25 @@ async function toOtel(run, tracer, options = {}) {
 			case "tool:start": {
 				const key = `${event.spanId}#tool${String(toolMint)}`;
 				toolMint += 1;
-				const pair = toolPairOf(event.spanId, event.toolName);
-				const fifo = openToolPairs.get(pair);
-				if (fifo === void 0) openToolPairs.set(pair, [key]);
-				else fifo.push(key);
+				if (typeof event.toolCallId === "string") openToolById.set(toolIdOf(event.spanId, event.toolCallId), key);
+				else {
+					const pair = toolPairOf(event.spanId, event.toolName);
+					const fifo = openToolPairs.get(pair);
+					if (fifo === void 0) openToolPairs.set(pair, [key]);
+					else fifo.push(key);
+				}
 				startSpan(event, key, event.spanId);
+				if (typeof event.toolCallId === "string") openBySpanId.get(key)?.span.setAttribute("rulvar.tool.call_id", event.toolCallId);
 				break;
 			}
 			case "tool:end": {
-				const key = openToolPairs.get(toolPairOf(event.spanId, event.toolName))?.shift();
+				let key;
+				if (typeof event.toolCallId === "string") {
+					const idKey = toolIdOf(event.spanId, event.toolCallId);
+					key = openToolById.get(idKey);
+					if (key !== void 0) openToolById.delete(idKey);
+				}
+				key ??= openToolPairs.get(toolPairOf(event.spanId, event.toolName))?.shift();
 				if (key === void 0) {
 					(openBySpanId.get(event.spanId) ?? stack[stack.length - 1])?.span.addEvent(event.type, { "rulvar.entry_seq": event.seq });
 					break;

package/dist/{io-CsvU0Iog.js → io-CT8sNWMl.js}

@@ -220,7 +220,7 @@ function rawEventLine(event) {
 			return `determinism ${str(event.category)} (${str(event.provenance)}) ${where}`;
 		}
 		case "log": return event.level === "debug" ? void 0 : `${str(event.level)}: ${str(event.msg)}`;
-		case "run:end": return `run ${str(event.runId)} ${str(event.status)}${event.usageApprox === true ? " (cost approx)" : ""}${event.completion === void 0 ? "" : ` completion=${str(event.completion)}`}`;
+		case "run:end": return `run ${str(event.runId)} ${str(event.status)}${event.usageApprox === true ? " (cost approx)" : ""}${event.completion === void 0 ? "" : ` completion=${str(event.completion)}`}${event.settled === false ? " settled=false (outcome withheld; resume re-settles)" : ""}`;
 		default: return;
 	}
 }

package/package.json

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