agentv 4.41.1 → 4.41.4

package/dist/{chunk-ENHX2CCS.js → chunk-QCF3LUI7.js}

@@ -6156,7 +6156,7 @@ async function expandFileReferences(tests, evalFileDir) {
   return expanded;
 }
 
-// ../../packages/core/dist/chunk-REU6TJT4.js
+// ../../packages/core/dist/chunk-7MDLZQ2R.js
 import path50 from "node:path";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
 import { existsSync as existsSync7 } from "node:fs";
@@ -18820,7 +18820,7 @@ var RequestError = class _RequestError extends Error {
   }
 };
 
-// ../../packages/core/dist/chunk-REU6TJT4.js
+// ../../packages/core/dist/chunk-7MDLZQ2R.js
 import { exec as execCallback } from "node:child_process";
 import { readdirSync, statSync } from "node:fs";
 import { readFile as readFile32, readdir as readdir2, stat as stat2 } from "node:fs/promises";
@@ -21409,8 +21409,7 @@ var CostGrader = class {
     };
   }
 };
-var NORMALIZED_TRAJECTORY_SCHEMA_VERSION = "agentv.trajectory.v1";
-var NORMALIZED_TRACE_SOURCE_KINDS = [
+var TRACE_SOURCE_KINDS = [
   "agentv_run",
   "otlp",
   "phoenix",
@@ -21419,7 +21418,7 @@ var NORMALIZED_TRACE_SOURCE_KINDS = [
   "imported_transcript",
   "compact_transcript"
 ];
-var NORMALIZED_TRACE_EVENT_TYPES = [
+var TRACE_EVENT_TYPES = [
   "message",
   "model_turn",
   "tool_call",
@@ -21427,13 +21426,8 @@ var NORMALIZED_TRACE_EVENT_TYPES = [
   "final_response",
   "error"
 ];
-var NORMALIZED_TOOL_STATUSES = ["ok", "error", "timeout", "cancelled", "unknown"];
-var NORMALIZED_REDACTION_LEVELS = ["none", "partial", "full"];
-var TRACE_SCHEMA_VERSION = NORMALIZED_TRAJECTORY_SCHEMA_VERSION;
-var TRACE_SOURCE_KINDS = NORMALIZED_TRACE_SOURCE_KINDS;
-var TRACE_EVENT_TYPES = NORMALIZED_TRACE_EVENT_TYPES;
-var TRACE_TOOL_STATUSES = NORMALIZED_TOOL_STATUSES;
-var TRACE_REDACTION_LEVELS = NORMALIZED_REDACTION_LEVELS;
+var TRACE_TOOL_STATUSES = ["ok", "error", "timeout", "cancelled", "unknown"];
+var TRACE_REDACTION_LEVELS = ["none", "partial", "full"];
 function omitUndefinedProperties(value) {
   return Object.fromEntries(
     Object.entries(value).filter(([, property]) => property !== void 0)
@@ -21446,20 +21440,20 @@ var TokenUsageWireSchema = external_exports.object({
   cached: external_exports.number().optional(),
   reasoning: external_exports.number().optional()
 });
-var NormalizedRedactionStateWireSchema = external_exports.object({
-  level: external_exports.enum(NORMALIZED_REDACTION_LEVELS),
+var TraceRedactionStateWireSchema = external_exports.object({
+  level: external_exports.enum(TRACE_REDACTION_LEVELS),
   fields: external_exports.array(external_exports.string()).optional(),
   reason: external_exports.string().optional()
 });
-var NormalizedTraceErrorWireSchema = external_exports.object({
+var TraceErrorWireSchema = external_exports.object({
   message: external_exports.string(),
   name: external_exports.string().optional(),
   code: external_exports.string().optional(),
   stack: external_exports.string().optional(),
   metadata: MetadataWireSchema.optional()
 });
-var NormalizedTraceSourceWireSchema = external_exports.object({
-  kind: external_exports.enum(NORMALIZED_TRACE_SOURCE_KINDS),
+var TraceSourceWireSchema = external_exports.object({
+  kind: external_exports.enum(TRACE_SOURCE_KINDS),
   path: external_exports.string().optional(),
   url: external_exports.string().optional(),
   provider: external_exports.string().optional(),
@@ -21467,7 +21461,7 @@ var NormalizedTraceSourceWireSchema = external_exports.object({
   version: external_exports.string().optional(),
   metadata: MetadataWireSchema.optional()
 });
-var NormalizedTraceSessionWireSchema = external_exports.object({
+var TraceSessionWireSchema = external_exports.object({
   session_id: external_exports.string().optional(),
   conversation_id: external_exports.string().optional(),
   cwd: external_exports.string().optional(),
@@ -21475,14 +21469,14 @@ var NormalizedTraceSessionWireSchema = external_exports.object({
   ended_at: external_exports.string().optional(),
   metadata: MetadataWireSchema.optional()
 });
-var NormalizedTraceBranchWireSchema = external_exports.object({
+var TraceBranchWireSchema = external_exports.object({
   selected_leaf_id: external_exports.string().optional(),
   selected_path_ids: external_exports.array(external_exports.string()).optional(),
   included_event_ids: external_exports.array(external_exports.string()).optional(),
   omitted_event_ids: external_exports.array(external_exports.string()).optional(),
   selection_reason: external_exports.string().optional()
 });
-var NormalizedTraceSourceRefWireSchema = external_exports.object({
+var TraceSourceRefWireSchema = external_exports.object({
   event_id: external_exports.string().optional(),
   message_id: external_exports.string().optional(),
   span_id: external_exports.string().optional(),
@@ -21492,7 +21486,7 @@ var NormalizedTraceSourceRefWireSchema = external_exports.object({
   line: external_exports.number().int().nonnegative().optional(),
   metadata: MetadataWireSchema.optional()
 });
-var NormalizedRawEvidenceWireSchema = external_exports.object({
+var TraceRawEvidenceWireSchema = external_exports.object({
   kind: external_exports.string(),
   ref: external_exports.string().optional(),
   media_type: external_exports.string().optional(),
@@ -21500,55 +21494,54 @@ var NormalizedRawEvidenceWireSchema = external_exports.object({
   redacted: external_exports.boolean().optional(),
   metadata: MetadataWireSchema.optional()
 });
-var NormalizedTraceMessageWireSchema = external_exports.object({
+var TraceMessageWireSchema = external_exports.object({
   role: external_exports.string(),
   name: external_exports.string().optional(),
   content: external_exports.unknown().optional(),
-  redaction: NormalizedRedactionStateWireSchema.optional(),
+  redaction: TraceRedactionStateWireSchema.optional(),
   token_usage: TokenUsageWireSchema.optional(),
   metadata: MetadataWireSchema.optional()
 });
-var NormalizedTraceModelWireSchema = external_exports.object({
+var TraceModelWireSchema = external_exports.object({
   provider: external_exports.string().optional(),
   name: external_exports.string().optional(),
   invocation_id: external_exports.string().optional(),
   token_usage: TokenUsageWireSchema.optional(),
   metadata: MetadataWireSchema.optional()
 });
-var NormalizedTraceToolWireSchema = external_exports.object({
+var TraceToolWireSchema = external_exports.object({
   name: external_exports.string(),
   call_id: external_exports.string().optional(),
   input: external_exports.unknown().optional(),
   output: external_exports.unknown().optional(),
-  status: external_exports.enum(NORMALIZED_TOOL_STATUSES).optional(),
-  error: NormalizedTraceErrorWireSchema.optional(),
-  redaction: NormalizedRedactionStateWireSchema.optional(),
+  status: external_exports.enum(TRACE_TOOL_STATUSES).optional(),
+  error: TraceErrorWireSchema.optional(),
+  redaction: TraceRedactionStateWireSchema.optional(),
   metadata: MetadataWireSchema.optional()
 });
-var NormalizedTraceEventWireSchema = external_exports.object({
+var TraceEventWireSchema = external_exports.object({
   event_id: external_exports.string(),
   parent_event_id: external_exports.string().optional(),
   ordinal: external_exports.number().int().nonnegative(),
-  type: external_exports.enum(NORMALIZED_TRACE_EVENT_TYPES),
+  type: external_exports.enum(TRACE_EVENT_TYPES),
   timestamp: external_exports.string().optional(),
   duration_ms: external_exports.number().nonnegative().optional(),
   duration_inferred: external_exports.boolean().optional(),
   turn_index: external_exports.number().int().nonnegative().optional(),
-  message: NormalizedTraceMessageWireSchema.optional(),
-  model: NormalizedTraceModelWireSchema.optional(),
-  tool: NormalizedTraceToolWireSchema.optional(),
-  error: NormalizedTraceErrorWireSchema.optional(),
-  source_ref: NormalizedTraceSourceRefWireSchema.optional(),
-  raw_evidence: external_exports.array(NormalizedRawEvidenceWireSchema).optional(),
-  redaction: NormalizedRedactionStateWireSchema.optional(),
+  message: TraceMessageWireSchema.optional(),
+  model: TraceModelWireSchema.optional(),
+  tool: TraceToolWireSchema.optional(),
+  error: TraceErrorWireSchema.optional(),
+  source_ref: TraceSourceRefWireSchema.optional(),
+  raw_evidence: external_exports.array(TraceRawEvidenceWireSchema).optional(),
+  redaction: TraceRedactionStateWireSchema.optional(),
   metadata: MetadataWireSchema.optional()
 });
-var NormalizedTrajectoryWireSchema = external_exports.object({
-  schema_version: external_exports.literal(NORMALIZED_TRAJECTORY_SCHEMA_VERSION),
-  source: NormalizedTraceSourceWireSchema,
-  session: NormalizedTraceSessionWireSchema,
-  branch: NormalizedTraceBranchWireSchema.optional(),
-  events: external_exports.array(NormalizedTraceEventWireSchema),
+var TraceArtifactWireSchema = external_exports.object({
+  source: TraceSourceWireSchema,
+  session: TraceSessionWireSchema,
+  branch: TraceBranchWireSchema.optional(),
+  events: external_exports.array(TraceEventWireSchema),
   token_usage: TokenUsageWireSchema.optional(),
   cost_usd: external_exports.number().optional(),
   duration_ms: external_exports.number().optional(),
@@ -21556,43 +21549,29 @@ var NormalizedTrajectoryWireSchema = external_exports.object({
   ended_at: external_exports.string().optional(),
   metadata: MetadataWireSchema.optional()
 });
-var TraceRedactionStateWireSchema = NormalizedRedactionStateWireSchema;
-var TraceErrorWireSchema = NormalizedTraceErrorWireSchema;
-var TraceSourceWireSchema = NormalizedTraceSourceWireSchema;
-var TraceSessionWireSchema = NormalizedTraceSessionWireSchema;
-var TraceBranchWireSchema = NormalizedTraceBranchWireSchema;
-var TraceSourceRefWireSchema = NormalizedTraceSourceRefWireSchema;
-var TraceRawEvidenceWireSchema = NormalizedRawEvidenceWireSchema;
-var TraceMessageWireSchema = NormalizedTraceMessageWireSchema;
-var TraceModelWireSchema = NormalizedTraceModelWireSchema;
-var TraceToolWireSchema = NormalizedTraceToolWireSchema;
-var TraceEventWireSchema = NormalizedTraceEventWireSchema;
-var TraceArtifactWireSchema = NormalizedTrajectoryWireSchema;
-function toNormalizedTrajectoryWire(trajectory) {
-  return NormalizedTrajectoryWireSchema.parse(
+function toTraceArtifactWire(artifact) {
+  return TraceArtifactWireSchema.parse(
     omitUndefinedProperties({
-      schema_version: trajectory.schemaVersion,
-      source: toNormalizedTraceSourceWire(trajectory.source),
-      session: toNormalizedTraceSessionWire(trajectory.session),
-      branch: trajectory.branch ? toNormalizedTraceBranchWire(trajectory.branch) : void 0,
-      events: trajectory.events.map(toNormalizedTraceEventWire),
-      token_usage: trajectory.tokenUsage,
-      cost_usd: trajectory.costUsd,
-      duration_ms: trajectory.durationMs,
-      started_at: trajectory.startedAt,
-      ended_at: trajectory.endedAt,
-      metadata: trajectory.metadata
+      source: toTraceSourceWire(artifact.source),
+      session: toTraceSessionWire(artifact.session),
+      branch: artifact.branch ? toTraceBranchWire(artifact.branch) : void 0,
+      events: artifact.events.map(toTraceEventWire),
+      token_usage: artifact.tokenUsage,
+      cost_usd: artifact.costUsd,
+      duration_ms: artifact.durationMs,
+      started_at: artifact.startedAt,
+      ended_at: artifact.endedAt,
+      metadata: artifact.metadata
     })
   );
 }
-function fromNormalizedTrajectoryWire(input) {
-  const wire = NormalizedTrajectoryWireSchema.parse(input);
+function fromTraceArtifactWire(input) {
+  const wire = TraceArtifactWireSchema.parse(input);
   return {
-    schemaVersion: wire.schema_version,
-    source: fromNormalizedTraceSourceWire(wire.source),
-    session: fromNormalizedTraceSessionWire(wire.session),
-    branch: wire.branch ? fromNormalizedTraceBranchWire(wire.branch) : void 0,
-    events: wire.events.map(fromNormalizedTraceEventWire),
+    source: fromTraceSourceWire(wire.source),
+    session: fromTraceSessionWire(wire.session),
+    branch: wire.branch ? fromTraceBranchWire(wire.branch) : void 0,
+    events: wire.events.map(fromTraceEventWire),
     tokenUsage: wire.token_usage,
     costUsd: wire.cost_usd,
     durationMs: wire.duration_ms,
@@ -21601,13 +21580,7 @@ function fromNormalizedTrajectoryWire(input) {
     metadata: wire.metadata
   };
 }
-function toTraceArtifactWire(artifact) {
-  return toNormalizedTrajectoryWire(artifact);
-}
-function fromTraceArtifactWire(input) {
-  return fromNormalizedTrajectoryWire(input);
-}
-function toNormalizedTraceSourceWire(source) {
+function toTraceSourceWire(source) {
   return omitUndefinedProperties({
     kind: source.kind,
     path: source.path,
@@ -21618,7 +21591,7 @@ function toNormalizedTraceSourceWire(source) {
     metadata: source.metadata
   });
 }
-function fromNormalizedTraceSourceWire(source) {
+function fromTraceSourceWire(source) {
   return {
     kind: source.kind,
     path: source.path,
@@ -21629,7 +21602,7 @@ function fromNormalizedTraceSourceWire(source) {
     metadata: source.metadata
   };
 }
-function toNormalizedTraceSessionWire(session) {
+function toTraceSessionWire(session) {
   return omitUndefinedProperties({
     session_id: session.sessionId,
     conversation_id: session.conversationId,
@@ -21639,7 +21612,7 @@ function toNormalizedTraceSessionWire(session) {
     metadata: session.metadata
   });
 }
-function fromNormalizedTraceSessionWire(session) {
+function fromTraceSessionWire(session) {
   return {
     sessionId: session.session_id,
     conversationId: session.conversation_id,
@@ -21649,7 +21622,7 @@ function fromNormalizedTraceSessionWire(session) {
     metadata: session.metadata
   };
 }
-function toNormalizedTraceBranchWire(branch) {
+function toTraceBranchWire(branch) {
   return omitUndefinedProperties({
     selected_leaf_id: branch.selectedLeafId,
     selected_path_ids: branch.selectedPathIds,
@@ -21658,7 +21631,7 @@ function toNormalizedTraceBranchWire(branch) {
     selection_reason: branch.selectionReason
   });
 }
-function fromNormalizedTraceBranchWire(branch) {
+function fromTraceBranchWire(branch) {
   return {
     selectedLeafId: branch.selected_leaf_id,
     selectedPathIds: branch.selected_path_ids,
@@ -21667,8 +21640,8 @@ function fromNormalizedTraceBranchWire(branch) {
     selectionReason: branch.selection_reason
   };
 }
-function toNormalizedTraceEventWire(event) {
-  return NormalizedTraceEventWireSchema.parse(
+function toTraceEventWire(event) {
+  return TraceEventWireSchema.parse(
     omitUndefinedProperties({
       event_id: event.eventId,
       parent_event_id: event.parentEventId,
@@ -21678,18 +21651,18 @@ function toNormalizedTraceEventWire(event) {
       duration_ms: event.durationMs,
       duration_inferred: event.durationInferred,
       turn_index: event.turnIndex,
-      message: event.message ? toNormalizedTraceMessageWire(event.message) : void 0,
-      model: event.model ? toNormalizedTraceModelWire(event.model) : void 0,
-      tool: event.tool ? toNormalizedTraceToolWire(event.tool) : void 0,
-      error: event.error ? toNormalizedTraceErrorWire(event.error) : void 0,
-      source_ref: event.sourceRef ? toNormalizedTraceSourceRefWire(event.sourceRef) : void 0,
-      raw_evidence: event.rawEvidence?.map(toNormalizedRawEvidenceWire),
+      message: event.message ? toTraceMessageWire(event.message) : void 0,
+      model: event.model ? toTraceModelWire(event.model) : void 0,
+      tool: event.tool ? toTraceToolWire(event.tool) : void 0,
+      error: event.error ? toTraceErrorWire(event.error) : void 0,
+      source_ref: event.sourceRef ? toTraceSourceRefWire(event.sourceRef) : void 0,
+      raw_evidence: event.rawEvidence?.map(toTraceRawEvidenceWire),
       redaction: event.redaction,
       metadata: event.metadata
     })
   );
 }
-function fromNormalizedTraceEventWire(event) {
+function fromTraceEventWire(event) {
   return {
     eventId: event.event_id,
     parentEventId: event.parent_event_id,
@@ -21699,17 +21672,17 @@ function fromNormalizedTraceEventWire(event) {
     durationMs: event.duration_ms,
     durationInferred: event.duration_inferred,
     turnIndex: event.turn_index,
-    message: event.message ? fromNormalizedTraceMessageWire(event.message) : void 0,
-    model: event.model ? fromNormalizedTraceModelWire(event.model) : void 0,
-    tool: event.tool ? fromNormalizedTraceToolWire(event.tool) : void 0,
-    error: event.error ? fromNormalizedTraceErrorWire(event.error) : void 0,
-    sourceRef: event.source_ref ? fromNormalizedTraceSourceRefWire(event.source_ref) : void 0,
-    rawEvidence: event.raw_evidence?.map(fromNormalizedRawEvidenceWire),
+    message: event.message ? fromTraceMessageWire(event.message) : void 0,
+    model: event.model ? fromTraceModelWire(event.model) : void 0,
+    tool: event.tool ? fromTraceToolWire(event.tool) : void 0,
+    error: event.error ? fromTraceErrorWire(event.error) : void 0,
+    sourceRef: event.source_ref ? fromTraceSourceRefWire(event.source_ref) : void 0,
+    rawEvidence: event.raw_evidence?.map(fromTraceRawEvidenceWire),
     redaction: event.redaction,
     metadata: event.metadata
   };
 }
-function toNormalizedTraceMessageWire(message) {
+function toTraceMessageWire(message) {
   return omitUndefinedProperties({
     role: message.role,
     name: message.name,
@@ -21719,7 +21692,7 @@ function toNormalizedTraceMessageWire(message) {
     metadata: message.metadata
   });
 }
-function fromNormalizedTraceMessageWire(message) {
+function fromTraceMessageWire(message) {
   return {
     role: message.role,
     name: message.name,
@@ -21729,7 +21702,7 @@ function fromNormalizedTraceMessageWire(message) {
     metadata: message.metadata
   };
 }
-function toNormalizedTraceModelWire(model) {
+function toTraceModelWire(model) {
   return omitUndefinedProperties({
     provider: model.provider,
     name: model.name,
@@ -21738,7 +21711,7 @@ function toNormalizedTraceModelWire(model) {
     metadata: model.metadata
   });
 }
-function fromNormalizedTraceModelWire(model) {
+function fromTraceModelWire(model) {
   return {
     provider: model.provider,
     name: model.name,
@@ -21747,7 +21720,7 @@ function fromNormalizedTraceModelWire(model) {
     metadata: model.metadata
   };
 }
-function toNormalizedTraceToolWire(tool) {
+function toTraceToolWire(tool) {
   return omitUndefinedProperties({
     name: tool.name,
     call_id: tool.callId,
@@ -21759,7 +21732,7 @@ function toNormalizedTraceToolWire(tool) {
     metadata: tool.metadata
   });
 }
-function fromNormalizedTraceToolWire(tool) {
+function fromTraceToolWire(tool) {
   return {
     name: tool.name,
     callId: tool.call_id,
@@ -21771,7 +21744,7 @@ function fromNormalizedTraceToolWire(tool) {
     metadata: tool.metadata
   };
 }
-function toNormalizedTraceErrorWire(error40) {
+function toTraceErrorWire(error40) {
   return omitUndefinedProperties({
     message: error40.message,
     name: error40.name,
@@ -21780,7 +21753,7 @@ function toNormalizedTraceErrorWire(error40) {
     metadata: error40.metadata
   });
 }
-function fromNormalizedTraceErrorWire(error40) {
+function fromTraceErrorWire(error40) {
   return {
     message: error40.message,
     name: error40.name,
@@ -21789,7 +21762,7 @@ function fromNormalizedTraceErrorWire(error40) {
     metadata: error40.metadata
   };
 }
-function toNormalizedTraceSourceRefWire(sourceRef) {
+function toTraceSourceRefWire(sourceRef) {
   return omitUndefinedProperties({
     event_id: sourceRef.eventId,
     message_id: sourceRef.messageId,
@@ -21801,7 +21774,7 @@ function toNormalizedTraceSourceRefWire(sourceRef) {
     metadata: sourceRef.metadata
   });
 }
-function fromNormalizedTraceSourceRefWire(sourceRef) {
+function fromTraceSourceRefWire(sourceRef) {
   return {
     eventId: sourceRef.event_id,
     messageId: sourceRef.message_id,
@@ -21813,7 +21786,7 @@ function fromNormalizedTraceSourceRefWire(sourceRef) {
     metadata: sourceRef.metadata
   };
 }
-function toNormalizedRawEvidenceWire(evidence) {
+function toTraceRawEvidenceWire(evidence) {
   return omitUndefinedProperties({
     kind: evidence.kind,
     ref: evidence.ref,
@@ -21823,7 +21796,7 @@ function toNormalizedRawEvidenceWire(evidence) {
     metadata: evidence.metadata
   });
 }
-function fromNormalizedRawEvidenceWire(evidence) {
+function fromTraceRawEvidenceWire(evidence) {
   return {
     kind: evidence.kind,
     ref: evidence.ref,
@@ -21951,7 +21924,6 @@ function buildTraceFromMessages(options = {}) {
     });
   }
   return {
-    schemaVersion: TRACE_SCHEMA_VERSION,
     eventCount: summary.eventCount,
     toolCalls: summary.toolCalls,
     errorCount: summary.errorCount + (options.error ? 1 : 0),
@@ -22057,15 +22029,15 @@ function computeTraceSummary(messages) {
     endTime: latestEnd?.toISOString()
   };
 }
-function getSelectedTrajectoryEvents(trajectory) {
-  if (!trajectory.branch?.includedEventIds || trajectory.branch.includedEventIds.length === 0) {
-    return trajectory.events;
+function getSelectedTraceArtifactEvents(artifact) {
+  if (!artifact.branch?.includedEventIds || artifact.branch.includedEventIds.length === 0) {
+    return artifact.events;
   }
-  const includedIds = new Set(trajectory.branch.includedEventIds);
-  return trajectory.events.filter((event) => includedIds.has(event.eventId));
+  const includedIds = new Set(artifact.branch.includedEventIds);
+  return artifact.events.filter((event) => includedIds.has(event.eventId));
 }
-function computeTraceSummaryFromTrajectory(trajectory) {
-  const selectedEvents = getSelectedTrajectoryEvents(trajectory);
+function computeTraceSummaryFromTraceArtifact(artifact) {
+  const selectedEvents = getSelectedTraceArtifactEvents(artifact);
   const hasModelTurnEvents = selectedEvents.some((event) => event.type === "model_turn");
   const toolCallCounts = {};
   const toolDurations = {};
@@ -22111,11 +22083,163 @@ function computeTraceSummaryFromTrajectory(trajectory) {
       llmCallCount,
       ...hasAnyDuration ? { toolDurations } : {}
     },
-    tokenUsage: trajectory.tokenUsage,
-    costUsd: trajectory.costUsd,
-    durationMs: trajectory.durationMs,
-    startTime: trajectory.startedAt ?? earliestStart?.toISOString(),
-    endTime: trajectory.endedAt ?? latestEnd?.toISOString()
+    tokenUsage: artifact.tokenUsage,
+    costUsd: artifact.costUsd,
+    durationMs: artifact.durationMs,
+    startTime: artifact.startedAt ?? earliestStart?.toISOString(),
+    endTime: artifact.endedAt ?? latestEnd?.toISOString()
+  };
+}
+function eventEndIso(event) {
+  const start = parseTimestamp(event.timestamp);
+  return deriveEventEnd(start, event.durationMs)?.toISOString();
+}
+function messageFromTraceArtifactEvent(event, fallbackRole = "assistant") {
+  return {
+    role: event.message?.role ?? fallbackRole,
+    name: event.message?.name,
+    content: event.message?.content,
+    startTime: event.timestamp,
+    endTime: eventEndIso(event),
+    durationMs: event.durationMs,
+    metadata: omitUndefinedProperties({
+      event_id: event.eventId,
+      source_ref: event.sourceRef,
+      ...event.message?.metadata
+    }),
+    tokenUsage: event.message?.tokenUsage ?? event.model?.tokenUsage
+  };
+}
+function toolCallFromTraceArtifactEvent(event) {
+  const tool = event.tool;
+  if (!tool) {
+    return void 0;
+  }
+  return {
+    tool: tool.name,
+    id: tool.callId,
+    input: tool.input,
+    output: tool.output,
+    startTime: event.timestamp,
+    endTime: eventEndIso(event),
+    durationMs: event.durationMs
+  };
+}
+function attachTraceArtifactToolCall(messages, eventMessageIndex, event) {
+  const toolCall = toolCallFromTraceArtifactEvent(event);
+  if (!toolCall) {
+    return;
+  }
+  const parentIndex = event.parentEventId ? eventMessageIndex.get(event.parentEventId) : void 0;
+  let fallbackIndex = -1;
+  for (let index = messages.length - 1; index >= 0; index--) {
+    if (messages[index].role === "assistant") {
+      fallbackIndex = index;
+      break;
+    }
+  }
+  const messageIndex = parentIndex ?? fallbackIndex;
+  if (messageIndex >= 0) {
+    const message = messages[messageIndex];
+    messages[messageIndex] = {
+      ...message,
+      toolCalls: [...message.toolCalls ?? [], toolCall]
+    };
+    return;
+  }
+  const syntheticIndex = messages.length;
+  messages.push({
+    role: "assistant",
+    startTime: event.timestamp,
+    endTime: eventEndIso(event),
+    durationMs: event.durationMs,
+    metadata: { source: "trace_artifact_tool_call", event_id: event.eventId },
+    toolCalls: [toolCall]
+  });
+  eventMessageIndex.set(event.eventId, syntheticIndex);
+}
+function mergeTraceArtifactFinalResponse(messages, eventMessageIndex, event) {
+  if (!event.parentEventId || !event.message) {
+    return false;
+  }
+  const parentIndex = eventMessageIndex.get(event.parentEventId);
+  if (parentIndex === void 0) {
+    return false;
+  }
+  const parent = messages[parentIndex];
+  const finalMessage = messageFromTraceArtifactEvent(event);
+  eventMessageIndex.set(event.eventId, parentIndex);
+  if (sameMessageContent(parent, finalMessage)) {
+    return true;
+  }
+  if (parent.content === void 0 && finalMessage.content !== void 0) {
+    messages[parentIndex] = {
+      ...parent,
+      name: parent.name ?? finalMessage.name,
+      content: finalMessage.content,
+      endTime: parent.endTime ?? finalMessage.endTime,
+      tokenUsage: parent.tokenUsage ?? finalMessage.tokenUsage,
+      metadata: omitUndefinedProperties({
+        ...parent.metadata,
+        final_response_event_id: event.eventId,
+        final_response_source_ref: event.sourceRef
+      })
+    };
+    return true;
+  }
+  return false;
+}
+function traceFromTraceArtifact(artifact) {
+  const events = [...getSelectedTraceArtifactEvents(artifact)].sort(
+    (first, second) => first.ordinal - second.ordinal
+  );
+  const messages = [];
+  const eventMessageIndex = /* @__PURE__ */ new Map();
+  for (const event of events) {
+    if (event.type === "message" && event.message) {
+      eventMessageIndex.set(event.eventId, messages.length);
+      messages.push(messageFromTraceArtifactEvent(event));
+      continue;
+    }
+    if (event.type === "model_turn") {
+      eventMessageIndex.set(event.eventId, messages.length);
+      messages.push(messageFromTraceArtifactEvent(event, "assistant"));
+      continue;
+    }
+    if (event.type === "final_response" && event.message) {
+      if (mergeTraceArtifactFinalResponse(messages, eventMessageIndex, event)) {
+        continue;
+      }
+      eventMessageIndex.set(event.eventId, messages.length);
+      messages.push(messageFromTraceArtifactEvent(event));
+      continue;
+    }
+    if (event.type === "tool_call") {
+      attachTraceArtifactToolCall(messages, eventMessageIndex, event);
+    }
+  }
+  const computed = computeTraceSummaryFromTraceArtifact(artifact);
+  const conversationId = artifact.session.sessionId ?? artifact.session.conversationId;
+  return {
+    eventCount: computed.trace.eventCount,
+    toolCalls: computed.trace.toolCalls,
+    errorCount: computed.trace.errorCount,
+    llmCallCount: computed.trace.llmCallCount,
+    ...computed.trace.toolDurations ? { toolDurations: computed.trace.toolDurations } : {},
+    messages,
+    events,
+    tokenUsage: computed.tokenUsage,
+    costUsd: computed.costUsd,
+    durationMs: computed.durationMs,
+    startTime: computed.startTime,
+    endTime: computed.endTime,
+    metadata: {
+      ...artifact.source.provider ? { provider: artifact.source.provider } : {},
+      ...conversationId ? { provider_session_id: conversationId } : {},
+      source: artifact.source,
+      session: artifact.session,
+      ...artifact.metadata
+    }
   };
 }
 function parseTimestamp(timestamp) {
@@ -30608,7 +30732,6 @@ function traceEnvelopeToToolTrajectoryView(envelope) {
     };
   });
   return {
-    schemaVersion: NORMALIZED_TRAJECTORY_SCHEMA_VERSION,
     traceId: envelope.trace.traceId,
     rootSpanId: envelope.trace.rootSpanId,
     tools
@@ -30710,7 +30833,6 @@ function traceEnvelopeToTraceArtifact(envelope) {
   }
   const summary = traceEnvelopeToTraceSummary(envelope);
   return {
-    schemaVersion: NORMALIZED_TRAJECTORY_SCHEMA_VERSION,
     source: {
       kind: envelope.source.kind,
       path: envelope.source.path,
@@ -38605,7 +38727,7 @@ async function loadTestSuite(evalFilePath, repoRoot, options) {
     return { tests: await loadTestsFromAgentSkills(evalFilePath) };
   }
   if (format === "typescript") {
-    const { loadTsEvalSuite: loadTsEvalSuite2 } = await import("./ts-eval-loader-ZVL6CGTE-TZYZX3QS.js");
+    const { loadTsEvalSuite: loadTsEvalSuite2 } = await import("./ts-eval-loader-UPFWPMQO-SKZNUXPB.js");
     return loadTsEvalSuite2(evalFilePath, resolveToAbsolutePath(repoRoot), options);
   }
   const { tests, parsed, suiteWorkspacePath } = await loadTestsFromYaml(
@@ -38640,7 +38762,7 @@ async function loadTests(evalFilePath, repoRoot, options) {
     return loadTestsFromAgentSkills(evalFilePath);
   }
   if (format === "typescript") {
-    const { loadTsEvalSuite: loadTsEvalSuite2 } = await import("./ts-eval-loader-ZVL6CGTE-TZYZX3QS.js");
+    const { loadTsEvalSuite: loadTsEvalSuite2 } = await import("./ts-eval-loader-UPFWPMQO-SKZNUXPB.js");
     const suite = await loadTsEvalSuite2(evalFilePath, resolveToAbsolutePath(repoRoot), options);
     return suite.tests;
   }
@@ -39592,6 +39714,7 @@ async function gradePreparedEvalCase(options) {
     workspacePath,
     baselineCommit,
     response,
+    trace: preparedTrace,
     verbose,
     threshold: caseThreshold,
     preparedAttempt
@@ -39629,10 +39752,10 @@ async function gradePreparedEvalCase(options) {
       }
     }
   }
-  const candidate = response ?? "";
+  const candidate = response ?? extractLastAssistantContent(preparedTrace?.messages ?? []) ?? "";
   const input = buildResultInput(promptInputs);
-  const outputMessages = candidate.length > 0 ? [{ role: "assistant", content: candidate }] : [];
-  const resultTrace = buildTraceFromMessages({
+  const outputMessages = preparedTrace?.messages ?? (candidate.length > 0 ? [{ role: "assistant", content: candidate }] : []);
+  const resultTrace = preparedTrace ?? buildTraceFromMessages({
     input,
     output: outputMessages,
     finalOutput: candidate,
@@ -39654,6 +39777,13 @@ async function gradePreparedEvalCase(options) {
       promptInputs,
       now: gradeStartedAt,
       agentTimeoutMs,
+      output: preparedTrace ? outputMessages : void 0,
+      trace: preparedTrace ? resultTrace : void 0,
+      costUsd: preparedTrace ? resultTrace.costUsd : void 0,
+      durationMs: preparedTrace ? resultTrace.durationMs : void 0,
+      tokenUsage: preparedTrace ? resultTrace.tokenUsage : void 0,
+      startTime: preparedTrace ? resultTrace.startTime : void 0,
+      endTime: preparedTrace ? resultTrace.endTime : void 0,
       targetResolver: runtime.targetResolver,
       availableTargets: runtime.availableTargets,
       fileChanges,
@@ -42518,6 +42648,7 @@ function toIndexPreparedAttempt(value) {
     prepared_dir: value.preparedDir,
     workspace_path: value.workspacePath,
     prompt_path: value.promptPath,
+    trace_path: value.tracePath,
     target: value.target,
     prepared_at: value.preparedAt,
     setup_status: value.setupStatus,
@@ -43626,28 +43757,10 @@ export {
   extractImageBlocks,
   CompositeGrader,
   CostGrader,
-  NORMALIZED_TRAJECTORY_SCHEMA_VERSION,
-  NORMALIZED_TRACE_SOURCE_KINDS,
-  NORMALIZED_TRACE_EVENT_TYPES,
-  NORMALIZED_TOOL_STATUSES,
-  NORMALIZED_REDACTION_LEVELS,
-  TRACE_SCHEMA_VERSION,
   TRACE_SOURCE_KINDS,
   TRACE_EVENT_TYPES,
   TRACE_TOOL_STATUSES,
   TRACE_REDACTION_LEVELS,
-  NormalizedRedactionStateWireSchema,
-  NormalizedTraceErrorWireSchema,
-  NormalizedTraceSourceWireSchema,
-  NormalizedTraceSessionWireSchema,
-  NormalizedTraceBranchWireSchema,
-  NormalizedTraceSourceRefWireSchema,
-  NormalizedRawEvidenceWireSchema,
-  NormalizedTraceMessageWireSchema,
-  NormalizedTraceModelWireSchema,
-  NormalizedTraceToolWireSchema,
-  NormalizedTraceEventWireSchema,
-  NormalizedTrajectoryWireSchema,
   TraceRedactionStateWireSchema,
   TraceErrorWireSchema,
   TraceSourceWireSchema,
@@ -43660,15 +43773,14 @@ export {
   TraceToolWireSchema,
   TraceEventWireSchema,
   TraceArtifactWireSchema,
-  toNormalizedTrajectoryWire,
-  fromNormalizedTrajectoryWire,
   toTraceArtifactWire,
   fromTraceArtifactWire,
   buildTraceFromMessages,
   appendErrorEventToTrace,
   computeTraceSummary,
-  getSelectedTrajectoryEvents,
-  computeTraceSummaryFromTrajectory,
+  getSelectedTraceArtifactEvents,
+  computeTraceSummaryFromTraceArtifact,
+  traceFromTraceArtifact,
   DEFAULT_EXPLORATION_TOOLS,
   explorationRatio,
   tokensPerTool,
@@ -43842,4 +43954,4 @@ export {
   loadTsEvalFile,
   loadTsEvalSuite
 };
-//# sourceMappingURL=chunk-ENHX2CCS.js.map
+//# sourceMappingURL=chunk-QCF3LUI7.js.map