braintrust 3.23.0 → 3.24.0

package/dist/instrumentation/index.js

@@ -61,6 +61,7 @@ var DefaultChannel = class {
   constructor(name) {
     this.name = name;
   }
+  name;
   hasSubscribers = false;
   subscribe(_subscription) {
   }
@@ -1337,6 +1338,7 @@ var SpanComponentsV3 = class _SpanComponentsV3 {
   constructor(data) {
     this.data = data;
   }
+  data;
   toStr() {
     const jsonObj = {
       compute_object_metadata_args: this.data.compute_object_metadata_args || void 0,
@@ -1757,6 +1759,7 @@ var SpanComponentsV4 = class _SpanComponentsV4 {
   constructor(data) {
     this.data = data;
   }
+  data;
   toStr() {
     const jsonObj = {
       compute_object_metadata_args: this.data.compute_object_metadata_args || void 0,
@@ -4916,6 +4919,97 @@ var SpanCache = class {
   }
 };
 
+// src/span-origin.ts
+var SDK_VERSION = true ? "3.24.0" : "0.0.0";
+function detectSpanOriginEnvironment(explicit) {
+  if (explicit) return explicit;
+  const envType = isomorph_default.getEnv("BRAINTRUST_ENVIRONMENT_TYPE");
+  const envName = isomorph_default.getEnv("BRAINTRUST_ENVIRONMENT_NAME");
+  if (envType || envName) {
+    return {
+      ...envType ? { type: envType } : {},
+      ...envName ? { name: envName } : {}
+    };
+  }
+  const ci = firstPresent([
+    ["GITHUB_ACTIONS", "github_actions"],
+    ["GITLAB_CI", "gitlab_ci"],
+    ["CIRCLECI", "circleci"],
+    ["BUILDKITE", "buildkite"],
+    ["JENKINS_URL", "jenkins"],
+    ["JENKINS_HOME", "jenkins"],
+    ["TF_BUILD", "azure_pipelines"],
+    ["TEAMCITY_VERSION", "teamcity"],
+    ["TRAVIS", "travis"],
+    ["BITBUCKET_BUILD_NUMBER", "bitbucket"]
+  ]);
+  if (ci) return { type: "ci", name: ci };
+  if (isomorph_default.getEnv("CI")) return { type: "ci", name: "ci" };
+  const earlyServer = firstPresent([
+    ["VERCEL", "vercel"],
+    ["NETLIFY", "netlify"]
+  ]);
+  if (earlyServer) return { type: "server", name: earlyServer };
+  if (isomorph_default.getEnv("ECS_CONTAINER_METADATA_URI") || isomorph_default.getEnv("ECS_CONTAINER_METADATA_URI_V4")) {
+    return { type: "server", name: "ecs" };
+  }
+  const awsExecutionEnv = isomorph_default.getEnv("AWS_EXECUTION_ENV");
+  if (awsExecutionEnv?.startsWith("AWS_ECS_")) {
+    return { type: "server", name: "ecs" };
+  }
+  if (awsExecutionEnv?.startsWith("AWS_Lambda_")) {
+    return { type: "server", name: "aws_lambda" };
+  }
+  if (isomorph_default.getEnv("AWS_LAMBDA_FUNCTION_NAME")) {
+    return { type: "server", name: "aws_lambda" };
+  }
+  const server = firstPresent([
+    ["K_SERVICE", "cloud_run"],
+    ["FUNCTION_TARGET", "gcp_functions"],
+    ["KUBERNETES_SERVICE_HOST", "kubernetes"],
+    ["DYNO", "heroku"],
+    ["FLY_APP_NAME", "fly"],
+    ["RAILWAY_ENVIRONMENT", "railway"],
+    ["RENDER_SERVICE_NAME", "render"]
+  ]);
+  if (server) return { type: "server", name: server };
+  return deploymentModeEnvironment("NODE_ENV", isomorph_default.getEnv("NODE_ENV"));
+}
+function makeSpanOrigin(instrumentationName, environment) {
+  return {
+    name: "braintrust.sdk.javascript",
+    version: SDK_VERSION,
+    instrumentation: { name: instrumentationName },
+    ...environment ? { environment } : {}
+  };
+}
+function mergeSpanOriginContext(context, instrumentationName, environment) {
+  const next = { ...context ?? {} };
+  const current = isObject2(next.span_origin) ? { ...next.span_origin } : {};
+  next.span_origin = {
+    ...makeSpanOrigin(instrumentationName, environment),
+    ...current
+  };
+  return next;
+}
+function firstPresent(entries) {
+  return entries.find(([key]) => Boolean(isomorph_default.getEnv(key)))?.[1];
+}
+function deploymentModeEnvironment(_key, value) {
+  if (!value) return void 0;
+  const normalized = value.toLowerCase();
+  if (normalized === "production" || normalized === "staging") {
+    return { type: "server", name: normalized };
+  }
+  if (normalized === "development" || normalized === "local") {
+    return { type: "local", name: normalized };
+  }
+  return { name: value };
+}
+function isObject2(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
 // src/logger.ts
 var BRAINTRUST_ATTACHMENT = BraintrustAttachmentReference.shape.type.value;
 var EXTERNAL_ATTACHMENT = ExternalAttachmentReference.shape.type.value;
@@ -4964,6 +5058,7 @@ var LoginInvalidOrgError = class extends Error {
     super(message);
     this.message = message;
   }
+  message;
 };
 var REDACTION_FIELDS = [
   "input",
@@ -4979,6 +5074,8 @@ var MaskingError = class {
     this.fieldName = fieldName;
     this.errorType = errorType;
   }
+  fieldName;
+  errorType;
   get errorMsg() {
     return `ERROR: Failed to mask field '${this.fieldName}' - ${this.errorType}`;
   }
@@ -5188,7 +5285,9 @@ var BraintrustState = class _BraintrustState {
       diskCache: parametersDiskCache
     });
     this.spanCache = new SpanCache({ disabled: loginParams.disableSpanCache });
+    this.spanOriginEnvironment = detectSpanOriginEnvironment();
   }
+  loginParams;
   id;
   currentExperiment;
   // Note: the value of IsAsyncFlush doesn't really matter here, since we
@@ -5223,6 +5322,7 @@ var BraintrustState = class _BraintrustState {
   _idGenerator = null;
   _contextManager = null;
   _otelFlushCallback = null;
+  spanOriginEnvironment;
   resetLoginInfo() {
     this.appUrl = null;
     this.appPublicUrl = null;
@@ -7140,6 +7240,7 @@ function initLogger(options = {}) {
     orgName,
     forceLogin,
     debugLogLevel,
+    environment,
     fetch: fetch2,
     state: stateArg
   } = options || {};
@@ -7156,6 +7257,7 @@ function initLogger(options = {}) {
   };
   const state = stateArg ?? _globalState;
   state.setDebugLogLevel(debugLogLevel);
+  state.spanOriginEnvironment = detectSpanOriginEnvironment(environment);
   state.enforceQueueSizeLimit(true);
   const lazyMetadata = new LazyValue(
     async () => {
@@ -7795,6 +7897,11 @@ var ObjectFetcher = class {
     this._internal_btql = _internal_btql;
     this._internalBrainstoreRealtime = _internalBrainstoreRealtime;
   }
+  objectType;
+  pinnedVersion;
+  mutateRecord;
+  _internal_btql;
+  _internalBrainstoreRealtime;
   _fetchedData = void 0;
   get id() {
     throw new Error("ObjectFetcher subclasses must have an 'id' attribute");
@@ -8314,7 +8421,11 @@ var SpanImpl = class _SpanImpl {
       metrics: {
         start: args.startTime ?? getCurrentUnixTimestamp()
       },
-      context: { ...callerLocation },
+      context: mergeSpanOriginContext(
+        { ...callerLocation },
+        "braintrust-js-logger",
+        this._state.spanOriginEnvironment
+      ),
       span_attributes: {
         name,
         type,
@@ -8688,6 +8799,7 @@ var Dataset2 = class extends ObjectFetcher {
     this.pinnedEnvironment = pinState?.pinnedEnvironment;
     this.pinnedSnapshotName = pinState?.pinnedSnapshotName;
   }
+  state;
   lazyMetadata;
   __braintrust_dataset_marker = true;
   newRecords = 0;
@@ -13149,6 +13261,24 @@ var aiSDKChannels = defineChannels("ai", {
     kind: "sync-stream"
   })
 });
+var harnessAgentChannels = defineChannels("@ai-sdk/harness", {
+  generate: channel({
+    channelName: "HarnessAgent.generate",
+    kind: "async"
+  }),
+  stream: channel({
+    channelName: "HarnessAgent.stream",
+    kind: "async"
+  }),
+  continueGenerate: channel({
+    channelName: "HarnessAgent.continueGenerate",
+    kind: "async"
+  }),
+  continueStream: channel({
+    channelName: "HarnessAgent.continueStream",
+    kind: "async"
+  })
+});
 
 // src/instrumentation/plugins/ai-sdk-plugin.ts
 var DEFAULT_DENY_OUTPUT_PATHS = [
@@ -13417,6 +13547,84 @@ var AISDKPlugin = class extends BasePlugin {
         })
       })
     );
+    this.unsubscribers.push(
+      traceStreamingChannel(harnessAgentChannels.generate, {
+        name: "HarnessAgent.generate",
+        type: "task" /* TASK */,
+        extractInput: ([params], event) => prepareAISDKHarnessAgentInput(params, event.self),
+        extractOutput: (result, endEvent) => processAISDKOutput(
+          result,
+          resolveDenyOutputPaths(endEvent, denyOutputPaths)
+        ),
+        extractMetrics: (result) => extractTokenMetrics(result),
+        aggregateChunks: aggregateAISDKChunks
+      })
+    );
+    this.unsubscribers.push(
+      traceStreamingChannel(harnessAgentChannels.stream, {
+        name: "HarnessAgent.stream",
+        type: "task" /* TASK */,
+        extractInput: ([params], event) => prepareAISDKHarnessAgentInput(params, event.self),
+        extractOutput: (result, endEvent) => processAISDKOutput(
+          result,
+          resolveDenyOutputPaths(endEvent, denyOutputPaths)
+        ),
+        extractMetrics: (result, startTime) => ({
+          ...extractTokenMetrics(result),
+          ...startTime === void 0 ? {} : {
+            time_to_first_token: getCurrentUnixTimestamp() - startTime
+          }
+        }),
+        aggregateChunks: aggregateAISDKChunks,
+        patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
+          defaultDenyOutputPaths: denyOutputPaths,
+          endEvent,
+          result,
+          resolvePromiseUsage: true,
+          span,
+          startTime
+        })
+      })
+    );
+    this.unsubscribers.push(
+      traceStreamingChannel(harnessAgentChannels.continueGenerate, {
+        name: "HarnessAgent.continueGenerate",
+        type: "task" /* TASK */,
+        extractInput: ([params], event) => prepareAISDKHarnessAgentInput(params, event.self),
+        extractOutput: (result, endEvent) => processAISDKOutput(
+          result,
+          resolveDenyOutputPaths(endEvent, denyOutputPaths)
+        ),
+        extractMetrics: (result) => extractTokenMetrics(result),
+        aggregateChunks: aggregateAISDKChunks
+      })
+    );
+    this.unsubscribers.push(
+      traceStreamingChannel(harnessAgentChannels.continueStream, {
+        name: "HarnessAgent.continueStream",
+        type: "task" /* TASK */,
+        extractInput: ([params], event) => prepareAISDKHarnessAgentInput(params, event.self),
+        extractOutput: (result, endEvent) => processAISDKOutput(
+          result,
+          resolveDenyOutputPaths(endEvent, denyOutputPaths)
+        ),
+        extractMetrics: (result, startTime) => ({
+          ...extractTokenMetrics(result),
+          ...startTime === void 0 ? {} : {
+            time_to_first_token: getCurrentUnixTimestamp() - startTime
+          }
+        }),
+        aggregateChunks: aggregateAISDKChunks,
+        patchResult: ({ endEvent, result, span, startTime }) => patchAISDKStreamingResult({
+          defaultDenyOutputPaths: denyOutputPaths,
+          endEvent,
+          result,
+          resolvePromiseUsage: true,
+          span,
+          startTime
+        })
+      })
+    );
     this.unsubscribers.push(
       traceStreamingChannel(aiSDKChannels.toolLoopAgentGenerate, {
         name: "ToolLoopAgent.generate",
@@ -13947,6 +14155,45 @@ function prepareAISDKCallInput(params, event, span, defaultDenyOutputPaths, chil
     metadata
   };
 }
+function prepareAISDKHarnessAgentInput(params, self) {
+  if (isObject(self)) {
+    try {
+      if (isObject(self.settings)) {
+        const settings = self.settings;
+        if (settings.telemetry === void 0) {
+          Reflect.set(self, "settings", { ...settings, telemetry: {} });
+        }
+      }
+    } catch {
+    }
+  }
+  const selectedInput = {};
+  if (params.prompt !== void 0) {
+    selectedInput.prompt = params.prompt;
+  }
+  if (params.messages !== void 0) {
+    selectedInput.messages = params.messages;
+  }
+  if (params.toolApprovalContinuations !== void 0) {
+    selectedInput.toolApprovalContinuations = params.toolApprovalContinuations;
+  }
+  const metadata = extractMetadataFromCallParams({}, self);
+  if (isObject(params.session) && typeof params.session.sessionId === "string") {
+    metadata.sessionId = params.session.sessionId;
+  }
+  if (isObject(self)) {
+    if (typeof self.harnessId === "string") {
+      metadata.harnessId = self.harnessId;
+    }
+    if (typeof self.permissionMode === "string") {
+      metadata.permissionMode = self.permissionMode;
+    }
+  }
+  return {
+    input: processAISDKCallInput(selectedInput).input,
+    metadata
+  };
+}
 function prepareAISDKWorkflowAgentStreamInput(params, event, span, defaultDenyOutputPaths) {
   registerWorkflowAgentWrapperSpan(span);
   const { input } = processAISDKWorkflowAgentCallInput(params);
@@ -14794,6 +15041,7 @@ function patchAISDKStreamingResult(args) {
     endEvent,
     onComplete,
     result,
+    resolvePromiseUsage,
     span,
     startTime
   } = args;
@@ -14820,6 +15068,22 @@ function patchAISDKStreamingResult(args) {
     outputLogged = true;
     try {
       const metrics = extractTopLevelAISDKMetrics(result, endEvent);
+      if (resolvePromiseUsage) {
+        try {
+          const resultRecord2 = result;
+          const pendingUsage = resultRecord2.totalUsage ?? resultRecord2.usage;
+          if (isPromiseLike(pendingUsage)) {
+            const usage = await Promise.resolve(pendingUsage);
+            if (isObject(usage)) {
+              Object.assign(
+                metrics,
+                extractTokenMetrics({ usage })
+              );
+            }
+          }
+        } catch {
+        }
+      }
       if (metrics.time_to_first_token === void 0 && firstChunkTime !== void 0) {
         metrics.time_to_first_token = firstChunkTime - startTime;
       }
@@ -16050,8 +16314,6 @@ function filterSerializableOptions(options) {
     "additionalDirectories",
     "permissionMode",
     "debug",
-    "apiKey",
-    "apiKeySource",
     "agentName",
     "instructions"
   ];
@@ -27079,6 +27341,16 @@ function cleanObject(obj) {
     })
   );
 }
+function normalizeTokenMetrics(obj) {
+  const metrics = cleanObject(obj);
+  if (metrics.total_tokens !== void 0) {
+    metrics.tokens = metrics.total_tokens;
+  } else if (metrics.prompt_tokens !== void 0 && metrics.completion_tokens !== void 0) {
+    metrics.tokens = metrics.prompt_tokens + metrics.completion_tokens;
+  }
+  delete metrics.total_tokens;
+  return metrics;
+}
 function walkGenerations(response) {
   const result = [];
   const generations = response.generations || [];
@@ -27125,7 +27397,7 @@ function getMetricsFromResponse(response) {
       continue;
     }
     const inputTokenDetails = usageMetadata.input_token_details;
-    return cleanObject({
+    return normalizeTokenMetrics({
       total_tokens: usageMetadata.total_tokens,
       prompt_tokens: usageMetadata.input_tokens,
       completion_tokens: usageMetadata.output_tokens,
@@ -27135,7 +27407,7 @@ function getMetricsFromResponse(response) {
   }
   const llmOutput = response.llmOutput || {};
   const tokenUsage = isRecord(llmOutput.tokenUsage) ? llmOutput.tokenUsage : isRecord(llmOutput.estimatedTokens) ? llmOutput.estimatedTokens : {};
-  return cleanObject({
+  return normalizeTokenMetrics({
     total_tokens: tokenUsage.totalTokens,
     prompt_tokens: tokenUsage.promptTokens,
     completion_tokens: tokenUsage.completionTokens
@@ -29755,6 +30027,7 @@ var BraintrustPlugin = class extends BasePlugin {
 var EVE_TRACE_STATE_KEY = "braintrust.eve.tracing";
 var MAX_EVE_CACHE_ENTRIES = 1e4;
 var MAX_STORED_LLM_INPUTS = 100;
+var MAX_STORED_REASONING_BLOCKS = 100;
 var MAX_STORED_SPAN_REFERENCES = 1e4;
 var MAX_STORED_STEP_STARTS = 1e4;
 function braintrustEveHook(options) {
@@ -29793,6 +30066,7 @@ var ResumedEveSpan = class {
     this.reference = reference;
     this.endTime = reference.endTime;
   }
+  reference;
   endTime;
   get rootSpanId() {
     return this.reference.rootSpanId;
@@ -29825,6 +30099,7 @@ var EveBridge = class {
   constructor(state) {
     this.state = state;
   }
+  state;
   eventQueuesBySession = /* @__PURE__ */ new Map();
   completedToolKeys = new LRUCache({
     max: MAX_EVE_CACHE_ENTRIES
@@ -30003,6 +30278,9 @@ var EveBridge = class {
       case "step.started":
         await this.handleStepStarted(event, ctx, hookMetadata);
         return true;
+      case "reasoning.completed":
+        this.handleReasoningCompleted(event, ctx);
+        return true;
       case "message.completed":
         this.handleMessageCompleted(event, ctx);
         return true;
@@ -30094,6 +30372,7 @@ var EveBridge = class {
       key,
       metadata,
       metrics: {},
+      sessionId,
       span,
       stepsByIndex: /* @__PURE__ */ new Map(),
       turnId: event.data.turnId
@@ -30124,6 +30403,12 @@ var EveBridge = class {
       const endTime = eventTime2(event);
       existing.span.end(endTime === void 0 ? void 0 : { endTime });
       this.markStepEnded(event.data.turnId, event.data.stepIndex);
+      clearStoredEveReasoning(
+        this.state,
+        sessionId,
+        event.data.turnId,
+        event.data.stepIndex
+      );
     }
     const stepOrdinal = this.stepOrdinal(event);
     const metadata = { ...turn.metadata };
@@ -30133,6 +30418,13 @@ var EveBridge = class {
       event.data.turnId,
       event.data.stepIndex
     );
+    const reasoning = readStoredEveReasoning(
+      this.state,
+      sessionId,
+      event.data.turnId,
+      event.data.stepIndex
+    );
+    const output = mergeEveReasoning(void 0, reasoning);
     const { rowId: eventId, spanId } = await generateEveIds(
       "step",
       sessionId,
@@ -30150,32 +30442,52 @@ var EveBridge = class {
       spanId,
       startTime: eventTime2(event)
     });
-    span.log({ ...input !== void 0 ? { input } : {}, metadata });
+    span.log({
+      ...input !== void 0 ? { input } : {},
+      metadata
+    });
     turn.stepsByIndex.set(event.data.stepIndex, {
       ...input !== void 0 ? { input } : {},
       metadata,
       metrics: {},
+      ...output !== void 0 ? { output } : {},
+      reasoning,
       span
     });
   }
+  handleReasoningCompleted(event, ctx) {
+    const sessionId = sessionIdFromContext(ctx);
+    if (!sessionId) {
+      return;
+    }
+    const reasoning = storeEveReasoning(this.state, sessionId, event);
+    const step = this.stepForEvent(event, ctx);
+    if (step) {
+      step.reasoning = reasoning;
+      step.output = mergeEveReasoning(step.output, reasoning);
+    }
+  }
   handleMessageCompleted(event, ctx) {
     const step = this.stepForEvent(event, ctx);
     if (!step) {
       return;
     }
-    const existingMessage = Array.isArray(step.output) && isObject(step.output[0]) ? step.output[0].message : void 0;
+    const existingMessage = eveOutputMessage(step.output);
     const existingToolCalls = isObject(existingMessage) ? existingMessage.tool_calls : void 0;
-    step.output = [
-      {
-        finish_reason: normalizedFinishReason(event.data.finishReason),
-        index: 0,
-        message: {
-          content: event.data.message,
-          role: "assistant",
-          ...Array.isArray(existingToolCalls) ? { tool_calls: existingToolCalls } : {}
+    step.output = mergeEveReasoning(
+      [
+        {
+          finish_reason: normalizedFinishReason(event.data.finishReason),
+          index: 0,
+          message: {
+            content: event.data.message,
+            role: "assistant",
+            ...Array.isArray(existingToolCalls) ? { tool_calls: existingToolCalls } : {}
+          }
         }
-      }
-    ];
+      ],
+      step.reasoning
+    );
     const turn = this.turnForEvent(event, ctx);
     if (turn && event.data.finishReason !== "tool-calls") {
       turn.output = event.data.message;
@@ -30184,16 +30496,19 @@ var EveBridge = class {
   handleResultCompleted(event, ctx) {
     const step = this.stepForEvent(event, ctx);
     if (step) {
-      step.output = [
-        {
-          finish_reason: "stop",
-          index: 0,
-          message: {
-            content: event.data.result,
-            role: "assistant"
+      step.output = mergeEveReasoning(
+        [
+          {
+            finish_reason: "stop",
+            index: 0,
+            message: {
+              content: event.data.result,
+              role: "assistant"
+            }
           }
-        }
-      ];
+        ],
+        step.reasoning
+      );
     }
     const turn = this.turnForEvent(event, ctx);
     if (turn) {
@@ -30243,18 +30558,20 @@ var EveBridge = class {
         type: "function"
       });
     }
-    step.output = [
-      {
-        finish_reason: "tool_calls",
-        index: 0,
-        message: {
-          content: null,
-          role: "assistant",
-          tool_calls: [...toolCallsById.values()]
+    step.output = mergeEveReasoning(
+      [
+        {
+          finish_reason: "tool_calls",
+          index: 0,
+          message: {
+            content: null,
+            role: "assistant",
+            tool_calls: [...toolCallsById.values()]
+          }
         }
-      }
-    ];
-    step.span.log({ metadata: step.metadata, output: step.output });
+      ],
+      step.reasoning
+    );
   }
   async handleActionResult(event, ctx, hookMetadata) {
     if (isToolResult(event.data.result)) {
@@ -30432,6 +30749,7 @@ var EveBridge = class {
       ...costUsd !== void 0 ? { estimated_cost: costUsd } : {}
     };
     step.metrics = { ...step.metrics, ...metrics };
+    const sessionId = sessionIdFromContext(ctx);
     if (Array.isArray(step.output) && isObject(step.output[0])) {
       const finishReason = step.output[0].finish_reason;
       if (typeof finishReason !== "string") {
@@ -30456,6 +30774,14 @@ var EveBridge = class {
       turn.stepsByIndex.delete(event.data.stepIndex);
     }
     this.markStepEnded(event.data.turnId, event.data.stepIndex);
+    if (sessionId) {
+      clearStoredEveReasoning(
+        this.state,
+        sessionId,
+        event.data.turnId,
+        event.data.stepIndex
+      );
+    }
   }
   handleStepFailed(event, ctx) {
     const step = this.stepForEvent(event, ctx);
@@ -30473,6 +30799,15 @@ var EveBridge = class {
     const turn = this.turnForEvent(event, ctx);
     turn?.stepsByIndex.delete(event.data.stepIndex);
     this.markStepEnded(event.data.turnId, event.data.stepIndex);
+    const sessionId = sessionIdFromContext(ctx);
+    if (sessionId) {
+      clearStoredEveReasoning(
+        this.state,
+        sessionId,
+        event.data.turnId,
+        event.data.stepIndex
+      );
+    }
   }
   handleTurnCompleted(event, ctx) {
     const turn = this.turnForEvent(event, ctx);
@@ -30570,6 +30905,7 @@ var EveBridge = class {
       key,
       metadata,
       metrics: {},
+      sessionId,
       span,
       stepsByIndex: /* @__PURE__ */ new Map(),
       turnId: event.data.turnId
@@ -30832,6 +31168,9 @@ var EveBridge = class {
       const normalized = normalizeEveTraceState(current);
       return {
         ...normalized,
+        reasoningBlocks: normalized.reasoningBlocks.filter(
+          (entry) => !entry.key.startsWith(`${turn.sessionId}\0${turn.turnId}\0`)
+        ),
         stepStarts: normalized.stepStarts.filter(
           (entry) => entry.turnId !== turn.turnId
         )
@@ -30871,6 +31210,7 @@ function emptyEveTraceState() {
   return {
     llmInputs: [],
     metadata: {},
+    reasoningBlocks: [],
     spanReferences: [],
     stepStarts: []
   };
@@ -30921,6 +31261,21 @@ function normalizeEveTraceState(state) {
     const input = entry["input"];
     return typeof key === "string" && isCapturedModelInput(input) ? [{ input, key }] : [];
   }).slice(-MAX_STORED_LLM_INPUTS) : [];
+  const reasoningBlocks = Array.isArray(state["reasoningBlocks"]) ? state["reasoningBlocks"].flatMap((entry) => {
+    if (!isObject(entry)) {
+      return [];
+    }
+    const content = entry["content"];
+    const eventAt = entry["eventAt"];
+    const key = entry["key"];
+    return typeof content === "string" && (eventAt === void 0 || typeof eventAt === "string") && typeof key === "string" ? [
+      {
+        content,
+        ...typeof eventAt === "string" ? { eventAt } : {},
+        key
+      }
+    ] : [];
+  }).slice(-MAX_STORED_REASONING_BLOCKS) : [];
   const stepStarts = Array.isArray(state["stepStarts"]) ? state["stepStarts"].flatMap((entry) => {
     if (!isObject(entry)) {
       return [];
@@ -30931,7 +31286,13 @@ function normalizeEveTraceState(state) {
     const turnId = entry["turnId"];
     return typeof ordinal === "number" && Number.isInteger(ordinal) && ordinal >= 0 && typeof open === "boolean" && typeof stepIndex === "number" && Number.isInteger(stepIndex) && typeof turnId === "string" ? [{ open, ordinal, stepIndex, turnId }] : [];
   }).slice(-MAX_STORED_STEP_STARTS) : [];
-  return { llmInputs, metadata: { ...metadata }, spanReferences, stepStarts };
+  return {
+    llmInputs,
+    metadata: { ...metadata },
+    reasoningBlocks,
+    spanReferences,
+    stepStarts
+  };
 }
 function readEveTraceState(state) {
   try {
@@ -30940,23 +31301,85 @@ function readEveTraceState(state) {
     return emptyEveTraceState();
   }
 }
-function captureEveModelInput(state, input) {
-  if (!isObject(input)) {
-    return;
-  }
-  const session = input["session"];
-  const turn = input["turn"];
-  const step = input["step"];
-  if (!isObject(session) || !isObject(turn) || !isObject(step)) {
-    return;
-  }
-  const sessionId = session["id"];
-  const turnId = turn["id"];
-  const stepIndex = step["index"];
-  if (typeof sessionId !== "string" || typeof turnId !== "string" || typeof stepIndex !== "number" || !Number.isInteger(stepIndex)) {
-    return;
+function storeEveReasoning(state, sessionId, event) {
+  const eventAt = event.meta?.at;
+  const key = llmInputKey(sessionId, event.data.turnId, event.data.stepIndex);
+  let stored = [];
+  state.update((current) => {
+    const normalized = normalizeEveTraceState(current);
+    const alreadyStored = normalized.reasoningBlocks.some(
+      (entry) => entry.content === event.data.reasoning && entry.eventAt === eventAt && entry.key === key
+    );
+    const reasoningBlocks = alreadyStored ? normalized.reasoningBlocks : [
+      ...normalized.reasoningBlocks,
+      {
+        content: event.data.reasoning,
+        ...eventAt ? { eventAt } : {},
+        key
+      }
+    ].slice(-MAX_STORED_REASONING_BLOCKS);
+    stored = reasoningBlocks.flatMap(
+      (entry) => entry.key === key ? [
+        {
+          content: entry.content,
+          ...entry.eventAt ? { eventAt: entry.eventAt } : {}
+        }
+      ] : []
+    );
+    return alreadyStored ? normalized : { ...normalized, reasoningBlocks };
+  });
+  return stored;
+}
+function readStoredEveReasoning(state, sessionId, turnId, stepIndex) {
+  const key = llmInputKey(sessionId, turnId, stepIndex);
+  return readEveTraceState(state).reasoningBlocks.flatMap(
+    (entry) => entry.key === key ? [
+      {
+        content: entry.content,
+        ...entry.eventAt ? { eventAt: entry.eventAt } : {}
+      }
+    ] : []
+  );
+}
+function clearStoredEveReasoning(state, sessionId, turnId, stepIndex) {
+  const key = llmInputKey(sessionId, turnId, stepIndex);
+  state.update((current) => {
+    const normalized = normalizeEveTraceState(current);
+    return {
+      ...normalized,
+      reasoningBlocks: normalized.reasoningBlocks.filter(
+        (entry) => entry.key !== key
+      )
+    };
+  });
+}
+function eveOutputMessage(output) {
+  return Array.isArray(output) && isObject(output[0]) ? output[0]["message"] : void 0;
+}
+function mergeEveReasoning(output, reasoning) {
+  if (reasoning.length === 0) {
+    return output;
   }
-  const captured = capturedModelInput(input["modelInput"]);
+  const choice = Array.isArray(output) && isObject(output[0]) ? output[0] : {};
+  const message = isObject(choice["message"]) ? choice["message"] : {};
+  return [
+    {
+      ...choice,
+      index: typeof choice["index"] === "number" ? choice["index"] : 0,
+      message: {
+        ...message,
+        content: "content" in message ? message["content"] : null,
+        reasoning: reasoning.map((block) => ({ content: block.content })),
+        role: typeof message["role"] === "string" ? message["role"] : "assistant"
+      }
+    }
+  ];
+}
+function captureEveModelInput(state, input) {
+  const sessionId = input.session.id;
+  const turnId = input.turn.id;
+  const stepIndex = input.step.index;
+  const captured = capturedModelInput(input.modelInput);
   if (!captured) {
     return;
   }
@@ -30997,18 +31420,14 @@ function consumeCapturedEveModelInput(state, sessionId, turnId, stepIndex) {
   }
 }
 function capturedModelInput(modelInput) {
-  if (!isObject(modelInput)) {
-    return void 0;
-  }
-  const messages = modelInput["messages"];
-  if (!Array.isArray(messages)) {
-    return void 0;
-  }
-  const instructions = modelInput["instructions"];
-  const value = [
-    ...instructions !== void 0 ? [{ content: instructions, role: "system" }] : [],
-    ...messages
-  ];
+  const { instructions, messages } = modelInput;
+  const value = [];
+  if (typeof instructions === "string") {
+    value.push({ content: instructions, role: "system" });
+  } else if (instructions) {
+    value.push(...instructions.map(capturedEveModelMessage));
+  }
+  value.push(...messages.map(capturedEveModelMessage));
   try {
     const cloned = JSON.parse(JSON.stringify(value));
     if (!Array.isArray(cloned)) {
@@ -31019,8 +31438,123 @@ function capturedModelInput(modelInput) {
     return void 0;
   }
 }
+function capturedEveModelMessage(message) {
+  const { content, role } = message;
+  if (typeof content === "string") {
+    return { content, role };
+  }
+  return { content: content.map(capturedEveModelContentPart), role };
+}
+function capturedEveModelContentPart(part) {
+  switch (part.type) {
+    case "text":
+    case "reasoning":
+      return { text: part.text, type: part.type };
+    case "image":
+      return {
+        image: part.image,
+        ...part.mediaType !== void 0 ? { mediaType: part.mediaType } : {},
+        type: "image"
+      };
+    case "file":
+    case "reasoning-file":
+      return {
+        data: part.data,
+        ...part.type === "file" && part.filename !== void 0 ? { filename: part.filename } : {},
+        mediaType: part.mediaType,
+        type: part.type
+      };
+    case "custom":
+      return {
+        ..."kind" in part ? { kind: part.kind } : {},
+        type: "custom"
+      };
+    case "tool-call":
+      return {
+        input: part.input,
+        ...part.providerExecuted !== void 0 ? { providerExecuted: part.providerExecuted } : {},
+        toolCallId: part.toolCallId,
+        toolName: part.toolName,
+        type: "tool-call"
+      };
+    case "tool-result": {
+      const output = part.output;
+      let capturedOutput;
+      switch (output.type) {
+        case "text":
+        case "error-text":
+          capturedOutput = { type: output.type, value: output.value };
+          break;
+        case "json":
+        case "error-json":
+          capturedOutput = { type: output.type, value: output.value };
+          break;
+        case "execution-denied":
+          capturedOutput = {
+            ...output.reason !== void 0 ? { reason: output.reason } : {},
+            type: "execution-denied"
+          };
+          break;
+        case "content":
+          capturedOutput = {
+            type: "content",
+            value: output.value.map(capturedEveModelContentPart)
+          };
+          break;
+      }
+      return {
+        output: capturedOutput,
+        toolCallId: part.toolCallId,
+        toolName: part.toolName,
+        type: "tool-result"
+      };
+    }
+    case "tool-approval-request":
+      return {
+        approvalId: part.approvalId,
+        ...part.isAutomatic !== void 0 ? { isAutomatic: part.isAutomatic } : {},
+        ...part.signature !== void 0 ? { signature: part.signature } : {},
+        toolCallId: part.toolCallId,
+        type: "tool-approval-request"
+      };
+    case "tool-approval-response":
+      return {
+        approvalId: part.approvalId,
+        approved: part.approved,
+        ...part.providerExecuted !== void 0 ? { providerExecuted: part.providerExecuted } : {},
+        ...part.reason !== void 0 ? { reason: part.reason } : {},
+        type: "tool-approval-response"
+      };
+    case "file-data":
+    case "image-data":
+      return {
+        data: part.data,
+        ...part.type === "file-data" && part.filename !== void 0 ? { filename: part.filename } : {},
+        mediaType: part.mediaType,
+        type: part.type
+      };
+    case "file-url":
+    case "image-url":
+      return {
+        ...part.type === "file-url" && part.mediaType !== void 0 ? { mediaType: part.mediaType } : {},
+        type: part.type,
+        url: part.url
+      };
+    case "file-id":
+    case "image-file-id":
+      return { fileId: part.fileId, type: part.type };
+    case "file-reference":
+    case "image-file-reference":
+      return {
+        providerReference: part.providerReference,
+        type: part.type
+      };
+  }
+}
 function isCapturedModelInput(input) {
-  return Array.isArray(input);
+  return Array.isArray(input) && input.every(
+    (message) => isObject(message) && (message["role"] === "system" || message["role"] === "user" || message["role"] === "assistant" || message["role"] === "tool") && (typeof message["content"] === "string" || Array.isArray(message["content"]) && message["content"].every(isObject))
+  );
 }
 function llmInputKey(sessionId, turnId, stepIndex) {
   return `${sessionId}\0${turnId}\0${stepIndex}`;