@rulvar/cli 1.115.0 → 1.117.0

package/dist/index.js

@@ -850,11 +850,15 @@ function createWorker(engine, options) {
 * agent > tool > child), with start/end timestamps from the lifecycle
 * 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).
+* model, usage, and cost, and each tool execution becomes a child span
+* of its agent span under a synthetic FIFO pair key (RV802: tool events
+* ride the agent's spanId and carry no per-call id), so the agent span
+* lives to agent:end and keeps its closing usage, cost, and exploration
+* attributes. 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
@@ -868,7 +872,6 @@ const SPAN_OPENERS = /* @__PURE__ */ new Set([
 	"run:start",
 	"phase:start",
 	"agent:start",
-	"tool:start",
 	"child:start"
 ]);
 function msOf(ts) {
@@ -934,6 +937,9 @@ async function toOtel(run, tracer, options = {}) {
 	const openBySpanId = /* @__PURE__ */ new Map();
 	const stack = [];
 	let created = 0;
+	let toolMint = 0;
+	const openToolPairs = /* @__PURE__ */ new Map();
+	const toolPairOf = (spanId, toolName) => `${spanId} ${toolName}`;
 	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);
@@ -1009,10 +1015,26 @@ async function toOtel(run, tracer, options = {}) {
 				endSpan(event.spanId, event.ts, event.status);
 				break;
 			}
-			case "tool:end":
-				if (event.guard !== void 0) openBySpanId.get(event.spanId)?.span.setAttribute("rulvar.tool.guard", event.guard);
-				endSpan(event.spanId, event.ts, event.outcome);
+			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);
+				startSpan(event, key, event.spanId);
 				break;
+			}
+			case "tool:end": {
+				const 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;
+				}
+				if (event.guard !== void 0) openBySpanId.get(key)?.span.setAttribute("rulvar.tool.guard", event.guard);
+				endSpan(key, event.ts, event.outcome);
+				break;
+			}
 			case "child:end":
 				endSpan(event.spanId, event.ts, event.status);
 				break;

package/package.json

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