@rulvar/cli 1.48.0 → 1.49.0

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { r as runCli, t as processIo } from "./io-BK1hP3Od.js";
+import { r as runCli, t as processIo } from "./io-DHbOOiYv.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 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-BK1hP3Od.js";
+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-DHbOOiYv.js";
 import { ConfigError, InvalidResolutionError, JournalCompatibilityError, LeaseHeldError, Replayer, RulvarError, buildDeriverRegistry, costReportFromJournal, maskSecrets, normalizeEntry, readRunMeta, scanJournalCompatibility, validateSchemaSpec } from "@rulvar/core";
 //#region src/server.ts
 /**
@@ -775,8 +775,13 @@ function createWorker(engine, options) {
 * tracer)` maps the spanId tree of a run 1:1 onto OTel spans: one span
 * per rulvar span, parented per the span hierarchy (run > phase >
 * agent > tool > child), with start/end timestamps from the lifecycle
-* events. Events without an own span (log, budget:update) attach as span
-* events on their enclosing span.
+* events; each agent:phase pair additionally becomes a child span of
+* its agent span keyed (spanId, invocation), carrying the phase's role,
+* model, usage, and cost. Events without an own span (log,
+* budget:update) attach as span events on their enclosing span. An
+* opener for an already-open span never duplicates it (replayed
+* re-emissions mark the original; a pre-RV-207 stream's extra per-phase
+* agent:start cannot leak the agent span unended).
 *
 * `@opentelemetry/api` ^1.9 is an OPTIONAL peer: the CLI has no OTel
 * dependency, and the exporter is typed against a minimal structural
@@ -799,11 +804,24 @@ function msOf(ts) {
 /** The OTel status codes (UNSET 0, OK 1, ERROR 2); inlined to avoid the peer. */
 const STATUS_OK = 1;
 const STATUS_ERROR = 2;
