@agent-inspect/mcp-server 6.31.7 → 6.31.8

package/dist/cli.cjs

@@ -5124,8 +5124,13 @@ function persistedInspectEventsToInspectEvents(events, options) {
 }
 
 // packages/core/src/persisted/tree-bridge.ts
+function logicalToPersisted(event) {
+  const { sourceEventIds: _sourceEventIds, projection: _projection, ...rest } = event;
+  return rest;
+}
 function persistedInspectEventsToRunTrees(events, options) {
-  const inspectEvents = persistedInspectEventsToInspectEvents(events, {
+  const sourceEvents = options?.coalesceLifecycle === true ? projectLogicalEvents(events).logicalEvents.map(logicalToPersisted) : events;
+  const inspectEvents = persistedInspectEventsToInspectEvents(sourceEvents, {
     skipInvalid: options?.skipInvalid
   });
   return new TreeBuilder().build(inspectEvents);
@@ -5819,7 +5824,7 @@ function mapOpenInferenceSpan(span, index, version) {
   const errorMessage = isRecord10(span.status) && typeof span.status.message === "string" ? span.status.message : void 0;
   const event = {
     schemaVersion: "0.2",
-    eventId: typeof rawAttributes["agent_inspect.event_id"] === "string" ? rawAttributes["agent_inspect.event_id"] : spanId,
+    eventId: typeof rawAttributes["agent_inspect.event_id"] === "string" ? rawAttributes["agent_inspect.event_id"] : `${traceId}:${spanId}`,
     runId: typeof rawAttributes["agent_inspect.run_id"] === "string" ? rawAttributes["agent_inspect.run_id"] : traceId,
     kind,
     name,
@@ -5870,12 +5875,16 @@ function mapOpenInferenceEvents(document) {
   const mapped = document.spans.map(
     (span, index) => mapOpenInferenceSpan(span, index, document.version)
   );
-  const spanIdToEventId = new Map(
-    mapped.map((span) => [span.spanId, span.event.eventId])
+  const spanKeyToEventId = new Map(
+    mapped.map((span) => {
+      const traceId = typeof span.event.trace?.traceId === "string" ? span.event.trace.traceId : "";
+      return [`${traceId}:${span.spanId}`, span.event.eventId];
+    })
   );
   for (const span of mapped) {
     if (span.parentSpanId === void 0) continue;
-    span.event.parentId = spanIdToEventId.get(span.parentSpanId) ?? span.parentSpanId;
+    const traceId = typeof span.event.trace?.traceId === "string" ? span.event.trace.traceId : "";
+    span.event.parentId = spanKeyToEventId.get(`${traceId}:${span.parentSpanId}`) ?? span.parentSpanId;
   }
   return {
     events: mapped.map((span) => span.event),
@@ -6424,7 +6433,7 @@ function mapOtlpSpan(context) {
   const errorMessage = isRecord10(span.status) && typeof span.status.message === "string" ? span.status.message : void 0;
   const event = {
     schemaVersion: "0.2",
-    eventId: typeof parsedSpanAttributes.attributes["agent_inspect.event_id"] === "string" ? parsedSpanAttributes.attributes["agent_inspect.event_id"] : spanId,
+    eventId: typeof parsedSpanAttributes.attributes["agent_inspect.event_id"] === "string" ? parsedSpanAttributes.attributes["agent_inspect.event_id"] : `${traceId}:${spanId}`,
     runId: typeof parsedSpanAttributes.attributes["agent_inspect.run_id"] === "string" ? parsedSpanAttributes.attributes["agent_inspect.run_id"] : traceId,
     kind,
     name: readStringField(span, ["name"]) ?? spanId,
@@ -6473,12 +6482,16 @@ function mapOtlpSpan(context) {
 }
 function mapOtlpEventsToPersisted(document) {
   const mapped = document.spans.map((span) => mapOtlpSpan(span));
-  const spanIdToEventId = new Map(
-    mapped.map((span) => [span.spanId, span.event.eventId])
+  const spanKeyToEventId = new Map(
+    mapped.map((span) => {
+      const traceId = typeof span.event.trace?.traceId === "string" ? span.event.trace.traceId : "";
+      return [`${traceId}:${span.spanId}`, span.event.eventId];
+    })
   );
   for (const span of mapped) {
     if (span.parentSpanId === void 0) continue;
-    span.event.parentId = spanIdToEventId.get(span.parentSpanId) ?? span.parentSpanId;
+    const traceId = typeof span.event.trace?.traceId === "string" ? span.event.trace.traceId : "";
+    span.event.parentId = spanKeyToEventId.get(`${traceId}:${span.parentSpanId}`) ?? span.parentSpanId;
   }
   return {
     events: mapped.map((span) => span.event),
@@ -7382,11 +7395,13 @@ function exportOpenInference(tree, options) {
       endNs = startNs + unixNano(ev.durationMs);
     }
     const { openInferenceKind } = mapInspectKindToOI(ev.kind, warnings);
+    const meta = ev.attributes;
+    const originalSource = typeof meta?.originalSourceType === "string" && meta.originalSourceType.trim() !== "" ? meta.originalSourceType.trim() : ev.source.type;
     const attrs2 = {
       "openinference.span.kind": openInferenceKind,
       "agent_inspect.kind": ev.kind,
       "agent_inspect.confidence": ev.confidence,
-      "agent_inspect.source.type": ev.source.type,
+      "agent_inspect.source.type": originalSource,
       "agent_inspect.run_id": tree.runId,
       "agent_inspect.event_id": ev.eventId,
       "agent_inspect.status": ev.status ?? "unset"
@@ -7394,9 +7409,9 @@ function exportOpenInference(tree, options) {
     if (ev.durationMs !== void 0) {
       attrs2["agent_inspect.duration_ms"] = ev.durationMs;
     }
-    const meta = ev.attributes;
-    if (meta?.model !== void 0 && typeof meta.model === "string") {
-      attrs2["llm.model_name"] = meta.model;
+    const requestModel = (typeof meta?.model === "string" && meta.model.trim() !== "" ? meta.model : void 0) ?? (typeof meta?.modelId === "string" && meta.modelId.trim() !== "" ? meta.modelId : void 0);
+    if (requestModel !== void 0) {
+      attrs2["llm.model_name"] = requestModel;
     }
     const tokens = meta?.tokens;
     if (tokens && typeof tokens === "object" && tokens !== null) {
@@ -7406,8 +7421,9 @@ function exportOpenInference(tree, options) {
       if (typeof outp === "number") attrs2["llm.token_count.completion"] = outp;
     }
     if (includeAttributes && meta && typeof meta === "object") {
+      const skipKeys = /* @__PURE__ */ new Set(["tokens", "model", "modelId", "originalSourceType"]);
       for (const [k, v] of Object.entries(meta)) {
-        if (k === "tokens" || k === "model") continue;
+        if (skipKeys.has(k)) continue;
         if (v !== void 0 && v !== null && typeof v !== "object") {
           attrs2[`agent_inspect.preview.${k}`] = typeof v === "string" ? v.slice(0, maxLen) : v;
         }
@@ -7525,24 +7541,33 @@ function exportOtlpJson(tree, options) {
     const spanId = hexFrom2(`${tree.runId}:${ev.eventId}`, 8);
     const parentSpanId = ev.parentId ? hexFrom2(`${tree.runId}:${ev.parentId}`, 8) : void 0;
     const { startNs, endNs } = resolveSpanTimes(ev);
+    const meta = ev.attributes;
+    const originalSource = typeof meta?.originalSourceType === "string" && meta.originalSourceType.trim() !== "" ? meta.originalSourceType.trim() : ev.source.type;
     const attrs2 = [
       stringAttr2("agent_inspect.kind", ev.kind),
       stringAttr2("agent_inspect.confidence", ev.confidence),
-      stringAttr2("agent_inspect.source.type", ev.source.type),
+      stringAttr2("agent_inspect.source.type", originalSource),
       stringAttr2("agent_inspect.run_id", tree.runId),
       stringAttr2("agent_inspect.event_id", ev.eventId),
       stringAttr2("agent_inspect.status", ev.status ?? "unset")
     ];
     if (ev.durationMs !== void 0) {
-      attrs2.push(intAttr("agent_inspect.duration_ms", ev.durationMs));
+      attrs2.push(numberAttr("agent_inspect.duration_ms", ev.durationMs));
     }
     const op = genAiOperationName(ev.kind);
     if (op !== void 0) {
       attrs2.push(stringAttr2("gen_ai.operation.name", op));
     }
-    const meta = ev.attributes;
-    if (meta?.model !== void 0 && typeof meta.model === "string") {
-      attrs2.push(stringAttr2("gen_ai.request.model", meta.model.slice(0, maxLen)));
+    const requestModel = (typeof meta?.model === "string" && meta.model.trim() !== "" ? meta.model : void 0) ?? (typeof meta?.modelId === "string" && meta.modelId.trim() !== "" ? meta.modelId : void 0);
+    if (requestModel !== void 0) {
+      attrs2.push(stringAttr2("gen_ai.request.model", requestModel.slice(0, maxLen)));
+    }
+    const responseModel = typeof meta?.responseModelId === "string" && meta.responseModelId.trim() !== "" ? meta.responseModelId : typeof meta?.responseModel === "string" && meta.responseModel.trim() !== "" ? meta.responseModel : void 0;
+    if (responseModel !== void 0) {
+      attrs2.push(stringAttr2("gen_ai.response.model", responseModel.slice(0, maxLen)));
+    }
+    if (typeof meta?.provider === "string" && meta.provider.trim() !== "") {
+      attrs2.push(stringAttr2("gen_ai.provider.name", meta.provider.slice(0, maxLen)));
     }
     const tokens = meta?.tokens;
     if (tokens && typeof tokens === "object" && tokens !== null) {
@@ -7552,8 +7577,17 @@ function exportOtlpJson(tree, options) {
       if (typeof outp === "number") attrs2.push(intAttr("gen_ai.usage.output_tokens", outp));
     }
     if (includeAttributes && meta && typeof meta === "object") {
+      const skipKeys = /* @__PURE__ */ new Set([
+        "tokens",
+        "model",
+        "modelId",
+        "responseModel",
+        "responseModelId",
+        "provider",
+        "originalSourceType"
+      ]);
       for (const [k, v] of Object.entries(meta)) {
-        if (k === "tokens" || k === "model") continue;
+        if (skipKeys.has(k)) continue;
         if (typeof v === "string") {
           attrs2.push(stringAttr2(`agent_inspect.preview.${k}`, v.slice(0, maxLen)));
         } else if (typeof v === "number" && Number.isFinite(v)) {