@rulvar/cli 1.129.0 → 1.131.0

package/dist/index.js

@@ -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);
@@ -1020,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/package.json

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