+/**
+* Usage, cost, and retry attributes on a closing span, defensively: the
+* exporter tolerates foreign or truncated streams, so absent fields
+* simply do not become attributes.
+*/
+function setUsageAttributes(open, event, retryKey, retries) {
+	if (open === void 0) return;
+	if (typeof event.usage?.inputTokens === "number") open.span.setAttribute("gen_ai.usage.input_tokens", event.usage.inputTokens);
+	if (typeof event.usage?.outputTokens === "number") open.span.setAttribute("gen_ai.usage.output_tokens", event.usage.outputTokens);
+	if (typeof event.costUsd === "number") open.span.setAttribute("rulvar.cost_usd", event.costUsd);
+	if (typeof retries === "number") open.span.setAttribute(retryKey, retries);
+}
 function spanName(event) {
 	switch (event.type) {
 		case "run:start": return `run ${event.workflow}`;
 		case "phase:start": return `phase ${event.phase}`;
 		case "agent:start": return `agent ${event.agentType || "(anon)"} ${event.role}`;
+		case "agent:phase:start": return `invocation ${event.role}`;
 		case "tool:start": return `tool ${event.toolName}`;
 		case "child:start": return `workflow ${event.workflow}`;
 		default: return event.type;
@@ -822,6 +840,12 @@ function openAttributes(event, runId) {
 		attrs["gen_ai.request.model"] = event.model;
 		attrs["gen_ai.operation.name"] = event.role;
 	}
+	if (event.type === "agent:phase:start") {
+		attrs["rulvar.agent_type"] = event.agentType;
+		attrs["gen_ai.request.model"] = event.model;
+		attrs["gen_ai.operation.name"] = event.role;
+		attrs["rulvar.invocation"] = event.invocation;
+	}
 	if (event.type === "tool:start") attrs["rulvar.tool_name"] = event.toolName;
 	for (const [key, value] of Object.entries(attrs)) if (typeof value === "string") attrs[key] = maskSecrets(value);
 	return attrs;
@@ -838,12 +862,13 @@ async function toOtel(run, tracer, options = {}) {
 	const stack = [];
 	let created = 0;
 	const { contextApi, setSpan } = options;
-	const startSpan = (event) => {
-		if (event.replayed === true && openBySpanId.has(event.spanId)) {
-			openBySpanId.get(event.spanId)?.span.setAttribute("rulvar.replayed", true);
+	const startSpan = (event, key = event.spanId, parentKey) => {
+		const parentId = parentKey ?? event.parentSpanId;
+		if (openBySpanId.has(key)) {
+			if (event.replayed === true) openBySpanId.get(key)?.span.setAttribute("rulvar.replayed", true);
 			return;
 		}
-		const parent = event.parentSpanId === void 0 ? void 0 : openBySpanId.get(event.parentSpanId);
+		const parent = parentId === void 0 ? void 0 : openBySpanId.get(parentId);
 		const parentContext = parent !== void 0 && contextApi !== void 0 && setSpan !== void 0 ? setSpan(contextApi.active(), parent.span) : void 0;
 		const span = tracer.startSpan(spanName(event), {
 			startTime: msOf(event.ts),
@@ -852,10 +877,10 @@ async function toOtel(run, tracer, options = {}) {
 		created += 1;
 		const open = {
 			span,
-			spanId: event.spanId,
-			...event.parentSpanId === void 0 ? {} : { parentSpanId: event.parentSpanId }
+			spanId: key,
+			...parentId === void 0 ? {} : { parentSpanId: parentId }
 		};
-		openBySpanId.set(event.spanId, open);
+		openBySpanId.set(key, open);
 		stack.push(open);
 	};
 	const endSpan = (spanId, ts, status, message) => {
@@ -880,7 +905,17 @@ async function toOtel(run, tracer, options = {}) {
 			case "run:end":
 				endSpan(event.spanId, event.ts, event.status);
 				break;
+			case "agent:phase:start":
+				startSpan(event, `${event.spanId}#${event.invocation}`, event.spanId);
+				break;
+			case "agent:phase:end": {
+				const key = `${event.spanId}#${event.invocation}`;
+				setUsageAttributes(openBySpanId.get(key), event, "rulvar.retries", event.retries);
+				endSpan(key, event.ts, event.outcome);
+				break;
+			}
 			case "agent:end":
+				setUsageAttributes(openBySpanId.get(event.spanId), event, "rulvar.retry_count", event.retryCount);
 				endSpan(event.spanId, event.ts, event.status);
 				break;
 			case "tool:end":

package/dist/{io-BK1hP3Od.js → io-DHbOOiYv.js}

@@ -197,7 +197,9 @@ function rawEventLine(event) {
 		case "run:start": return `run ${str(event.runId)} ${event.resumed === true ? "resumed" : "started"} (workflow ${str(event.workflow)})`;
 		case "phase:start": return `phase ${str(event.phase)}`;
 		case "agent:start": return `${replayMark}agent ${who}${str(event.label) === "" ? "" : ` [${str(event.label)}]`} ${str(event.role)} on ${str(event.model)}`;
-		case "agent:end": return `${replayMark}agent ${who} ${str(event.status)} (${money(num(event.costUsd))}, ${String(num(event.usage?.inputTokens) + num(event.usage?.outputTokens))} tok)${event.usageApprox === true ? " approx" : ""}`;
+		case "agent:phase:start": return `${replayMark}agent ${who} ${str(event.role)} phase on ${str(event.model)}`;
+		case "agent:phase:end": return `${replayMark}agent ${who} ${str(event.role)} phase ${str(event.outcome)} (${money(num(event.costUsd))}, ${String(num(event.usage?.inputTokens) + num(event.usage?.outputTokens))} tok, ${String(num(event.durationMs))}ms${num(event.retries) > 0 ? `, ${String(num(event.retries))} retries` : ""})`;
+		case "agent:end": return `${replayMark}agent ${who} ${str(event.status)} (${money(num(event.costUsd))}, ${String(num(event.usage?.inputTokens) + num(event.usage?.outputTokens))} tok${num(event.retryCount) > 0 ? `, ${String(num(event.retryCount))} retries` : ""})${event.usageApprox === true ? " approx" : ""}`;
 		case "agent:error": return `agent ${who} error: ${str(event.error?.message)}${event.willRetry === true ? " (will retry)" : ""}`;
 		case "agent:queued": return `agent ${who} queued`;
 		case "tool:start": return `${replayMark}tool ${str(event.toolName)}`;
@@ -219,6 +221,8 @@ function attachProgress(handle, io) {
 		"run:start",
 		"phase:start",
 		"agent:start",
+		"agent:phase:start",
+		"agent:phase:end",
 		"agent:end",
 		"agent:error",
 		"agent:queued",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rulvar/cli",
-  "version": "1.48.0",
+  "version": "1.49.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.48.0"
+    "@rulvar/core": "1.49.0"
   },
   "devDependencies": {
     "@types/node": "^22.20.0",
     "tsdown": "^0.22.3",
     "typescript": "~6.0.3",
-    "@rulvar/testing": "1.48.0",
-    "@rulvar/store-sqlite": "1.48.0",
-    "@rulvar/planner": "1.48.0",
-    "@rulvar/evals": "1.48.0",
-    "@rulvar/plan": "1.48.0"
+    "@rulvar/store-sqlite": "1.49.0",
+    "@rulvar/planner": "1.49.0",
+    "@rulvar/plan": "1.49.0",
+    "@rulvar/evals": "1.49.0",
+    "@rulvar/testing": "1.49.0"
   },
   "bin": {
     "rulvar": "./dist/cli.js"