agent-inspect 6.31.21 → 6.31.23

package/packages/core/dist/exporters.mjs

@@ -4,6 +4,7 @@ import { escapeHtml, flattenTree, safeString, compactAttributes, stableJson, esc
 export { compactAttributes, escapeHtml, escapeMarkdown, flattenTree, safeString, stableJson, summarizeTree } from './chunk-CAWPF22J.mjs';
 import { resolveRedactionProfile, applyProfileMetadataCaps, truncateStringForProfile, stringContainsHighConfidenceCredential } from './chunk-EOXUEQB6.mjs';
 import { Redactor, DEFAULT_REDACT_KEYS, isCredentialSensitiveKey } from './chunk-VLVCLAPB.mjs';
+import { IDENTITY_CONFLICT_ATTR, DELIVERY_CONFLICT_ATTR, DELIVERY_EVENT_BASE_ATTR } from './chunk-AN5MOADW.mjs';
 import './chunk-7DHSWDKB.mjs';
 import './chunk-EE5Z2GQ3.mjs';
 import './chunk-7TGZLWEE.mjs';
@@ -860,43 +861,85 @@ var STRUCTURAL_IDENTITY_KEYS = [
   "attemptNumber",
   "attempt"
 ];
-function pickBoundedIdentityString(bag, key, maxLen) {
+function nestedBag(bag) {
   if (!bag || typeof bag !== "object") return void 0;
-  const direct = bag[key];
-  if (typeof direct === "string" && direct.trim() !== "") {
-    return direct.trim().slice(0, maxLen);
-  }
-  const nested = bag.metadata && typeof bag.metadata === "object" ? bag.metadata[key] : void 0;
-  if (typeof nested === "string" && nested.trim() !== "") {
-    return nested.trim().slice(0, maxLen);
+  const nested = bag.metadata;
+  if (!nested || typeof nested !== "object" || Array.isArray(nested)) return void 0;
+  return nested;
+}
+function pickBoundedIdentityString(bag, key, maxLen) {
+  if (!bag || typeof bag !== "object") return {};
+  const directRaw = bag[key];
+  const nestedRaw = nestedBag(bag)?.[key];
+  const directFull = typeof directRaw === "string" && directRaw.trim() !== "" ? directRaw.trim() : void 0;
+  const nestedFull = typeof nestedRaw === "string" && nestedRaw.trim() !== "" ? nestedRaw.trim() : void 0;
+  const direct = directFull !== void 0 ? directFull.slice(0, maxLen) : void 0;
+  const nested = nestedFull !== void 0 ? nestedFull.slice(0, maxLen) : void 0;
+  if (directFull !== void 0 && nestedFull !== void 0 && directFull !== nestedFull) {
+    return {
+      value: direct,
+      conflictAlternate: nested,
+      truncatedCollision: direct === nested
+    };
   }
-  return void 0;
+  if (direct !== void 0) return { value: direct };
+  if (nested !== void 0) return { value: nested };
+  return {};
 }
 function pickBoundedIdentityNumber(bag, key) {
-  if (!bag || typeof bag !== "object") return void 0;
-  const direct = bag[key];
-  if (typeof direct === "number" && Number.isFinite(direct)) return direct;
-  const nested = bag.metadata && typeof bag.metadata === "object" ? bag.metadata[key] : void 0;
-  if (typeof nested === "number" && Number.isFinite(nested)) return nested;
-  return void 0;
+  if (!bag || typeof bag !== "object") return {};
+  const directRaw = bag[key];
+  const nestedRaw = nestedBag(bag)?.[key];
+  const direct = typeof directRaw === "number" && Number.isFinite(directRaw) ? directRaw : void 0;
+  const nested = typeof nestedRaw === "number" && Number.isFinite(nestedRaw) ? nestedRaw : void 0;
+  if (direct !== void 0 && nested !== void 0 && direct !== nested) {
+    return { value: direct, conflictAlternate: nested };
+  }
+  if (direct !== void 0) return { value: direct };
+  if (nested !== void 0) return { value: nested };
+  return {};
 }
 function appendStructuralIdentityAttrs(attrs, meta, maxLen) {
-  const operationId = pickBoundedIdentityString(meta, "operationId", maxLen);
-  if (operationId !== void 0) {
-    attrs.push(stringAttr("agent_inspect.operation_id", operationId));
+  const conflicts = [];
+  const emitString = (key, otlpKey, conflictKey) => {
+    const picked = pickBoundedIdentityString(meta, key, maxLen);
+    if (picked.value !== void 0) {
+      attrs.push(stringAttr(otlpKey, picked.value));
+    }
+    if (picked.conflictAlternate !== void 0 || picked.truncatedCollision) {
+      if (picked.conflictAlternate !== void 0) {
+        attrs.push(stringAttr(conflictKey, picked.conflictAlternate));
+      }
+      conflicts.push(key);
+    }
+  };
+  emitString("operationId", "agent_inspect.operation_id", IDENTITY_CONFLICT_ATTR.operationId);
+  emitString("attemptId", "agent_inspect.attempt_id", IDENTITY_CONFLICT_ATTR.attemptId);
+  emitString("retryOf", "agent_inspect.retry_of", IDENTITY_CONFLICT_ATTR.retryOf);
+  const attemptNumberPrimary = pickBoundedIdentityNumber(meta, "attemptNumber");
+  const attemptNumber = attemptNumberPrimary.value !== void 0 || attemptNumberPrimary.conflictAlternate !== void 0 ? attemptNumberPrimary : pickBoundedIdentityNumber(meta, "attempt");
+  if (attemptNumber.value !== void 0) {
+    attrs.push(intAttr("agent_inspect.attempt_number", attemptNumber.value));
+  }
+  if (attemptNumber.conflictAlternate !== void 0) {
+    attrs.push(
+      intAttr(IDENTITY_CONFLICT_ATTR.attemptNumber, attemptNumber.conflictAlternate)
+    );
+    conflicts.push("attemptNumber");
   }
-  const attemptId = pickBoundedIdentityString(meta, "attemptId", maxLen);
-  if (attemptId !== void 0) {
-    attrs.push(stringAttr("agent_inspect.attempt_id", attemptId));
+  if (conflicts.length > 0) {
+    attrs.push(
+      stringAttr(IDENTITY_CONFLICT_ATTR.fields, conflicts.join(",").slice(0, maxLen))
+    );
   }
-  const retryOf = pickBoundedIdentityString(meta, "retryOf", maxLen);
-  if (retryOf !== void 0) {
-    attrs.push(stringAttr("agent_inspect.retry_of", retryOf));
+  if (meta?.[DELIVERY_CONFLICT_ATTR] === true) {
+    attrs.push(boolAttr(DELIVERY_CONFLICT_ATTR, true));
   }
-  const attemptNumber = pickBoundedIdentityNumber(meta, "attemptNumber") ?? pickBoundedIdentityNumber(meta, "attempt");
-  if (attemptNumber !== void 0) {
-    attrs.push(intAttr("agent_inspect.attempt_number", attemptNumber));
+  const deliveryBase = meta?.[DELIVERY_EVENT_BASE_ATTR];
+  if (typeof deliveryBase === "string" && deliveryBase.trim() !== "") {
+    attrs.push(stringAttr(DELIVERY_EVENT_BASE_ATTR, deliveryBase.trim().slice(0, maxLen)));
   }
+  return conflicts;
 }
 function resolveSpanTimes(ev) {
   const startedAtMs = typeof ev.attributes?.startedAtMs === "number" && Number.isFinite(ev.attributes.startedAtMs) ? ev.attributes.startedAtMs : void 0;
@@ -919,7 +962,8 @@ function exportOtlpJson(tree, options) {
     "OTLP JSON export uses OTel GenAI-aligned attributes where applicable; experimental until verified against specific collectors.",
     "Not OTLP gRPC/protobuf \u2014 JSON mapping only. Generated locally; no network upload.",
     "Status and span kind use OTLP numeric enums (StatusCode 0/1/2, SpanKind INTERNAL=1).",
-    "When present on source events, operationId/attemptId/retryOf/attemptNumber are emitted as bounded agent_inspect.* identity attributes (not a broad attribute dump)."
+    "When present on source events, operationId/attemptId/retryOf/attemptNumber are emitted as bounded agent_inspect.* identity attributes (not a broad attribute dump).",
+    "When direct and nested identity disagree, export prefers direct for non-strict consumers and emits agent_inspect.identity_conflict.* for the nested alternate; this does not certify conflicting identity."
   ];
   const traceId = hexFrom2(`trace:${tree.runId}`, 16);
   const includeAttributes = options?.includeAttributes ?? false;
@@ -967,11 +1011,16 @@ function exportOtlpJson(tree, options) {
       if (typeof inp === "number") attrs.push(intAttr("gen_ai.usage.input_tokens", inp));
       if (typeof outp === "number") attrs.push(intAttr("gen_ai.usage.output_tokens", outp));
     }
-    appendStructuralIdentityAttrs(
+    const identityConflicts = appendStructuralIdentityAttrs(
       attrs,
       meta && typeof meta === "object" ? meta : void 0,
       maxLen
     );
+    if (identityConflicts.length > 0) {
+      warnings.push(
+        `Identity representation conflict on event ${ev.eventId}: ${identityConflicts.join(", ")} (direct preferred; nested retained on agent_inspect.identity_conflict.*).`
+      );
+    }
     if (includeAttributes && meta && typeof meta === "object") {
       const skipKeys = /* @__PURE__ */ new Set([
         "tokens",