agent-inspect 6.31.22 → 6.31.23

package/packages/cli/dist/index.cjs

@@ -8115,9 +8115,22 @@ var init_tool_arguments = __esm({
 });
 
 // packages/core/src/persisted/delivery-identity.ts
-function stripReaderDeliveryDiscriminator(eventId) {
-  if (!SYNTHETIC_DELIVERY_ID.test(eventId)) return eventId;
-  return eventId.replace(/:\d+$/, "");
+function stripReaderDeliveryDiscriminator(eventId, attributes) {
+  if (!eventId) return eventId;
+  const rawBase = attributes?.[DELIVERY_EVENT_BASE_ATTR];
+  if (typeof rawBase !== "string" || rawBase.trim() === "") return eventId;
+  const base = rawBase.trim().slice(0, MAX_DELIVERY_BASE_LEN);
+  if (eventId === base) return base;
+  const prefix = `${base}:`;
+  if (!eventId.startsWith(prefix)) return eventId;
+  const suffix = eventId.slice(prefix.length);
+  if (/^\d+$/.test(suffix)) return base;
+  return eventId;
+}
+function deliveryEventBaseFromIndexedId(eventId) {
+  if (!/:\d+$/.test(eventId)) return void 0;
+  const base = eventId.replace(/:\d+$/, "");
+  return base.length > 0 ? base.slice(0, MAX_DELIVERY_BASE_LEN) : void 0;
 }
 function canonicalDigest(value) {
   if (value === void 0) return null;
@@ -8151,7 +8164,7 @@ function timeKey(fields) {
 function deliverySemanticFingerprint(fields) {
   const content = capturedContentDigest(fields.attributes);
   return JSON.stringify({
-    stableEventId: stripReaderDeliveryDiscriminator(fields.eventId),
+    stableEventId: stripReaderDeliveryDiscriminator(fields.eventId, fields.attributes),
     runId: fields.runId,
     kind: fields.kind,
     name: fields.name,
@@ -8202,6 +8215,11 @@ function identityFieldsFromAttributes(attributes) {
     attemptNumber: pickNumber2()
   };
 }
+function identityConflictFieldsFromAttributes(attributes) {
+  const raw = attributes?.[IDENTITY_CONFLICT_ATTR.fields];
+  if (typeof raw !== "string" || raw.trim() === "") return [];
+  return raw.split(",").map((part) => part.trim()).filter((part) => part.length > 0).slice(0, MAX_CONFLICT_FIELDS);
+}
 function hasDeliveryConflictMarker(attributes) {
   return attributes?.[DELIVERY_CONFLICT_ATTR] === true;
 }
@@ -8214,18 +8232,22 @@ function stampDeliveryConflict(event) {
     }
   };
 }
-var DELIVERY_CONFLICT_ATTR, IDENTITY_CONFLICT_ATTR, SYNTHETIC_DELIVERY_ID;
+var DELIVERY_CONFLICT_ATTR, DELIVERY_EVENT_BASE_ATTR, IDENTITY_CONFLICT_ATTR, MAX_CONFLICT_FIELDS, MAX_DELIVERY_BASE_LEN;
 var init_delivery_identity = __esm({
   "packages/core/src/persisted/delivery-identity.ts"() {
     init_canonical_equality();
     DELIVERY_CONFLICT_ATTR = "agent_inspect.delivery_conflict";
+    DELIVERY_EVENT_BASE_ATTR = "agent_inspect.delivery_event_base";
     IDENTITY_CONFLICT_ATTR = {
       operationId: "agent_inspect.identity_conflict.operation_id",
       attemptId: "agent_inspect.identity_conflict.attempt_id",
       retryOf: "agent_inspect.identity_conflict.retry_of",
-      attemptNumber: "agent_inspect.identity_conflict.attempt_number"
+      attemptNumber: "agent_inspect.identity_conflict.attempt_number",
+      /** Comma-separated field names when a conflict survives lossy bounding. */
+      fields: "agent_inspect.identity_conflict.fields"
     };
-    SYNTHETIC_DELIVERY_ID = /^(?:manual|inspect):[A-Za-z0-9_-]+:[A-Za-z0-9_-]+:[A-Za-z0-9_-]+:\d+$/;
+    MAX_CONFLICT_FIELDS = 8;
+    MAX_DELIVERY_BASE_LEN = 500;
   }
 });
 
@@ -8393,13 +8415,19 @@ function directNestedIdentityConflicts(event) {
   const attrs = event.attributes;
   if (!attrs || typeof attrs !== "object") return [];
   const nested = attrs.metadata && typeof attrs.metadata === "object" && !Array.isArray(attrs.metadata) ? attrs.metadata : void 0;
-  if (!nested) return [];
   const conflicts = [];
-  for (const key of IDENTITY_KEYS) {
-    const direct = attrs[key];
-    const nestedValue = nested[key];
-    if (direct === void 0 || nestedValue === void 0) continue;
-    if (!identityValuesEqual(direct, nestedValue)) {
+  if (nested) {
+    for (const key of IDENTITY_KEYS) {
+      const direct = attrs[key];
+      const nestedValue = nested[key];
+      if (direct === void 0 || nestedValue === void 0) continue;
+      if (!identityValuesEqual(direct, nestedValue)) {
+        conflicts.push(key);
+      }
+    }
+  }
+  for (const key of identityConflictFieldsFromAttributes(attrs)) {
+    if (IDENTITY_KEYS.includes(key) && !conflicts.includes(key)) {
       conflicts.push(key);
     }
   }
@@ -12756,6 +12784,11 @@ function compactAttributes2(entries) {
   }
   return Object.keys(out).length > 0 ? out : void 0;
 }
+function stampDeliveryEventBase(eventId, attributes) {
+  const base = deliveryEventBaseFromIndexedId(eventId);
+  if (!base) return attributes;
+  return { ...attributes ?? {}, [DELIVERY_EVENT_BASE_ATTR]: base };
+}
 function traceEventToPersistedInspectEvent(event, options) {
   const eventIndex = options?.eventIndex ?? 0;
   const eventId = createPersistedEventId(event, eventIndex);
@@ -12785,7 +12818,7 @@ function traceEventToPersistedInspectEvent(event, options) {
         startedAt: tsStart.iso,
         confidence: "explicit",
         source,
-        attributes
+        attributes: stampDeliveryEventBase(eventId, attributes)
       };
     }
     case "run_completed": {
@@ -12808,7 +12841,7 @@ function traceEventToPersistedInspectEvent(event, options) {
         durationMs: event.durationMs,
         confidence: "explicit",
         source,
-        attributes,
+        attributes: stampDeliveryEventBase(eventId, attributes),
         error
       };
     }
@@ -12833,7 +12866,7 @@ function traceEventToPersistedInspectEvent(event, options) {
         startedAt: tsStart.iso,
         confidence: "explicit",
         source,
-        attributes
+        attributes: stampDeliveryEventBase(eventId, attributes)
       };
       if (event.parentId !== void 0) {
         out.parentId = event.parentId;
@@ -12864,7 +12897,7 @@ function traceEventToPersistedInspectEvent(event, options) {
         durationMs: event.durationMs,
         confidence: "explicit",
         source,
-        attributes,
+        attributes: stampDeliveryEventBase(eventId, attributes),
         error
       };
     }
@@ -12891,7 +12924,7 @@ function traceEventToPersistedInspectEvent(event, options) {
         timestamp: tsMain.iso,
         confidence: "explicit",
         source,
-        attributes
+        attributes: stampDeliveryEventBase(eventId, attributes)
       };
       if (event.parentId !== void 0) {
         out.parentId = event.parentId;
@@ -12915,6 +12948,7 @@ function traceEventsToPersistedInspectEvents(events, options) {
 var init_from_trace_event = __esm({
   "packages/core/src/persisted/from-trace-event.ts"() {
     init_correlation_metadata();
+    init_delivery_identity();
     init_token_usage();
   }
 });
@@ -14519,6 +14553,15 @@ function promoteAgentInspectWorkflowIdentity(attributes, pathPrefix) {
       metadata[camel] = alternate;
     }
   }
+  const conflictFields = attributes["agent_inspect.identity_conflict.fields"];
+  if (typeof conflictFields === "string" && conflictFields.trim() !== "") {
+    warnings.push({
+      code: "otlp_identity_conflict",
+      message: `Identity representation conflict fields retained after OTLP bounding: ${conflictFields.trim().slice(0, 200)}.`,
+      severity: "warning",
+      field: `${pathPrefix}.agent_inspect.identity_conflict.fields`
+    });
+  }
   if (Object.keys(metadata).length > 0) {
     attributes.metadata = metadata;
   }
@@ -17258,7 +17301,7 @@ var init_src = __esm({
 });
 
 // package.json
-var version = "6.31.22";
+var version = "6.31.23";
 
 // packages/cli/src/list.ts
 init_advanced();
@@ -17580,6 +17623,7 @@ init_persisted_inspect_event();
 init_from_trace_event();
 
 // packages/core/src/persisted/from-inspect-event.ts
+init_delivery_identity();
 init_token_usage();
 
 // packages/core/src/entries/persisted.ts
@@ -19927,10 +19971,16 @@ function pickBoundedIdentityString(bag, key, maxLen) {
   if (!bag || typeof bag !== "object") return {};
   const directRaw = bag[key];
   const nestedRaw = nestedBag(bag)?.[key];
-  const direct = typeof directRaw === "string" && directRaw.trim() !== "" ? directRaw.trim().slice(0, maxLen) : void 0;
-  const nested = typeof nestedRaw === "string" && nestedRaw.trim() !== "" ? nestedRaw.trim().slice(0, maxLen) : void 0;
-  if (direct !== void 0 && nested !== void 0 && direct !== nested) {
-    return { value: direct, conflictAlternate: nested };
+  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
+    };
   }
   if (direct !== void 0) return { value: direct };
   if (nested !== void 0) return { value: nested };
@@ -19951,32 +20001,21 @@ function pickBoundedIdentityNumber(bag, key) {
 }
 function appendStructuralIdentityAttrs(attrs, meta2, maxLen) {
   const conflicts = [];
-  const operationId = pickBoundedIdentityString(meta2, "operationId", maxLen);
-  if (operationId.value !== void 0) {
-    attrs.push(stringAttr2("agent_inspect.operation_id", operationId.value));
-  }
-  if (operationId.conflictAlternate !== void 0) {
-    attrs.push(
-      stringAttr2(IDENTITY_CONFLICT_ATTR.operationId, operationId.conflictAlternate)
-    );
-    conflicts.push("operationId");
-  }
-  const attemptId = pickBoundedIdentityString(meta2, "attemptId", maxLen);
-  if (attemptId.value !== void 0) {
-    attrs.push(stringAttr2("agent_inspect.attempt_id", attemptId.value));
-  }
-  if (attemptId.conflictAlternate !== void 0) {
-    attrs.push(stringAttr2(IDENTITY_CONFLICT_ATTR.attemptId, attemptId.conflictAlternate));
-    conflicts.push("attemptId");
-  }
-  const retryOf = pickBoundedIdentityString(meta2, "retryOf", maxLen);
-  if (retryOf.value !== void 0) {
-    attrs.push(stringAttr2("agent_inspect.retry_of", retryOf.value));
-  }
-  if (retryOf.conflictAlternate !== void 0) {
-    attrs.push(stringAttr2(IDENTITY_CONFLICT_ATTR.retryOf, retryOf.conflictAlternate));
-    conflicts.push("retryOf");
-  }
+  const emitString = (key, otlpKey, conflictKey) => {
+    const picked = pickBoundedIdentityString(meta2, key, maxLen);
+    if (picked.value !== void 0) {
+      attrs.push(stringAttr2(otlpKey, picked.value));
+    }
+    if (picked.conflictAlternate !== void 0 || picked.truncatedCollision) {
+      if (picked.conflictAlternate !== void 0) {
+        attrs.push(stringAttr2(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(meta2, "attemptNumber");
   const attemptNumber2 = attemptNumberPrimary.value !== void 0 || attemptNumberPrimary.conflictAlternate !== void 0 ? attemptNumberPrimary : pickBoundedIdentityNumber(meta2, "attempt");
   if (attemptNumber2.value !== void 0) {
@@ -19988,9 +20027,18 @@ function appendStructuralIdentityAttrs(attrs, meta2, maxLen) {
     );
     conflicts.push("attemptNumber");
   }
+  if (conflicts.length > 0) {
+    attrs.push(
+      stringAttr2(IDENTITY_CONFLICT_ATTR.fields, conflicts.join(",").slice(0, maxLen))
+    );
+  }
   if (meta2?.[DELIVERY_CONFLICT_ATTR] === true) {
     attrs.push(boolAttr(DELIVERY_CONFLICT_ATTR, true));
   }
+  const deliveryBase = meta2?.[DELIVERY_EVENT_BASE_ATTR];
+  if (typeof deliveryBase === "string" && deliveryBase.trim() !== "") {
+    attrs.push(stringAttr2(DELIVERY_EVENT_BASE_ATTR, deliveryBase.trim().slice(0, maxLen)));
+  }
   return conflicts;
 }
 function resolveSpanTimes(ev) {