@standardagents/builder 0.40.9 → 0.40.11

package/dist/index.js

@@ -496,6 +496,7 @@ var init_logBroadcast = __esm({
       "message_id",
       "provider",
       "actual_provider",
+      "standard_agents_router_used",
       "model",
       "model_name",
       "prompt_name",
@@ -506,6 +507,7 @@ var init_logBroadcast = __esm({
       "retry_of_log_id",
       "error",
       "error_type",
+      "error_origin",
       "finish_reason",
       "cost_total",
       "cost_input",
@@ -528,6 +530,71 @@ var init_logBroadcast = __esm({
     ];
   }
 });
+
+// src/agents/errorOrigin.ts
+function normalizedOrigin(value) {
+  if (typeof value !== "string") return void 0;
+  const origin = value.trim();
+  return ERROR_ORIGIN_PATTERN.test(origin) ? origin : void 0;
+}
+function normalizedUpstream(value) {
+  if (typeof value !== "string") return void 0;
+  const upstream = value.trim();
+  return upstream.length > 0 ? upstream : void 0;
+}
+function errorObject(error) {
+  return error !== null && (typeof error === "object" || typeof error === "function") ? error : null;
+}
+function resolveErrorAttribution(error, context = {}) {
+  const object = errorObject(error);
+  const stored = object?.[ATTRIBUTION];
+  if (stored) return stored;
+  const taggedOrigin = normalizedOrigin(object?.origin);
+  const provider = normalizedUpstream(object?.upstream) ?? normalizedUpstream(context.provider);
+  const standardAgentsRouterUsed = context.viaPlatform === true;
+  if (taggedOrigin) {
+    return {
+      origin: taggedOrigin,
+      ...provider ? { upstream: provider } : {},
+      standardAgentsRouterUsed
+    };
+  }
+  if (provider) {
+    return {
+      origin: standardAgentsRouterUsed ? "platform-router" : `provider:${provider}`,
+      upstream: provider,
+      standardAgentsRouterUsed
+    };
+  }
+  return {
+    origin: context.fallback ?? "runtime",
+    standardAgentsRouterUsed
+  };
+}
+function attributeThrownError(error, context) {
+  const attributed = errorObject(error) ?? new Error(String(error));
+  const attribution = resolveErrorAttribution(attributed, context);
+  try {
+    Object.defineProperty(attributed, ATTRIBUTION, {
+      configurable: true,
+      value: attribution
+    });
+    return attributed;
+  } catch {
+    const wrapped = new Error(error instanceof Error ? error.message : String(error), {
+      cause: error
+    });
+    Object.defineProperty(wrapped, ATTRIBUTION, { value: attribution });
+    return wrapped;
+  }
+}
+var ATTRIBUTION, ERROR_ORIGIN_PATTERN;
+var init_errorOrigin = __esm({
+  "src/agents/errorOrigin.ts"() {
+    ATTRIBUTION = Symbol("standard-agents-error-attribution");
+    ERROR_ORIGIN_PATTERN = /^(?:platform-router|runtime|(?:provider|tool|hook):[A-Za-z0-9._/@-]+)$/;
+  }
+});
 var init_types2 = __esm({
   "src/agents/providers/types.ts"() {
   }
@@ -1828,6 +1895,7 @@ var init_LLMRequest = __esm({
     init_FlowEngine();
     init_toolProgress();
     init_logBroadcast();
+    init_errorOrigin();
     NON_VISION_PLACEHOLDER_TEXT = "[Image omitted: model does not support vision]";
     STREAM_FIRST_CHUNK_TIMEOUT_MS = 12e4;
     STREAM_STALL_TIMEOUT_MS = 45e3;
@@ -2125,6 +2193,7 @@ var init_LLMRequest = __esm({
           state.thread.instance,
           getThreadState
         );
+        await this.logProviderRoute(state, logId, provider.name, viaPlatform);
         const streamAbort = new AbortController();
         const parentSignal = state.abortController?.signal;
         let onParentAbort;
@@ -2138,332 +2207,370 @@ var init_LLMRequest = __esm({
         }
         const request = buildProviderRequest(context, modelDef, streamAbort.signal, state.threadId);
         let response;
-        await state.stream.waitFor(
-          async () => {
-            const requestSentAt = Date.now();
-            const firstChunkTimeoutMs = resolveStreamTimeoutMs(
-              state.env,
-              "STANDARD_AGENTS_STREAM_FIRST_CHUNK_TIMEOUT_MS",
-              STREAM_FIRST_CHUNK_TIMEOUT_MS
-            );
-            const stallTimeoutMs = resolveStreamTimeoutMs(
-              state.env,
-              "STANDARD_AGENTS_STREAM_STALL_TIMEOUT_MS",
-              STREAM_STALL_TIMEOUT_MS
-            );
-            let stalled = false;
-            const stallError = (budgetMs) => new ProviderError(
-              `Provider sent no chunk for ${Math.round(budgetMs / 1e3)}s`,
-              "timeout"
-            );
-            const awaitWithStallGuard = (work, budgetMs) => {
-              let timer;
-              work.catch(() => {
-              });
-              const timeout = new Promise((_resolve, reject) => {
-                timer = setTimeout(() => {
-                  stalled = true;
-                  reject(stallError(budgetMs));
-                  streamAbort.abort();
-                }, budgetMs);
-              });
-              return Promise.race([work, timeout]).finally(() => {
-                if (timer) clearTimeout(timer);
-              });
-            };
-            const stream = await awaitWithStallGuard(provider.stream(request), firstChunkTimeoutMs);
-            let content = "";
-            let reasoning = "";
-            let outputChars = 0;
-            let lastEmittedChars = 0;
-            const GEN_EMIT_STEP = 80;
-            const maybeEmitGeneration = () => {
-              if (outputChars - lastEmittedChars >= GEN_EMIT_STEP) {
-                lastEmittedChars = outputChars;
+        try {
+          await state.stream.waitFor(
+            async () => {
+              const requestSentAt = Date.now();
+              const firstChunkTimeoutMs = resolveStreamTimeoutMs(
+                state.env,
+                "STANDARD_AGENTS_STREAM_FIRST_CHUNK_TIMEOUT_MS",
+                STREAM_FIRST_CHUNK_TIMEOUT_MS
+              );
+              const stallTimeoutMs = resolveStreamTimeoutMs(
+                state.env,
+                "STANDARD_AGENTS_STREAM_STALL_TIMEOUT_MS",
+                STREAM_STALL_TIMEOUT_MS
+              );
+              let stalled = false;
+              const stallError = (budgetMs) => new ProviderError(
+                `Provider sent no chunk for ${Math.round(budgetMs / 1e3)}s`,
+                "timeout"
+              );
+              const awaitWithStallGuard = (work, budgetMs) => {
+                let timer;
+                work.catch(() => {
+                });
+                const timeout = new Promise((_resolve, reject) => {
+                  timer = setTimeout(() => {
+                    stalled = true;
+                    reject(stallError(budgetMs));
+                    streamAbort.abort();
+                  }, budgetMs);
+                });
+                return Promise.race([work, timeout]).finally(() => {
+                  if (timer) clearTimeout(timer);
+                });
+              };
+              const stream = await awaitWithStallGuard(provider.stream(request), firstChunkTimeoutMs);
+              let content = "";
+              let reasoning = "";
+              let outputChars = 0;
+              let lastEmittedChars = 0;
+              const GEN_EMIT_STEP = 80;
+              const maybeEmitGeneration = () => {
+                if (outputChars - lastEmittedChars >= GEN_EMIT_STEP) {
+                  lastEmittedChars = outputChars;
+                  try {
+                    state.emitEvent?.("generation", { outputTokens: Math.ceil(outputChars / 4) });
+                  } catch {
+                  }
+                }
+              };
+              const toolCallsMap = /* @__PURE__ */ new Map();
+              const images = [];
+              const webSearches = [];
+              const providerToolCalls = [];
+              let finishReason = "stop";
+              let usage;
+              let reasoningDetails;
+              let actualProvider;
+              let providerResponseId;
+              let firstChunkAt = 0;
+              let firstTokenAt = 0;
+              let lastTokenAt = 0;
+              const noteToken = () => {
+                const now = Date.now();
+                if (firstTokenAt === 0) firstTokenAt = now;
+                lastTokenAt = now;
+              };
+              const emitLogPatch = (data) => {
                 try {
-                  state.emitEvent?.("generation", { outputTokens: Math.ceil(outputChars / 4) });
+                  state.emitLog?.({ type: "log_data", log_id: logId, data: { id: logId, ...data } });
                 } catch {
                 }
-              }
-            };
-            const toolCallsMap = /* @__PURE__ */ new Map();
-            const images = [];
-            const webSearches = [];
-            const providerToolCalls = [];
-            let finishReason = "stop";
-            let usage;
-            let reasoningDetails;
-            let providerResponseId;
-            let firstChunkAt = 0;
-            let firstTokenAt = 0;
-            let lastTokenAt = 0;
-            const noteToken = () => {
-              const now = Date.now();
-              if (firstTokenAt === 0) firstTokenAt = now;
-              lastTokenAt = now;
-            };
-            const emitLogPatch = (data) => {
+              };
+              const streamedToolNames = [];
+              let lastPreviewChars = 0;
+              const PREVIEW_EMIT_STEP = 80;
+              const maybeEmitPreview = () => {
+                if (outputChars - lastPreviewChars >= PREVIEW_EMIT_STEP) {
+                  lastPreviewChars = outputChars;
+                  emitLogPatch({
+                    content: content || null,
+                    reasoning_content: reasoning || null
+                  });
+                }
+              };
+              const iterator = stream[Symbol.asyncIterator]();
               try {
-                state.emitLog?.({ type: "log_data", log_id: logId, data: { id: logId, ...data } });
-              } catch {
-              }
-            };
-            const streamedToolNames = [];
-            let lastPreviewChars = 0;
-            const PREVIEW_EMIT_STEP = 80;
-            const maybeEmitPreview = () => {
-              if (outputChars - lastPreviewChars >= PREVIEW_EMIT_STEP) {
-                lastPreviewChars = outputChars;
-                emitLogPatch({
-                  content: content || null,
-                  reasoning_content: reasoning || null
-                });
-              }
-            };
-            const iterator = stream[Symbol.asyncIterator]();
-            try {
-              while (true) {
-                if (state.abortController?.signal?.aborted) break;
-                if (await state.thread.instance.shouldStop()) break;
-                let next;
-                try {
-                  next = await awaitWithStallGuard(
-                    iterator.next(),
-                    firstChunkAt === 0 ? firstChunkTimeoutMs : stallTimeoutMs
-                  );
-                } catch (streamErr) {
-                  if (stalled) throw streamErr;
-                  if (state.abortController?.signal?.aborted || await state.thread.instance.shouldStop()) {
-                    break;
+                while (true) {
+                  if (state.abortController?.signal?.aborted) break;
+                  if (await state.thread.instance.shouldStop()) break;
+                  let next;
+                  try {
+                    next = await awaitWithStallGuard(
+                      iterator.next(),
+                      firstChunkAt === 0 ? firstChunkTimeoutMs : stallTimeoutMs
+                    );
+                  } catch (streamErr) {
+                    if (stalled) throw streamErr;
+                    if (state.abortController?.signal?.aborted || await state.thread.instance.shouldStop()) {
+                      break;
+                    }
+                    throw streamErr;
                   }
-                  throw streamErr;
-                }
-                if (next.done) break;
-                const chunk = next.value;
-                state.thread.instance.noteExecutionProgress?.();
-                if (firstChunkAt === 0 && chunkCarriesPayload(chunk)) {
-                  firstChunkAt = Date.now();
-                  emitLogPatch({ time_to_first_token_ms: firstChunkAt - requestSentAt });
-                }
-                switch (chunk.type) {
-                  case "content-delta":
-                    content += chunk.delta;
-                    state.stream.sendContent(chunk.delta);
-                    this.emitContentChunk(chunk.delta, state);
-                    outputChars += chunk.delta.length;
-                    noteToken();
-                    maybeEmitGeneration();
-                    maybeEmitPreview();
-                    break;
-                  case "reasoning-delta":
-                    reasoning += chunk.delta;
-                    this.emitReasoningChunk(chunk.delta, state);
-                    outputChars += chunk.delta.length;
-                    noteToken();
-                    maybeEmitGeneration();
-                    maybeEmitPreview();
-                    break;
-                  case "tool-call-start":
-                    {
+                  if (next.done) break;
+                  const chunk = next.value;
+                  state.thread.instance.noteExecutionProgress?.();
+                  if (firstChunkAt === 0 && chunkCarriesPayload(chunk)) {
+                    firstChunkAt = Date.now();
+                    emitLogPatch({ time_to_first_token_ms: firstChunkAt - requestSentAt });
+                  }
+                  switch (chunk.type) {
+                    case "content-delta":
+                      content += chunk.delta;
+                      state.stream.sendContent(chunk.delta);
+                      this.emitContentChunk(chunk.delta, state);
+                      outputChars += chunk.delta.length;
                       noteToken();
-                      const entry = {
-                        id: chunk.id,
-                        name: chunk.name,
-                        argumentsDelta: "",
-                        extraContent: chunk.extraContent,
-                        startedFired: false,
-                        progressArg: void 0
-                      };
-                      toolCallsMap.set(chunk.id, entry);
-                      if (chunk.name) {
-                        streamedToolNames.push(chunk.name);
-                        emitLogPatch({ tools_called: JSON.stringify(streamedToolNames) });
-                      }
-                      const progressArg = await this.resolveProgressArgument(state, chunk.name);
-                      if (progressArg) {
-                        entry.progressArg = progressArg;
-                      } else {
-                        await this.fireToolCallStarted(state, entry, void 0);
-                      }
-                    }
-                    break;
-                  case "tool-call-delta":
-                    {
-                      const tc = toolCallsMap.get(chunk.id);
-                      if (tc) {
-                        tc.argumentsDelta += chunk.argumentsDelta;
-                        outputChars += chunk.argumentsDelta.length;
+                      maybeEmitGeneration();
+                      maybeEmitPreview();
+                      break;
+                    case "reasoning-delta":
+                      reasoning += chunk.delta;
+                      this.emitReasoningChunk(chunk.delta, state);
+                      outputChars += chunk.delta.length;
+                      noteToken();
+                      maybeEmitGeneration();
+                      maybeEmitPreview();
+                      break;
+                    case "tool-call-start":
+                      {
                         noteToken();
-                        maybeEmitGeneration();
-                        if (tc.progressArg && !tc.startedFired && tc.argumentsDelta.length <= PROGRESS_ARG_SCAN_CAP) {
-                          const value = await readCompletedArg(tc.argumentsDelta, tc.progressArg);
-                          if (value !== void 0) {
-                            await this.fireToolCallStarted(state, tc, value);
+                        const entry = {
+                          id: chunk.id,
+                          name: chunk.name,
+                          argumentsDelta: "",
+                          extraContent: chunk.extraContent,
+                          startedFired: false,
+                          progressArg: void 0
+                        };
+                        toolCallsMap.set(chunk.id, entry);
+                        if (chunk.name) {
+                          streamedToolNames.push(chunk.name);
+                          emitLogPatch({ tools_called: JSON.stringify(streamedToolNames) });
+                        }
+                        const progressArg = await this.resolveProgressArgument(state, chunk.name);
+                        if (progressArg) {
+                          entry.progressArg = progressArg;
+                        } else {
+                          await this.fireToolCallStarted(state, entry, void 0);
+                        }
+                      }
+                      break;
+                    case "tool-call-delta":
+                      {
+                        const tc = toolCallsMap.get(chunk.id);
+                        if (tc) {
+                          tc.argumentsDelta += chunk.argumentsDelta;
+                          outputChars += chunk.argumentsDelta.length;
+                          noteToken();
+                          maybeEmitGeneration();
+                          if (tc.progressArg && !tc.startedFired && tc.argumentsDelta.length <= PROGRESS_ARG_SCAN_CAP) {
+                            const value = await readCompletedArg(tc.argumentsDelta, tc.progressArg);
+                            if (value !== void 0) {
+                              await this.fireToolCallStarted(state, tc, value);
+                            }
                           }
                         }
                       }
-                    }
-                    break;
-                  case "tool-call-done":
-                    {
-                      const existing = toolCallsMap.get(chunk.id);
-                      toolCallsMap.set(chunk.id, {
-                        ...existing,
-                        id: chunk.id,
-                        name: existing?.name ?? "",
-                        argumentsDelta: JSON.stringify(chunk.arguments),
-                        extraContent: chunk.extraContent ?? existing?.extraContent
+                      break;
+                    case "tool-call-done":
+                      {
+                        const existing = toolCallsMap.get(chunk.id);
+                        toolCallsMap.set(chunk.id, {
+                          ...existing,
+                          id: chunk.id,
+                          name: existing?.name ?? "",
+                          argumentsDelta: JSON.stringify(chunk.arguments),
+                          extraContent: chunk.extraContent ?? existing?.extraContent
+                        });
+                      }
+                      break;
+                    case "finish":
+                      finishReason = chunk.finishReason;
+                      usage = chunk.usage;
+                      reasoningDetails = chunk.reasoningDetails;
+                      providerResponseId = chunk.responseId;
+                      break;
+                    case "image-done":
+                      images.push({
+                        id: chunk.image.id,
+                        toolName: chunk.image.toolName,
+                        data: chunk.image.data,
+                        mediaType: chunk.image.mediaType,
+                        revisedPrompt: chunk.image.revisedPrompt
                       });
-                    }
-                    break;
-                  case "finish":
-                    finishReason = chunk.finishReason;
-                    usage = chunk.usage;
-                    reasoningDetails = chunk.reasoningDetails;
-                    providerResponseId = chunk.responseId;
-                    break;
-                  case "image-done":
-                    images.push({
-                      id: chunk.image.id,
-                      toolName: chunk.image.toolName,
-                      data: chunk.image.data,
-                      mediaType: chunk.image.mediaType,
-                      revisedPrompt: chunk.image.revisedPrompt
-                    });
-                    break;
-                  case "web-search-done":
-                    webSearches.push(chunk.result);
-                    break;
-                  case "provider-tool-done":
-                    providerToolCalls.push(chunk.tool);
-                    break;
-                  case "error":
-                    throw new ProviderError(
-                      chunk.error,
-                      chunk.code || "unknown"
+                      break;
+                    case "web-search-done":
+                      webSearches.push(chunk.result);
+                      break;
+                    case "provider-tool-done":
+                      providerToolCalls.push(chunk.tool);
+                      break;
+                    case "error":
+                      throw new ProviderError(
+                        chunk.error,
+                        chunk.code || "unknown"
+                      );
+                  }
+                }
+              } finally {
+                if (onParentAbort && parentSignal) {
+                  parentSignal.removeEventListener("abort", onParentAbort);
+                }
+                try {
+                  const cleanup = iterator.return?.();
+                  if (cleanup) {
+                    await awaitBounded(
+                      Promise.resolve(cleanup),
+                      STREAM_CLEANUP_BUDGET_MS,
+                      "stream iterator cleanup"
                     );
+                  }
+                } catch {
                 }
               }
-            } finally {
-              if (onParentAbort && parentSignal) {
-                parentSignal.removeEventListener("abort", onParentAbort);
-              }
-              try {
-                const cleanup = iterator.return?.();
-                if (cleanup) {
-                  await awaitBounded(
-                    Promise.resolve(cleanup),
-                    STREAM_CLEANUP_BUDGET_MS,
-                    "stream iterator cleanup"
-                  );
+              for (const tc of toolCallsMap.values()) {
+                if (!tc.startedFired) {
+                  const progress = tc.progressArg ? await readCompletedArg(tc.argumentsDelta, tc.progressArg) : void 0;
+                  await this.fireToolCallStarted(state, tc, progress);
                 }
-              } catch {
-              }
-            }
-            for (const tc of toolCallsMap.values()) {
-              if (!tc.startedFired) {
-                const progress = tc.progressArg ? await readCompletedArg(tc.argumentsDelta, tc.progressArg) : void 0;
-                await this.fireToolCallStarted(state, tc, progress);
-              }
-            }
-            const toolCalls = [];
-            for (const tc of toolCallsMap.values()) {
-              try {
-                toolCalls.push({
-                  id: tc.id,
-                  name: tc.name,
-                  arguments: JSON.parse(tc.argumentsDelta || "{}"),
-                  extraContent: tc.extraContent
-                });
-              } catch {
-                toolCalls.push({
-                  id: tc.id,
-                  name: tc.name,
-                  arguments: {},
-                  extraContent: tc.extraContent
-                });
               }
-            }
-            const responseId = `res_${crypto.randomUUID().substring(0, 12)}`;
-            const responseImages = images.length > 0 ? images.map((img) => ({
-              type: "image_url",
-              id: img.id,
-              toolName: img.toolName,
-              image_url: {
-                url: img.data.startsWith("data:") ? img.data : `data:${img.mediaType};base64,${img.data}`
-              }
-            })) : void 0;
-            response = {
-              id: responseId,
-              model: modelName,
-              content: content || null,
-              reasoning_content: reasoning || null,
-              reasoning_details: reasoningDetails,
-              // Include reasoning details for multi-turn context
-              tool_calls: toolCalls.length > 0 ? convertToolCalls(toolCalls) : void 0,
-              images: responseImages,
-              finish_reason: finishReason,
-              usage: usage ? convertUsage(usage) : {
-                prompt_tokens: 0,
-                completion_tokens: 0,
-                total_tokens: 0
+              const toolCalls = [];
+              for (const tc of toolCallsMap.values()) {
+                try {
+                  toolCalls.push({
+                    id: tc.id,
+                    name: tc.name,
+                    arguments: JSON.parse(tc.argumentsDelta || "{}"),
+                    extraContent: tc.extraContent
+                  });
+                } catch {
+                  toolCalls.push({
+                    id: tc.id,
+                    name: tc.name,
+                    arguments: {},
+                    extraContent: tc.extraContent
+                  });
+                }
               }
-            };
-            response._provider = provider;
-            response._viaPlatform = viaPlatform;
-            if (platformProxyOrigin) {
-              const feePercent = getObservedRouterFeePercent(platformProxyOrigin);
-              if (feePercent !== null) {
-                response._routerFeePercent = feePercent;
+              const responseId = `res_${crypto.randomUUID().substring(0, 12)}`;
+              const responseImages = images.length > 0 ? images.map((img) => ({
+                type: "image_url",
+                id: img.id,
+                toolName: img.toolName,
+                image_url: {
+                  url: img.data.startsWith("data:") ? img.data : `data:${img.mediaType};base64,${img.data}`
+                }
+              })) : void 0;
+              response = {
+                id: responseId,
+                model: modelName,
+                content: content || null,
+                reasoning_content: reasoning || null,
+                reasoning_details: reasoningDetails,
+                // Include reasoning details for multi-turn context
+                tool_calls: toolCalls.length > 0 ? convertToolCalls(toolCalls) : void 0,
+                images: responseImages,
+                finish_reason: finishReason,
+                usage: usage ? convertUsage(usage) : {
+                  prompt_tokens: 0,
+                  completion_tokens: 0,
+                  total_tokens: 0
+                }
+              };
+              response._provider = provider;
+              response._viaPlatform = viaPlatform;
+              if (platformProxyOrigin) {
+                const feePercent = getObservedRouterFeePercent(platformProxyOrigin);
+                if (feePercent !== null) {
+                  response._routerFeePercent = feePercent;
+                }
               }
+              response._providerResponseId = providerResponseId;
+              response._timing = {
+                latencyMs: firstChunkAt > 0 ? firstChunkAt - requestSentAt : null,
+                generationMs: firstTokenAt > 0 ? Math.max(0, lastTokenAt - firstTokenAt) : null
+              };
+              response._aggregate_response = {
+                id: responseId,
+                model: modelName,
+                choices: [
+                  {
+                    index: 0,
+                    message: {
+                      role: "assistant",
+                      content: content || null,
+                      reasoning_content: reasoning || null,
+                      reasoning_details: reasoningDetails,
+                      tool_calls: toolCalls.length > 0 ? convertToolCalls(toolCalls) : void 0,
+                      // Include generated images in the aggregate response
+                      // Store ID for mapping to file paths later (don't store base64 data)
+                      images: images.length > 0 ? images.map((img) => ({
+                        type: "image_url",
+                        _id: img.id,
+                        // For path lookup
+                        image_url: {
+                          url: `[image:${img.id}]`
+                          // Placeholder, will be replaced with path
+                        }
+                      })) : void 0
+                    },
+                    finish_reason: finishReason
+                  }
+                ],
+                usage: response.usage,
+                // Also store image count for quick reference
+                image_count: images.length,
+                // Store web search results for logging
+                web_searches: webSearches.length > 0 ? webSearches : void 0,
+                // Store generic provider-executed tools for logging
+                provider_tools: providerToolCalls.length > 0 ? providerToolCalls : void 0
+              };
             }
-            response._providerResponseId = providerResponseId;
-            response._timing = {
-              latencyMs: firstChunkAt > 0 ? firstChunkAt - requestSentAt : null,
-              generationMs: firstTokenAt > 0 ? Math.max(0, lastTokenAt - firstTokenAt) : null
-            };
-            response._aggregate_response = {
-              id: responseId,
-              model: modelName,
-              choices: [
-                {
-                  index: 0,
-                  message: {
-                    role: "assistant",
-                    content: content || null,
-                    reasoning_content: reasoning || null,
-                    reasoning_details: reasoningDetails,
-                    tool_calls: toolCalls.length > 0 ? convertToolCalls(toolCalls) : void 0,
-                    // Include generated images in the aggregate response
-                    // Store ID for mapping to file paths later (don't store base64 data)
-                    images: images.length > 0 ? images.map((img) => ({
-                      type: "image_url",
-                      _id: img.id,
-                      // For path lookup
-                      image_url: {
-                        url: `[image:${img.id}]`
-                        // Placeholder, will be replaced with path
-                      }
-                    })) : void 0
-                  },
-                  finish_reason: finishReason
-                }
-              ],
-              usage: response.usage,
-              // Also store image count for quick reference
-              image_count: images.length,
-              // Store web search results for logging
-              web_searches: webSearches.length > 0 ? webSearches : void 0,
-              // Store generic provider-executed tools for logging
-              provider_tools: providerToolCalls.length > 0 ? providerToolCalls : void 0
-            };
+          );
+        } catch (error) {
+          if (onParentAbort && parentSignal) {
+            parentSignal.removeEventListener("abort", onParentAbort);
           }
-        );
+          throw attributeThrownError(error, {
+            provider: provider.name,
+            viaPlatform
+          });
+        }
         if (!response) {
           throw new Error("Provider stream returned no response");
         }
         return response;
       }
+      /** Persist and broadcast provider-route attribution before any response. */
+      static async logProviderRoute(state, logId, providerName, viaPlatform) {
+        try {
+          if (!state.storage?.sql) return;
+          const upstream = viaPlatform ? providerName : null;
+          await state.storage.sql.exec(
+            `UPDATE logs
+         SET standard_agents_router_used = ?1,
+             actual_provider = COALESCE(actual_provider, ?2)
+         WHERE id = ?3`,
+            viaPlatform ? 1 : 0,
+            upstream,
+            logId
+          );
+          state.emitLog?.({
+            type: "log_data",
+            log_id: logId,
+            data: {
+              id: logId,
+              standard_agents_router_used: viaPlatform,
+              ...upstream ? { actual_provider: upstream } : {}
+            }
+          });
+        } catch (error) {
+          console.error("Failed to update provider route attribution (non-fatal):", error);
+        }
+      }
       /**
        * Emit content chunk to WebSocket for real-time UI updates
        */
@@ -2784,6 +2891,7 @@ var init_LLMRequest = __esm({
        */
       static async logError(state, error, errorType, modelId, startTime, existingLogId) {
         try {
+          const attribution = resolveErrorAttribution(error);
           let rawErrorMessage = error instanceof Error ? error.message : String(error);
           const errorStack = error instanceof Error ? error.stack : void 0;
           if (error instanceof Error && error.name === "AbortError" && /operation was aborted/i.test(rawErrorMessage)) {
@@ -2825,8 +2933,12 @@ var init_LLMRequest = __esm({
               // Parameter that caused error
               "user_id",
               // User context
-              "response"
+              "response",
               // Raw response
+              "origin",
+              // Structured error origin from ProviderError/custom providers
+              "upstream"
+              // Actual upstream behind an adapter/router
             ];
             const metadata = {};
             for (const field of relevantFields) {
@@ -2877,6 +2989,7 @@ ${errorStack}` : ""}${errorDetails}`;
                 errorsArray.push({
                   message: truncatedError,
                   type: errorType,
+                  origin: attribution.origin,
                   timestamp: Date.now()
                 });
                 await state.storage.sql.exec(
@@ -2884,20 +2997,29 @@ ${errorStack}` : ""}${errorDetails}`;
             UPDATE logs SET
               error = ?1,
               error_type = ?2,
-              errors = ?3,
-              latency_ms = ?4,
-              is_complete = ?5
-            WHERE id = ?6
+              error_origin = ?3,
+              errors = ?4,
+              latency_ms = ?5,
+              is_complete = ?6,
+              actual_provider = COALESCE(actual_provider, ?7),
+              standard_agents_router_used = CASE
+                WHEN ?8 = 1 THEN 1
+                ELSE standard_agents_router_used
+              END
+            WHERE id = ?9
           `,
                   truncatedError,
                   // Keep last error in error field for backwards compatibility
                   errorType,
                   // Keep last error type
+                  attribution.origin,
                   JSON.stringify(errorsArray),
                   // All errors in array
                   Date.now() - startTime,
                   1,
                   // is_complete = true
+                  attribution.upstream ?? null,
+                  attribution.standardAgentsRouterUsed ? 1 : 0,
                   trackedLogId
                 );
               }
@@ -2910,6 +3032,9 @@ ${errorStack}` : ""}${errorDetails}`;
                   id: trackedLogId,
                   error: truncatedError,
                   error_type: errorType,
+                  error_origin: attribution.origin,
+                  ...attribution.upstream ? { actual_provider: attribution.upstream } : {},
+                  ...attribution.standardAgentsRouterUsed ? { standard_agents_router_used: true } : {},
                   latency_ms: Date.now() - startTime,
                   is_complete: true
                 }
@@ -2926,9 +3051,12 @@ ${errorStack}` : ""}${errorDetails}`;
               id,
               message_id: messageId || "00000000-0000-0000-0000-000000000000",
               provider: this.getProviderFromModel(modelId),
+              actual_provider: attribution.upstream ?? null,
+              standard_agents_router_used: attribution.standardAgentsRouterUsed,
               model: modelId,
               error: truncatedError,
               error_type: errorType,
+              error_origin: attribution.origin,
               latency_ms: Date.now() - startTime,
               is_complete: true,
               created_at: Date.now() * TIMESTAMP_MULTIPLIER
@@ -2939,16 +3067,19 @@ ${errorStack}` : ""}${errorDetails}`;
                   await state.storage.sql.exec(
                     `
               INSERT INTO logs (
-                id, message_id, provider, model,
-                error, error_type, latency_ms, is_complete, created_at
-              ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9)
+                id, message_id, provider, actual_provider, standard_agents_router_used, model,
+                error, error_type, error_origin, latency_ms, is_complete, created_at
+              ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12)
             `,
                     logData.id,
                     messageId,
                     logData.provider,
+                    logData.actual_provider,
+                    logData.standard_agents_router_used ? 1 : 0,
                     logData.model,
                     logData.error,
                     logData.error_type,
+                    logData.error_origin,
                     logData.latency_ms,
                     1,
                     logData.created_at
@@ -6531,11 +6662,13 @@ ${errorStack}` : ""}`;
         UPDATE logs
         SET
           error = ?1,
-          error_type = ?2
-        WHERE id = ?3
+          error_type = ?2,
+          error_origin = ?3
+        WHERE id = ?4
       `,
             fullError,
             "tool_execution_error",
+            `tool:${toolName}`,
             parentLogId
           );
           if (state.emitLog) {
@@ -6545,7 +6678,8 @@ ${errorStack}` : ""}`;
               data: {
                 id: parentLogId,
                 error: fullError,
-                error_type: "tool_execution_error"
+                error_type: "tool_execution_error",
+                error_origin: `tool:${toolName}`
               }
             });
           }
@@ -7427,7 +7561,7 @@ var init_FlowEngine = __esm({
           const error = "Request did not complete \u2014 the response was interrupted (the worker was evicted or the provider stalled) before it finished.";
           const errorType = "interrupted_incomplete";
           await state.storage.sql.exec(
-            `UPDATE logs SET is_complete = 1, error = ?1, error_type = ?2 WHERE is_complete = 0`,
+            `UPDATE logs SET is_complete = 1, error = ?1, error_type = ?2, error_origin = 'runtime' WHERE is_complete = 0`,
             error,
             errorType
           );
@@ -7435,7 +7569,7 @@ var init_FlowEngine = __esm({
             state.emitLog?.({
               type: "log_data",
               log_id: row.id,
-              data: { id: row.id, is_complete: true, error, error_type: errorType }
+              data: { id: row.id, is_complete: true, error, error_type: errorType, error_origin: "runtime" }
             });
           }
           console.warn(
@@ -7971,7 +8105,7 @@ This usually points to something I can't fix from here \u2014 for example the wo
             pendingMessageId
           );
           await state.storage.sql.exec(
-            `UPDATE logs SET error = ?, error_type = ? WHERE id = ?`,
+            `UPDATE logs SET error = ?, error_type = ?, error_origin = 'runtime' WHERE id = ?`,
             "Interrupted by user",
             "user_interrupted",
             logId
@@ -11514,8 +11648,8 @@ ${errorStack}` : ""}`;
             `
         INSERT INTO logs (
           id, message_id, provider, model,
-          error, error_type, created_at
-        ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7)
+          error, error_type, error_origin, created_at
+        ) VALUES (?1, ?2, ?3, ?4, ?5, ?6, 'runtime', ?7)
       `,
             crypto.randomUUID(),
             messageId,
@@ -15859,6 +15993,10 @@ declare module 'virtual:@standardagents/builder' {
     parent_log_id: string | null;
     retry_of_log_id: string | null;
     error: string | null;
+    error_type: string | null;
+    error_origin: import('@standardagents/spec').ErrorOrigin | null;
+    actual_provider: string | null;
+    standard_agents_router_used: boolean;
     cost_total: number | null;
     is_complete: boolean;
     created_at: number;
@@ -25863,8 +26001,32 @@ var migration36 = {
   }
 };
 
+// src/durable-objects/migrations/037_add_error_origin.ts
+var migration37 = {
+  version: 37,
+  name: "add_error_origin",
+  async up(sql) {
+    const columns = sql.exec(`PRAGMA table_info(logs)`).toArray();
+    if (!columns.some((column) => column.name === "error_origin")) {
+      sql.exec(`ALTER TABLE logs ADD COLUMN error_origin TEXT`);
+    }
+    sql.exec(`
+      UPDATE logs
+      SET error_origin = CASE
+        WHEN error_type = 'tool_execution_error' THEN 'tool:unknown'
+        WHEN standard_agents_router_used = 1 THEN 'platform-router'
+        WHEN provider IS NOT NULL AND provider NOT IN ('system', 'runtime')
+          THEN 'provider:' || provider
+        ELSE 'runtime'
+      END
+      WHERE error IS NOT NULL AND error_origin IS NULL
+    `);
+    sql.exec(`UPDATE _metadata SET value = '37' WHERE key = 'schema_version'`);
+  }
+};
+
 // src/durable-objects/migrations/index.ts
-var migrations = [migration, migration2, migration3, migration4, migration5, migration6, migration7, migration8, migration9, migration10, migration11, migration12, migration13, migration14, migration15, migration16, migration17, migration18, migration19, migration20, migration21, migration22, migration23, migration24, migration25, migration26, migration27, migration28, migration29, migration30, migration31, migration32, migration33, migration34, migration35, migration36];
+var migrations = [migration, migration2, migration3, migration4, migration5, migration6, migration7, migration8, migration9, migration10, migration11, migration12, migration13, migration14, migration15, migration16, migration17, migration18, migration19, migration20, migration21, migration22, migration23, migration24, migration25, migration26, migration27, migration28, migration29, migration30, migration31, migration32, migration33, migration34, migration35, migration36, migration37];
 var LATEST_SCHEMA_VERSION = migrations.length;
 
 // src/durable-objects/subagent-reconcile.ts
@@ -26700,7 +26862,7 @@ function eventSocketCanReceive(attachment, ownerUserId) {
 }
 
 // src/durable-objects/agentbuilder-migrations/0001_initial.ts
-var migration37 = {
+var migration38 = {
   version: 1,
   async up(sql) {
     sql.exec(`
@@ -26799,7 +26961,7 @@ var migration37 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0002_add_tenvs_properties.ts
-var migration38 = {
+var migration39 = {
   version: 2,
   async up(sql) {
     sql.exec(`ALTER TABLE threads ADD COLUMN tenvs TEXT`);
@@ -26811,7 +26973,7 @@ var migration38 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0003_add_parent_and_terminated.ts
-var migration39 = {
+var migration40 = {
   version: 3,
   async up(sql) {
     sql.exec(`ALTER TABLE threads ADD COLUMN parent TEXT REFERENCES threads(id)`);
@@ -26824,7 +26986,7 @@ var migration39 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0004_add_env_tables.ts
-var migration40 = {
+var migration41 = {
   version: 4,
   async up(sql) {
     sql.exec(`ALTER TABLE threads ADD COLUMN env TEXT`);
@@ -26848,7 +27010,7 @@ var migration40 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0005_add_pending_subagent_env_requests.ts
-var migration41 = {
+var migration42 = {
   version: 5,
   async up(sql) {
     sql.exec(`
@@ -26874,7 +27036,7 @@ var migration41 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0006_add_env_value_types.ts
-var migration42 = {
+var migration43 = {
   version: 6,
   async up(sql) {
     sql.exec(
@@ -26889,7 +27051,7 @@ var migration42 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0007_platform_identity_replica.ts
-var migration43 = {
+var migration44 = {
   version: 7,
   async up(sql) {
     sql.exec(`ALTER TABLE users ADD COLUMN platform_user_id TEXT`);
@@ -26918,7 +27080,7 @@ var migration43 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0008_add_skills.ts
-var migration44 = {
+var migration45 = {
   version: 8,
   async up(sql) {
     sql.exec(`
@@ -26949,7 +27111,7 @@ var migration44 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0009_add_user_permissions.ts
-var migration45 = {
+var migration46 = {
   version: 9,
   async up(sql) {
     sql.exec(`ALTER TABLE users ADD COLUMN permissions TEXT`);
@@ -26960,7 +27122,7 @@ var migration45 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0010_add_device_logins.ts
-var migration46 = {
+var migration47 = {
   version: 10,
   async up(sql) {
     sql.exec(`
@@ -26980,7 +27142,7 @@ var migration46 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0011_add_user_values.ts
-var migration47 = {
+var migration48 = {
   version: 11,
   async up(sql) {
     sql.exec(`
@@ -27003,7 +27165,7 @@ var migration47 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0012_allow_api_instance_role.ts
-var migration48 = {
+var migration49 = {
   version: 12,
   async up(sql) {
     sql.exec(`CREATE TABLE oauth_accounts_0012_backup AS SELECT * FROM oauth_accounts`);
@@ -27113,7 +27275,7 @@ var migration48 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0013_add_thread_activity.ts
-var migration49 = {
+var migration50 = {
   version: 13,
   async up(sql) {
     sql.exec(`ALTER TABLE threads ADD COLUMN last_activity_at INTEGER`);
@@ -27129,7 +27291,7 @@ var migration49 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0014_thread_activity_scale.ts
-var migration50 = {
+var migration51 = {
   version: 14,
   async up(sql) {
     sql.exec(`ALTER TABLE threads ADD COLUMN last_message_preview TEXT`);
@@ -27147,7 +27309,7 @@ var migration50 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0015_clear_envelope_previews.ts
-var migration51 = {
+var migration52 = {
   version: 15,
   async up(sql) {
     sql.exec(
@@ -27161,7 +27323,7 @@ var migration51 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0016_add_origin_agent.ts
-var migration52 = {
+var migration53 = {
   version: 16,
   async up(sql) {
     sql.exec(`ALTER TABLE threads ADD COLUMN origin_agent_name TEXT`);
@@ -27176,7 +27338,7 @@ var migration52 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0017_add_thread_message_recency.ts
-var migration53 = {
+var migration54 = {
   version: 17,
   async up(sql) {
     sql.exec(`ALTER TABLE threads ADD COLUMN last_message_at INTEGER`);
@@ -27188,7 +27350,7 @@ var migration53 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0018_auth_security.ts
-var migration54 = {
+var migration55 = {
   version: 18,
   async up(sql) {
     sql.exec(`
@@ -27220,7 +27382,7 @@ var migration54 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0019_scope_skills.ts
-var migration55 = {
+var migration56 = {
   version: 19,
   async up(sql) {
     sql.exec(`
@@ -27270,7 +27432,7 @@ var migration55 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0020_websocket_tickets.ts
-var migration56 = {
+var migration57 = {
   version: 20,
   async up(sql) {
     sql.exec(`
@@ -27291,7 +27453,7 @@ var migration56 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/0021_platform_handoff_jtis.ts
-var migration57 = {
+var migration58 = {
   version: 21,
   async up(sql) {
     sql.exec(`
@@ -27310,9 +27472,9 @@ var migration57 = {
 };
 
 // src/durable-objects/agentbuilder-migrations/index.ts
-var migrations2 = [migration37, migration38, migration39, migration40, migration41, migration42, migration43, migration44, migration45, migration46, migration47, migration48, migration49, migration50, migration51, migration52, migration53, migration54, migration55, migration56, migration57];
+var migrations2 = [migration38, migration39, migration40, migration41, migration42, migration43, migration44, migration45, migration46, migration47, migration48, migration49, migration50, migration51, migration52, migration53, migration54, migration55, migration56, migration57, migration58];
 var LATEST_SCHEMA_VERSION2 = migrations2.reduce(
-  (max, migration58) => Math.max(max, migration58.version),
+  (max, migration59) => Math.max(max, migration59.version),
   0
 );
 
@@ -28098,9 +28260,9 @@ ${result ?? error ?? "No result content."}${attachmentSummary}`;
     }
   }
   async runMigrations(fromVersion) {
-    for (const migration58 of migrations2) {
-      if (migration58.version > fromVersion) {
-        await migration58.up(this.ctx.storage.sql);
+    for (const migration59 of migrations2) {
+      if (migration59.version > fromVersion) {
+        await migration59.up(this.ctx.storage.sql);
       }
     }
   }
@@ -32484,9 +32646,9 @@ var DurableThread = class _DurableThread extends DurableObject {
    * Each migration is run in order, starting from the current version + 1.
    */
   async runMigrations(fromVersion) {
-    for (const migration58 of migrations) {
-      if (migration58.version > fromVersion) {
-        await migration58.up(this.ctx.storage.sql);
+    for (const migration59 of migrations) {
+      if (migration59.version > fromVersion) {
+        await migration59.up(this.ctx.storage.sql);
       }
     }
   }
@@ -34008,7 +34170,7 @@ ${resultContent}${attachmentSummary}`;
         `
         SELECT
           id, message_id, provider, actual_provider, standard_agents_router_used, model, model_name, prompt_name,
-          tools_called, queued_tools, provider_tools, parent_log_id, retry_of_log_id, error, error_type, cost_total,
+          tools_called, queued_tools, provider_tools, parent_log_id, retry_of_log_id, error, error_type, error_origin, cost_total,
           input_tokens, cached_tokens, output_tokens, total_tokens,
           is_complete, created_at
         FROM logs
@@ -34034,6 +34196,7 @@ ${resultContent}${attachmentSummary}`;
         retry_of_log_id: row.retry_of_log_id,
         error: row.error,
         error_type: row.error_type,
+        error_origin: row.error_origin,
         cost_total: row.cost_total,
         input_tokens: row.input_tokens,
         cached_tokens: row.cached_tokens,
@@ -34143,16 +34306,16 @@ ${resultContent}${attachmentSummary}`;
           WHERE logs.parent_log_id IS NOT NULL
         )
         SELECT
-          id, message_id, provider, actual_provider, model, model_name, prompt_name,
-          tools_called, queued_tools, provider_tools, parent_log_id, retry_of_log_id, error, cost_total,
+          id, message_id, provider, actual_provider, standard_agents_router_used, model, model_name, prompt_name,
+          tools_called, queued_tools, provider_tools, parent_log_id, retry_of_log_id, error, error_type, error_origin, cost_total,
           is_complete, created_at
         FROM logs
         WHERE id IN (SELECT id FROM selected_logs)
         ORDER BY created_at ${order}, rowid ${order}
       ` : `
         SELECT
-          id, message_id, provider, actual_provider, model, model_name, prompt_name,
-          tools_called, queued_tools, provider_tools, parent_log_id, retry_of_log_id, error, cost_total,
+          id, message_id, provider, actual_provider, standard_agents_router_used, model, model_name, prompt_name,
+          tools_called, queued_tools, provider_tools, parent_log_id, retry_of_log_id, error, error_type, error_origin, cost_total,
           is_complete, created_at
         FROM logs
         WHERE id IN (${placeholders})
@@ -34164,6 +34327,7 @@ ${resultContent}${attachmentSummary}`;
       message_id: row.message_id,
       provider: row.provider,
       actual_provider: row.actual_provider,
+      standard_agents_router_used: row.standard_agents_router_used === 1,
       model: row.model,
       model_name: row.model_name,
       prompt_name: row.prompt_name,
@@ -34173,6 +34337,8 @@ ${resultContent}${attachmentSummary}`;
       parent_log_id: row.parent_log_id,
       retry_of_log_id: row.retry_of_log_id,
       error: row.error,
+      error_type: row.error_type,
+      error_origin: row.error_origin,
       cost_total: row.cost_total,
       is_complete: row.is_complete === 1,
       created_at: row.created_at
@@ -34258,8 +34424,8 @@ ${resultContent}${attachmentSummary}`;
           )
           SELECT
             rowid AS row_index,
-            id, message_id, provider, actual_provider, model, model_name, prompt_name,
-            tools_called, queued_tools, provider_tools, parent_log_id, retry_of_log_id, error, cost_total,
+            id, message_id, provider, actual_provider, standard_agents_router_used, model, model_name, prompt_name,
+            tools_called, queued_tools, provider_tools, parent_log_id, retry_of_log_id, error, error_type, error_origin, cost_total,
             is_complete, created_at
           FROM logs
           WHERE id IN (SELECT id FROM selected_logs)
@@ -34267,8 +34433,8 @@ ${resultContent}${attachmentSummary}`;
         ` : `
           SELECT
             rowid AS row_index,
-            id, message_id, provider, actual_provider, model, model_name, prompt_name,
-            tools_called, queued_tools, provider_tools, parent_log_id, retry_of_log_id, error, cost_total,
+            id, message_id, provider, actual_provider, standard_agents_router_used, model, model_name, prompt_name,
+            tools_called, queued_tools, provider_tools, parent_log_id, retry_of_log_id, error, error_type, error_origin, cost_total,
             is_complete, created_at
           FROM logs
           WHERE message_id IN (${placeholders})
@@ -34289,6 +34455,7 @@ ${resultContent}${attachmentSummary}`;
       message_id: row.message_id,
       provider: row.provider,
       actual_provider: row.actual_provider,
+      standard_agents_router_used: row.standard_agents_router_used === 1,
       model: row.model,
       model_name: row.model_name,
       prompt_name: row.prompt_name,
@@ -34298,6 +34465,8 @@ ${resultContent}${attachmentSummary}`;
       parent_log_id: row.parent_log_id,
       retry_of_log_id: row.retry_of_log_id,
       error: row.error,
+      error_type: row.error_type,
+      error_origin: row.error_origin,
       cost_total: row.cost_total,
       is_complete: row.is_complete === 1,
       created_at: row.created_at
@@ -34319,7 +34488,7 @@ ${resultContent}${attachmentSummary}`;
           l.request_headers, l.response_headers, l.status_code,
           l.input_tokens, l.cached_tokens, l.output_tokens,
           l.reasoning_tokens, l.total_tokens, l.latency_ms, l.time_to_first_token_ms, l.generation_ms,
-          l.finish_reason, l.error, l.error_type, l.cost_input, l.cost_cached, l.cost_output, l.cost_router_fee, l.router_fee_percent, l.cost_total,
+          l.finish_reason, l.error, l.error_type, l.error_origin, l.cost_input, l.cost_cached, l.cost_output, l.cost_router_fee, l.router_fee_percent, l.cost_total,
           l.message_history_length, l.tools_available, l.prompt_name, l.tools_called,
           l.queued_tools, l.provider_tools, l.parent_log_id,
           l.errors, l.retry_of_log_id, l.is_complete, l.created_at,
@@ -34393,6 +34562,7 @@ ${resultContent}${attachmentSummary}`;
         finish_reason: row.finish_reason,
         error: row.error,
         error_type: row.error_type,
+        error_origin: row.error_origin,
         cost_input: row.cost_input,
         cost_cached: row.cost_cached,
         cost_output: row.cost_output,
@@ -36639,7 +36809,7 @@ ${resultContent}${attachmentSummary}`;
     const error = "Request lost \u2014 the executor restarted (deploy or eviction) or hung before finishing. The thread watchdog finalized it.";
     const errorType = "execution_lost";
     await this.ctx.storage.sql.exec(
-      `UPDATE logs SET is_complete = 1, error = ?1, error_type = ?2 WHERE is_complete = 0`,
+      `UPDATE logs SET is_complete = 1, error = ?1, error_type = ?2, error_origin = 'runtime' WHERE is_complete = 0`,
       error,
       errorType
     );
@@ -36647,7 +36817,7 @@ ${resultContent}${attachmentSummary}`;
       this.broadcastLog({
         type: "log_data",
         log_id: id,
-        data: { id, is_complete: true, error, error_type: errorType }
+        data: { id, is_complete: true, error, error_type: errorType, error_origin: "runtime" }
       });
     }
     try {