@anvia/studio 1.0.0-rc.1 → 1.0.0-rc.2

package/dist/index.js

@@ -178,7 +178,12 @@ var StudioRunTraceObserver = class {
   async end(args) {
     await this.save("success", {
       endedAt: /* @__PURE__ */ new Date(),
-      output: args.output,
+      output: args.status === "completed" ? traceOutput(args.output) : args.text,
+      result: {
+        status: args.status,
+        text: args.text,
+        ...args.status === "completed" ? { output: toJsonValue(args.output) } : { stage: args.stage }
+      },
       usage: args.usage,
       messages: toJsonValue(args.messages)
     });
@@ -198,12 +203,13 @@ var StudioRunTraceObserver = class {
       return;
     }
     const metadata = traceMetadata(this.props.args, result.messages);
+    if (result.result !== void 0) metadata.result = result.result;
     const trace = {
       id: this.props.id,
       runId: this.props.args.runId,
       sessionId,
       status,
-      trace: this.trace,
+      trace: { observer: "studio", ...this.trace },
       startedAt: this.startedAt.toISOString(),
       endedAt: result.endedAt.toISOString(),
       durationMs: durationMs(this.startedAt, result.endedAt),
@@ -282,15 +288,14 @@ var ChildAgentToolTraceAccumulator = class {
     }
     if (child.type === "tool_call" && isRecord(child.toolCall)) {
       const toolCall = child.toolCall;
-      const toolCallFunction = isRecord(toolCall.function) ? toolCall.function : void 0;
-      const toolName = typeof toolCallFunction?.name === "string" ? toolCallFunction.name : "tool";
-      const callId = typeof toolCall.callId === "string" ? toolCall.callId : typeof toolCall.id === "string" ? toolCall.id : void 0;
+      const toolName = typeof toolCall.toolName === "string" ? toolCall.toolName : "tool";
+      const callId = typeof toolCall.toolCallId === "string" ? toolCall.toolCallId : typeof toolCall.callId === "string" ? toolCall.callId : void 0;
       const start = {
         startedAt: /* @__PURE__ */ new Date(),
         agentId,
         childTurn,
         toolName,
-        input: toJsonValue(toolCallFunction?.arguments ?? {}),
+        input: toJsonValue("input" in toolCall ? toolCall.input : {}),
         completed: false
       };
       if (agentName !== void 0) start.agentName = agentName;
@@ -443,14 +448,12 @@ function generationMetadata(args, endArgs) {
   const request = args.request;
   const response = endArgs?.response;
   const rawResponse = isRecord(response?.rawResponse) ? response.rawResponse : void 0;
-  const effectiveModel = request.model ?? stringValue(rawResponse?.model) ?? args.modelInfo?.defaultModel ?? "default";
+  const modelId = args.modelInfo?.modelId ?? stringValue(rawResponse?.model) ?? "unknown";
   const providerResponse = providerResponseSummary(rawResponse);
   const usage = response?.usage;
   return compactJsonObject({
     provider: args.modelInfo?.provider,
-    model: effectiveModel,
-    requestedModel: request.model,
-    defaultModel: args.modelInfo?.defaultModel,
+    modelId,
     messageId: response?.messageId,
     usage,
     toolCount: request.tools.length,
@@ -460,15 +463,13 @@ function generationMetadata(args, endArgs) {
     temperature: request.temperature,
     maxTokens: request.maxTokens,
     toolChoice: request.toolChoice,
-    additionalParamKeys: isRecord(request.additionalParams) ? Object.keys(request.additionalParams).sort() : void 0,
+    providerOptionKeys: isRecord(request.providerOptions) ? Object.keys(request.providerOptions).sort() : void 0,
     hasOutputSchema: request.outputSchema !== void 0,
     firstDeltaMs: endArgs?.firstDeltaMs,
     providerResponse,
     modelInfo: compactJsonObject({
       provider: args.modelInfo?.provider,
-      model: effectiveModel,
-      requestedModel: request.model,
-      defaultModel: args.modelInfo?.defaultModel,
+      modelId,
       capabilities: args.modelInfo?.capabilities
     }),
     modelCall: compactJsonObject({
@@ -494,7 +495,6 @@ function generationMetadata(args, endArgs) {
 }
 function completionRequestSummary(request) {
   return compactJsonObject({
-    model: request.model,
     instructions: request.instructions === void 0 ? void 0 : { present: true },
     messageCount: request.chatHistory.length,
     documentCount: request.documents.length,
@@ -504,7 +504,7 @@ function completionRequestSummary(request) {
     temperature: request.temperature,
     maxTokens: request.maxTokens,
     toolChoice: request.toolChoice,
-    additionalParamKeys: isRecord(request.additionalParams) ? Object.keys(request.additionalParams).sort() : void 0,
+    providerOptionKeys: isRecord(request.providerOptions) ? Object.keys(request.providerOptions).sort() : void 0,
     hasOutputSchema: request.outputSchema !== void 0
   });
 }
@@ -541,7 +541,6 @@ function toolMetadata(args, skipped, result) {
     argumentBytes: byteLength(args.args),
     resultBytes: result === void 0 ? void 0 : byteLength(result),
     hasCallSignature: args.toolCall.signature !== void 0,
-    hasAdditionalParams: args.toolCall.additionalParams !== void 0,
     toolDescription: args.toolDefinition?.description,
     parameterKeys: Object.keys(properties).sort(),
     requiredParameterKeys: required,
@@ -559,8 +558,7 @@ function toolMetadata(args, skipped, result) {
       mcpServerName: args.toolMetadata?.mcpServerName,
       argumentBytes: byteLength(args.args),
       resultBytes: result === void 0 ? void 0 : byteLength(result),
-      hasCallSignature: args.toolCall.signature !== void 0,
-      hasAdditionalParams: args.toolCall.additionalParams !== void 0
+      hasCallSignature: args.toolCall.signature !== void 0
     })
   });
 }
@@ -577,6 +575,16 @@ function parseOrString(value) {
     return value;
   }
 }
+function traceOutput(value) {
+  if (typeof value === "string") {
+    return value;
+  }
+  try {
+    return JSON.stringify(toJsonValue(value));
+  } catch {
+    return String(value);
+  }
+}
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -877,17 +885,18 @@ function escapeHtml(value) {
 }
 
 // src/runtime/agent-context.ts
-import { isContextIndex } from "@anvia/core/agent";
+import { isVectorContext } from "@anvia/core/agent";
 function staticContextDocuments(agent) {
-  return agent.context.filter((input) => !isContextIndex(input));
+  return agent.context.filter((input) => !isVectorContext(input));
 }
-function contextIndexes(agent) {
-  return agent.context.filter(isContextIndex);
+function vectorContexts(agent) {
+  return agent.context.filter(isVectorContext);
 }
 
 // src/runtime/agent-runs.ts
-import { Message } from "@anvia/core/completion";
-import { withInternalAgentRunOptions } from "@anvia/core/internal/agent";
+import {
+  withInternalAgentRunOptions
+} from "@anvia/core/internal/agent";
 
 // src/runtime/agent-utils.ts
 import {
@@ -914,7 +923,8 @@ function serializeError(error) {
 
 // src/runtime/type-guards.ts
 import {
-  isJsonValue as isCoreJsonValue
+  isJsonValue as isCoreJsonValue,
+  isMessage
 } from "@anvia/core/completion";
 function isObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -925,26 +935,16 @@ function isJsonObject(value) {
 function isJsonValue(value) {
   return isCoreJsonValue(value);
 }
-function isMessageInput(value) {
-  return typeof value === "string" || isMessage(value);
-}
-function isMessage(value) {
-  if (!isObject(value) || typeof value.role !== "string") {
-    return false;
-  }
-  if (value.role === "system") {
-    return typeof value.content === "string";
-  }
-  if (value.role === "user" || value.role === "assistant" || value.role === "tool") {
-    return Array.isArray(value.content);
-  }
-  return false;
-}
 function isAgentTraceOptions(value) {
   if (!isObject(value)) {
     return false;
   }
-  return optionalString(value.name) && optionalString(value.userId) && optionalString(value.sessionId) && optionalString(value.version) && optionalString(value.traceId) && optionalBoolean(value.failOnObserverError) && optionalStringArray(value.tags) && optionalObject(value.metadata);
+  if (!Object.keys(value).every(
+    (key) => ["name", "userId", "sessionId", "metadata", "tags", "version", "traceId"].includes(key)
+  )) {
+    return false;
+  }
+  return optionalString(value.name) && optionalString(value.userId) && optionalString(value.sessionId) && optionalString(value.version) && optionalString(value.traceId) && optionalStringArray(value.tags) && (value.metadata === void 0 || isJsonObject(value.metadata));
 }
 function isNonNegativeInteger(value) {
   return Number.isInteger(value) && typeof value === "number" && value >= 0;
@@ -955,15 +955,9 @@ function isPositiveInteger(value) {
 function optionalString(value) {
   return value === void 0 || typeof value === "string";
 }
-function optionalBoolean(value) {
-  return value === void 0 || typeof value === "boolean";
-}
 function optionalStringArray(value) {
   return value === void 0 || Array.isArray(value) && value.every((item) => typeof item === "string");
 }
-function optionalObject(value) {
-  return value === void 0 || isObject(value);
-}
 
 // src/runtime/http.ts
 function errorResponse(c, status, code, message, details) {
@@ -1013,8 +1007,8 @@ function createStudioModelRegistry(config) {
       id,
       staticModels
     };
-    if (provider.defaultModel !== void 0) {
-      runtimeProvider.defaultModel = normalizeModelId(provider.defaultModel);
+    if (provider.defaultModelId !== void 0) {
+      runtimeProvider.defaultModelId = normalizeModelId(provider.defaultModelId);
     }
     providers.set(id, runtimeProvider);
   }
@@ -1023,8 +1017,10 @@ function createStudioModelRegistry(config) {
     agentPolicies: normalizeAgentPolicies(config.agents ?? {}),
     modelCache: /* @__PURE__ */ new Map()
   };
-  if (config.default !== void 0) {
-    Object.assign(registry, { defaultModel: normalizeModelRef(config.default) });
+  if (config.defaultModelRef !== void 0) {
+    Object.assign(registry, {
+      defaultModelRef: normalizeModelRef(config.defaultModelRef)
+    });
   }
   return registry;
 }
@@ -1041,7 +1037,7 @@ function studioModelsConfig(registry, agents) {
       models
     };
     if (provider.name !== void 0) config2.name = provider.name;
-    if (provider.defaultModel !== void 0) config2.defaultModel = provider.defaultModel;
+    if (provider.defaultModelId !== void 0) config2.defaultModelId = provider.defaultModelId;
     if (provider.metadata !== void 0) config2.metadata = provider.metadata;
     return config2;
   });
@@ -1053,7 +1049,7 @@ function studioModelsConfig(registry, agents) {
     providers,
     agents: agentsConfig
   };
-  if (registry.defaultModel !== void 0) config.default = registry.defaultModel;
+  if (registry.defaultModelRef !== void 0) config.defaultModelRef = registry.defaultModelRef;
   return config;
 }
 function registerModelRoutes(app, props) {
@@ -1067,8 +1063,8 @@ function registerModelRoutes(app, props) {
     const response = {
       providers
     };
-    if (props.registry.defaultModel !== void 0) {
-      response.defaultModel = props.registry.defaultModel;
+    if (props.registry.defaultModelRef !== void 0) {
+      response.defaultModelRef = props.registry.defaultModelRef;
     }
     return c.json(response);
   });
@@ -1101,7 +1097,7 @@ function resolveStudioModel(registry, input) {
   if (registry === void 0) {
     return { warnings: [] };
   }
-  const selectedRef = normalizeOptionalModelRef(input.request.model) ?? sessionModelRef(input.sessionMetadata) ?? registry.agentPolicies.get(input.agent.id)?.default ?? registry.defaultModel;
+  const selectedRef = normalizeOptionalModelRef(input.request.model) ?? sessionModelRef(input.sessionMetadata) ?? registry.agentPolicies.get(input.agent.id)?.defaultModelRef ?? registry.defaultModelRef;
   if (selectedRef === void 0) {
     return { warnings: [] };
   }
@@ -1113,7 +1109,7 @@ function resolveStudioModel(registry, input) {
   }
   let model = registry.modelCache.get(selectedRef);
   if (model === void 0) {
-    model = provider.createCompletionModel(modelId);
+    model = provider.createCompletionModel({ modelId });
     registry.modelCache.set(selectedRef, model);
   }
   const metadata = provider.staticModels.get(modelId);
@@ -1131,12 +1127,7 @@ function normalizeOptionalModelRef(ref) {
   return ref === void 0 ? void 0 : normalizeModelRef(ref);
 }
 function normalizeModelRef(ref) {
-  if (typeof ref === "string") {
-    const trimmed = ref.trim();
-    const parsed = parseModelRef(trimmed);
-    return `${parsed.providerId}:${parsed.modelId}`;
-  }
-  return `${normalizeProviderId(ref.provider)}:${normalizeModelId(ref.model)}`;
+  return `${normalizeProviderId(ref.providerId)}:${normalizeModelId(ref.modelId)}`;
 }
 function parseModelRef(ref) {
   const index = ref.indexOf(":");
@@ -1179,12 +1170,12 @@ async function agentModelsCatalog(registry, agent) {
       return [];
     }
   });
-  const defaultModel = policy?.default ?? registry.defaultModel;
+  const defaultModelRef = policy?.defaultModelRef ?? registry.defaultModelRef;
   const summary = {
     agentId: agent.id,
     models: [...models, ...exactPolicyModels]
   };
-  if (defaultModel !== void 0) summary.defaultModel = defaultModel;
+  if (defaultModelRef !== void 0) summary.defaultModelRef = defaultModelRef;
   if (warnings.length > 0) summary.warnings = warnings;
   return summary;
 }
@@ -1222,7 +1213,7 @@ async function providerCatalog(provider) {
     models: [...models.values()].sort((left, right) => left.ref.localeCompare(right.ref))
   };
   if (provider.name !== void 0) catalog.name = provider.name;
-  if (provider.defaultModel !== void 0) catalog.defaultModel = provider.defaultModel;
+  if (provider.defaultModelId !== void 0) catalog.defaultModelId = provider.defaultModelId;
   if (provider.metadata !== void 0) catalog.metadata = provider.metadata;
   if (warning !== void 0) catalog.warning = warning;
   return catalog;
@@ -1256,19 +1247,33 @@ function normalizeAgentPolicies(policies) {
   return new Map(
     Object.entries(policies).map(([agentId, policy]) => {
       const normalized = {};
-      if (policy.default !== void 0) normalized.default = normalizeModelRef(policy.default);
+      if (policy.defaultModelRef !== void 0) {
+        normalized.defaultModelRef = normalizeModelRef(policy.defaultModelRef);
+      }
       if (policy.allowed !== void 0) {
-        normalized.allowed = policy.allowed.map(
-          (entry) => typeof entry === "string" && entry.trim().endsWith(":*") ? `${normalizeProviderId(entry.trim().slice(0, -2))}:*` : normalizeModelRef(entry)
-        );
+        normalized.allowed = policy.allowed.map((entry) => {
+          if (typeof entry === "string") {
+            return normalizeWildcardModelRef(entry);
+          }
+          return normalizeModelRef(entry);
+        });
       }
       return [agentId.trim(), normalized];
     })
   );
 }
+function normalizeWildcardModelRef(ref) {
+  const normalized = ref.trim();
+  if (!normalized.endsWith(":*")) {
+    throw new ModelSelectionError(`Invalid wildcard model reference: ${ref}`);
+  }
+  return `${normalizeProviderId(normalized.slice(0, -2))}:*`;
+}
 function publicPolicy(policy) {
   const config = {};
-  if (policy.default !== void 0) config.default = policy.default;
+  if (policy.defaultModelRef !== void 0) {
+    config.defaultModelRef = policy.defaultModelRef;
+  }
   if (policy.allowed !== void 0) config.allowed = policy.allowed;
   return config;
 }
@@ -1299,15 +1304,13 @@ function modelWarnings(ref, model, request) {
 function requestModalities(request) {
   const modalities = /* @__PURE__ */ new Set(["text"]);
   for (const message of requestMessages(request)) {
-    if (typeof message === "string") {
-      continue;
-    }
     if (message.role === "user" || message.role === "assistant") {
+      if (typeof message.content === "string") continue;
       for (const content of message.content) {
         if (content.type === "image") {
           modalities.add("image");
         }
-        if (content.type === "document") {
+        if (content.type === "file") {
           modalities.add("document");
         }
       }
@@ -1316,7 +1319,7 @@ function requestModalities(request) {
   return modalities;
 }
 function requestMessages(request) {
-  return [...request.history ?? [], request.message];
+  return request.messages;
 }
 function normalizeProviderId(id) {
   const trimmed = id.trim();
@@ -1334,7 +1337,7 @@ function normalizeModelId(id) {
 }
 
 // src/runtime/streams.ts
-import { createEventStream } from "@anvia/server";
+import { createClientStreamResponse, createEventStreamResponse } from "@anvia/server";
 var studioJsonlHeaders = {
   "cache-control": "no-cache, no-transform",
   connection: "keep-alive",
@@ -1343,7 +1346,15 @@ var studioJsonlHeaders = {
   "x-accel-buffering": "no"
 };
 function streamStudioJsonl(events) {
-  return createEventStream(withStudioStreamErrors(events), {
+  return createEventStreamResponse({
+    events: withStudioStreamErrors(events),
+    format: "jsonl",
+    headers: studioJsonlHeaders
+  });
+}
+function streamStudioClient(options) {
+  return createClientStreamResponse({
+    events: options.events,
     format: "jsonl",
     headers: studioJsonlHeaders
   });
@@ -1362,8 +1373,9 @@ function withStudioStreamErrors(events) {
             const next = await iterator.next();
             if (next.done === true) {
               done = true;
+              return next;
             }
-            return next;
+            return { done: false, value: serializeStreamError(next.value) };
           } catch (error) {
             done = true;
             return {
@@ -1381,6 +1393,12 @@ function withStudioStreamErrors(events) {
     }
   };
 }
+function serializeStreamError(event) {
+  if (typeof event !== "object" || event === null || !("type" in event) || event.type !== "error" || !("error" in event)) {
+    return event;
+  }
+  return { ...event, error: serializeError(event.error) };
+}
 function studioStreamError(error) {
   return {
     type: "error",
@@ -1589,6 +1607,15 @@ function isEventType(value) {
   return value === "session_log" || value === "pipeline_log" || value === "trace";
 }
 
+// src/runtime/runs.ts
+import {
+  customAgentEventsToClientStream
+} from "@anvia/client";
+import {
+  isJsonValue as isJsonValue2,
+  parseMessages
+} from "@anvia/core/completion";
+
 // src/runtime/transcript.ts
 function renumberTranscript(entries) {
   return entries.map((entry, entryId) => ({ ...entry, entryId }));
@@ -1602,7 +1629,8 @@ function transcriptFromMessages(messages) {
     if (message.role === "user") {
       const attachments = attachmentsFromMessage(message);
       let textEntryAdded = false;
-      for (const content of message.content) {
+      const contents2 = typeof message.content === "string" ? [{ type: "text", text: message.content }] : message.content;
+      for (const content of contents2) {
         if (content.type === "text") {
           const entry = {
             entryId: transcript.length,
@@ -1631,17 +1659,16 @@ function transcriptFromMessages(messages) {
         transcript.push({
           entryId: transcript.length,
           kind: "tool",
-          toolName: "tool_result",
-          callId: content.callId ?? content.id,
-          result: content.content.map(
-            (item) => "text" in item ? item.text : `[image:${item.mediaType ?? "image/png"}]`
-          ).join("\n"),
-          structuredResult: content.content
+          toolName: content.toolName,
+          callId: content.callId ?? content.toolCallId,
+          result: toolResultText(content.output),
+          ...content.output.type === "content" ? { structuredResult: content.output.value } : {}
         });
       }
       continue;
     }
-    for (const content of message.content) {
+    const contents = typeof message.content === "string" ? [{ type: "text", text: message.content }] : message.content;
+    for (const content of contents) {
       if (content.type === "text") {
         appendAssistantTranscriptText(transcript, content.text);
       } else if (content.type === "reasoning") {
@@ -1652,13 +1679,13 @@ function transcriptFromMessages(messages) {
         };
         if (content.id !== void 0) entry.reasoningId = content.id;
         transcript.push(entry);
-      } else if (content.type === "tool_call") {
+      } else if (content.type === "tool-call") {
         transcript.push({
           entryId: transcript.length,
           kind: "tool",
-          toolName: content.function.name,
-          callId: content.callId ?? content.id,
-          args: formatJson(content.function.arguments)
+          toolName: content.toolName,
+          callId: content.callId ?? content.toolCallId,
+          args: formatJson(content.input)
         });
       }
     }
@@ -1669,28 +1696,37 @@ function attachmentsFromMessage(message) {
   if (message.role !== "user" && message.role !== "assistant") {
     return [];
   }
+  if (typeof message.content === "string") return [];
   return message.content.flatMap((content) => {
     if (content.type === "image") {
       const attachment = { kind: "image" };
-      if (content.source.type === "base64") {
-        attachment.data = content.source.data;
-        attachment.mediaType = content.source.mediaType;
+      if (content.image.type === "data") {
+        attachment.data = content.image.data;
+        if (content.mediaType !== void 0) attachment.mediaType = content.mediaType;
       } else {
-        attachment.url = content.source.url;
+        attachment.url = content.image.url;
       }
       return [attachment];
     }
-    if (content.type === "document") {
+    if (content.type === "file") {
       const attachment = { kind: "document" };
-      if (content.source.filename !== void 0) attachment.name = content.source.filename;
-      if (content.source.mediaType !== void 0) attachment.mediaType = content.source.mediaType;
-      if (content.source.type === "base64") attachment.data = content.source.data;
-      if (content.source.type === "url") attachment.url = content.source.url;
+      if (content.filename !== void 0) attachment.name = content.filename;
+      attachment.mediaType = content.mediaType;
+      if (content.data.type === "data") attachment.data = content.data.data;
+      if (content.data.type === "url") attachment.url = content.data.url;
       return [attachment];
     }
     return [];
   });
 }
+function toolResultText(output) {
+  if (output.type === "text" || output.type === "error-text") return output.value;
+  if (output.type === "json" || output.type === "error-json") return formatJson(output.value);
+  if (output.type === "execution-denied") return output.reason ?? "Execution denied";
+  return output.value.map(
+    (part) => part.type === "text" ? part.text : `[file:${part.mediaType}${part.filename === void 0 ? "" : `:${part.filename}`}]`
+  ).join("\n");
+}
 function appendAssistantTranscriptText(transcript, text) {
   const last = transcript.at(-1);
   if (last?.kind === "message" && last.role === "assistant") {
@@ -1778,8 +1814,97 @@ async function* mergeRunAndApprovalEvents(runEvents, approvalEvents) {
     approvalEvents.close();
   }
 }
-function streamAgentRunEvents(_c, events, options = {}) {
-  return streamStudioJsonl(withAgentRunCancellation(events, options.onCancel));
+function streamAgentRunEvents(_c, events, options) {
+  return streamStudioClient({
+    events: customAgentEventsToClientStream({
+      events: withAgentRunCancellation(events, options.onCancel),
+      runId: options.runId,
+      mapCustomEvent: studioEventToClientEvent
+    })
+  });
+}
+function studioEventToClientEvent(event, context) {
+  if (event.type === "tool_approval_request" || event.type === "tool_approval_result") {
+    return {
+      type: "tool_approval",
+      runId: context.runId,
+      ...context.turn === void 0 ? {} : { turn: context.turn },
+      ...context.scope === void 0 ? {} : { scope: context.scope },
+      approval: {
+        id: event.approval.id,
+        runId: event.approval.runId,
+        agentId: event.approval.agentId,
+        ...event.approval.sessionId === void 0 ? {} : { sessionId: event.approval.sessionId },
+        toolName: event.approval.toolName,
+        ...event.approval.callId === void 0 ? {} : { callId: event.approval.callId },
+        internalCallId: event.approval.internalCallId,
+        input: parseJsonOrString(event.approval.args),
+        status: event.approval.status,
+        requestedAt: event.approval.requestedAt,
+        ...event.approval.resolvedAt === void 0 ? {} : { resolvedAt: event.approval.resolvedAt },
+        ...event.approval.reason === void 0 ? {} : { reason: event.approval.reason }
+      }
+    };
+  }
+  if (event.type === "tool_question_request" || event.type === "tool_question_result") {
+    return {
+      type: "tool_question",
+      runId: context.runId,
+      ...context.turn === void 0 ? {} : { turn: context.turn },
+      ...context.scope === void 0 ? {} : { scope: context.scope },
+      question: {
+        id: event.question.id,
+        runId: event.question.runId,
+        agentId: event.question.agentId,
+        ...event.question.sessionId === void 0 ? {} : { sessionId: event.question.sessionId },
+        toolName: event.question.toolName,
+        ...event.question.callId === void 0 ? {} : { callId: event.question.callId },
+        internalCallId: event.question.internalCallId,
+        input: parseJsonOrString(event.question.args),
+        questions: event.question.questions,
+        status: event.question.status,
+        requestedAt: event.question.requestedAt,
+        ...event.question.answeredAt === void 0 ? {} : { answeredAt: event.question.answeredAt },
+        ...event.question.cancelledAt === void 0 ? {} : { cancelledAt: event.question.cancelledAt },
+        ...event.question.answers === void 0 ? {} : { answers: event.question.answers }
+      }
+    };
+  }
+  if (event.type === "session_log" && isJsonValue2(event.log)) {
+    return {
+      type: "data",
+      runId: context.runId,
+      name: "studio.session_log",
+      data: event.log,
+      transient: true
+    };
+  }
+  if (event.type === "pipeline_log" && isJsonValue2(event.log)) {
+    return {
+      type: "data",
+      runId: context.runId,
+      name: "studio.pipeline_log",
+      data: event.log,
+      transient: true
+    };
+  }
+  if (event.type === "pipeline_final" && isJsonValue2(event.output)) {
+    return {
+      type: "data",
+      runId: context.runId,
+      name: "studio.pipeline_final",
+      data: event.output
+    };
+  }
+  return void 0;
+}
+function parseJsonOrString(value) {
+  try {
+    const parsed = JSON.parse(value);
+    return isJsonValue2(parsed) ? parsed : value;
+  } catch {
+    return value;
+  }
 }
 function withAgentRunCancellation(events, onCancel) {
   const iterator = events[Symbol.asyncIterator]();
@@ -1899,10 +2024,10 @@ function createPersistedStreamingSessionTranscript(props) {
         };
         if (event.type === "error") saveInput.error = serializeError(event.error);
         await saveTranscript(saveInput);
-        const generatedMessages = event.type === "final" ? event.messages.slice(1) : [];
+        const generatedMessages = event.type === "final" ? event.result.messages.slice(1) : [];
         if (props.persistGeneratedMessages === true && generatedMessages.length > 0) {
           await props.store.append({
-            context: { sessionId: props.session.id },
+            scope: { sessionId: props.session.id },
             runId: props.runId,
             turn: 1,
             messages: generatedMessages
@@ -2004,9 +2129,9 @@ function acceptTranscriptStreamEvent(transcript, event) {
     transcript.push({
       entryId: transcript.length,
       kind: "tool",
-      toolName: event.toolCall.function.name,
-      callId: event.toolCall.callId ?? event.toolCall.id,
-      args: formatJson(event.toolCall.function.arguments)
+      toolName: event.toolCall.toolName,
+      callId: event.toolCall.callId ?? event.toolCall.toolCallId,
+      args: formatJson(event.toolCall.input)
     });
   }
   if (event.type === "tool_result") {
@@ -2114,8 +2239,8 @@ function acceptTranscriptStreamEvent(transcript, event) {
       matched.question = question;
     }
   }
-  if (event.type === "final" && event.trace?.traceId !== void 0) {
-    assignTranscriptTraceId(transcript, event.trace.traceId);
+  if (event.type === "final" && event.result.trace?.traceId !== void 0) {
+    assignTranscriptTraceId(transcript, event.result.trace.traceId);
   }
   if (event.type === "error") {
     appendTranscriptAssistantError(transcript, errorText(event.error));
@@ -2187,9 +2312,9 @@ function childAgentTranscriptEvent(event) {
     const entry = {
       kind: "tool",
       agentId: event.agentId,
-      toolName: child.toolCall.function.name,
-      callId: child.toolCall.callId ?? child.toolCall.id,
-      args: formatJson(child.toolCall.function.arguments)
+      toolName: child.toolCall.toolName,
+      callId: child.toolCall.callId ?? child.toolCall.toolCallId,
+      args: formatJson(child.toolCall.input)
     };
     if (event.agentName !== void 0) entry.agentName = event.agentName;
     return entry;
@@ -2326,17 +2451,18 @@ function extractMessageText(message) {
   if (message.role === "system") {
     return message.content;
   }
+  if (typeof message.content === "string") {
+    return message.content;
+  }
   return message.content.flatMap((item) => {
     if (item.type === "text" || item.type === "reasoning") {
       return [item.text];
     }
-    if (item.type === "tool_call") {
-      return [`${item.function.name}(${formatJson(item.function.arguments)})`];
+    if (item.type === "tool-call") {
+      return [`${item.toolName}(${formatJson(item.input)})`];
     }
-    if (item.type === "tool_result") {
-      return item.content.map(
-        (result) => "text" in result ? result.text : `[image:${result.mediaType ?? "image/png"}]`
-      );
+    if (item.type === "tool-result") {
+      return [toolResultOutputText(item.output)];
     }
     return [];
   }).join("\n");
@@ -2345,23 +2471,26 @@ function optionalTranscriptAttachments(message) {
   if (typeof message === "string" || message.role !== "user") {
     return {};
   }
+  if (typeof message.content === "string") {
+    return {};
+  }
   const attachments = message.content.flatMap((content) => {
     if (content.type === "image") {
       const attachment = { kind: "image" };
-      if (content.source.type === "base64") {
-        attachment.data = content.source.data;
-        attachment.mediaType = content.source.mediaType;
+      if (content.image.type === "data") {
+        attachment.data = content.image.data;
+        if (content.mediaType !== void 0) attachment.mediaType = content.mediaType;
       } else {
-        attachment.url = content.source.url;
+        attachment.url = content.image.url;
       }
       return [attachment];
     }
-    if (content.type === "document") {
+    if (content.type === "file") {
       const attachment = { kind: "document" };
-      if (content.source.filename !== void 0) attachment.name = content.source.filename;
-      if (content.source.mediaType !== void 0) attachment.mediaType = content.source.mediaType;
-      if (content.source.type === "base64") attachment.data = content.source.data;
-      if (content.source.type === "url") attachment.url = content.source.url;
+      if (content.filename !== void 0) attachment.name = content.filename;
+      attachment.mediaType = content.mediaType;
+      if (content.data.type === "data") attachment.data = content.data.data;
+      if (content.data.type === "url") attachment.url = content.data.url;
       return [attachment];
     }
     return [];
@@ -2378,32 +2507,27 @@ async function parseRunRequest(c) {
   if (!isObject(body)) {
     return { error: errorResponse(c, 400, "bad_request", "Request body must be an object") };
   }
-  const request = "message" in body ? parseLegacyRunRequestBody(c, body) : parseUiRunRequestBody(c, body);
-  if ("error" in request) {
-    return request;
-  }
-  return parseRunRequestOptions(c, body, request);
-}
-function parseLegacyRunRequestBody(c, body) {
-  if (!isMessageInput(body.message)) {
+  if ("message" in body || "history" in body) {
     return {
-      error: errorResponse(c, 400, "bad_request", "Request body requires a string or Message")
+      error: errorResponse(
+        c,
+        400,
+        "bad_request",
+        "Legacy message/history requests are not supported; use messages"
+      )
     };
   }
-  const request = {
-    message: typeof body.message === "string" ? body.message : body.message
-  };
-  if ("history" in body) {
-    if (!Array.isArray(body.history) || !body.history.every(isMessage)) {
-      return { error: errorResponse(c, 400, "bad_request", "history must be a Message array") };
-    }
-    request.history = body.history;
+  const request = parseRunRequestBody(c, body);
+  if ("error" in request) {
+    return request;
   }
-  return request;
+  return parseRunRequestOptions(c, body, request);
 }
-function parseUiRunRequestBody(c, body) {
-  const messages = body.messages;
-  if (!Array.isArray(messages) || !messages.every(isMessage)) {
+function parseRunRequestBody(c, body) {
+  let messages;
+  try {
+    messages = parseMessages(body.messages);
+  } catch {
     return {
       error: errorResponse(c, 400, "bad_request", "messages must be a non-empty Message array")
     };
@@ -2419,19 +2543,21 @@ function parseUiRunRequestBody(c, body) {
       error: errorResponse(c, 400, "bad_request", "messages must be a non-empty Message array")
     };
   }
-  const history = messages.slice(0, -1);
-  const request = { message };
-  if (history.length > 0) request.history = history;
-  return request;
+  if (message.role !== "user") {
+    return {
+      error: errorResponse(c, 400, "bad_request", "The final message must be user-authored")
+    };
+  }
+  return { messages };
 }
 function parseRunRequestOptions(c, body, request) {
   if ("sessionId" in body) {
     if (typeof body.sessionId !== "string" || body.sessionId.trim().length === 0) {
       return { error: errorResponse(c, 400, "bad_request", "sessionId must be a string") };
     }
-    if (request.history !== void 0) {
+    if (request.messages.length !== 1 || request.messages[0]?.role !== "user") {
       return {
-        error: errorResponse(c, 400, "bad_request", "sessionId cannot be combined with history")
+        error: errorResponse(c, 400, "bad_request", "sessionId requires exactly one user message")
       };
     }
     request.sessionId = body.sessionId;
@@ -2459,12 +2585,10 @@ function parseRunRequestOptions(c, body, request) {
     request.toolConcurrency = body.toolConcurrency;
   }
   if ("model" in body) {
-    if (typeof body.model === "string") {
-      request.model = body.model;
-    } else if (isObject(body.model) && typeof body.model.provider === "string" && typeof body.model.model === "string") {
+    if (isObject(body.model) && typeof body.model.providerId === "string" && typeof body.model.modelId === "string") {
       request.model = {
-        provider: body.model.provider,
-        model: body.model.model
+        providerId: body.model.providerId,
+        modelId: body.model.modelId
       };
     } else {
       return {
@@ -2472,7 +2596,7 @@ function parseRunRequestOptions(c, body, request) {
           c,
           400,
           "bad_request",
-          "model must be a provider:model string or { provider, model } object"
+          "model must be a { providerId, modelId } object"
         )
       };
     }
@@ -2493,6 +2617,14 @@ function parseRunRequestOptions(c, body, request) {
   }
   return request;
 }
+function toolResultOutputText(output) {
+  if (output.type === "text" || output.type === "error-text") return output.value;
+  if (output.type === "json" || output.type === "error-json") return formatJson(output.value);
+  if (output.type === "execution-denied") return output.reason ?? "Execution denied";
+  return output.value.map(
+    (part) => part.type === "text" ? part.text : `[file:${part.mediaType}${part.filename === void 0 ? "" : `:${part.filename}`}]`
+  ).join("\n");
+}
 
 // src/runtime/session-logs.ts
 async function appendSessionLog(store, input) {
@@ -2627,6 +2759,25 @@ function memorySavedLog(props) {
     metadata
   };
 }
+function memoryCompactedLog(props) {
+  const metadata = {
+    originalMessageCount: props.originalMessageCount,
+    compactedMessageCount: props.compactedMessageCount,
+    retainedMessageCount: props.retainedMessageCount,
+    attempts: props.attempts
+  };
+  const usage = usageSummary(props.usage);
+  if (usage !== void 0) metadata.usage = usage;
+  return {
+    sessionId: props.sessionId,
+    runId: props.runId,
+    level: "info",
+    category: "memory",
+    event: "memory.compacted",
+    message: "Session memory compacted",
+    metadata
+  };
+}
 function runFailedLog(sessionId, runId, error, startedAt) {
   return {
     sessionId,
@@ -2643,6 +2794,9 @@ function runFailedLog(sessionId, runId, error, startedAt) {
 }
 function logsFromStreamEvent(props) {
   const { event, sessionId, runId } = props;
+  if (event.type === "memory_compaction") {
+    return [memoryCompactedLog({ sessionId, runId, ...event })];
+  }
   if (event.type === "turn_start") {
     return [
       {
@@ -2668,12 +2822,12 @@ function logsFromStreamEvent(props) {
         level: "info",
         category: "tool",
         event: "tool.called",
-        message: `Tool ${event.toolCall.function.name} called`,
+        message: `Tool ${event.toolCall.toolName} called`,
         metadata: {
           turn: event.turn,
-          toolName: event.toolCall.function.name,
-          callId: event.toolCall.callId ?? event.toolCall.id,
-          argumentBytes: byteLength2(formatUnknown(event.toolCall.function.arguments))
+          toolName: event.toolCall.toolName,
+          callId: event.toolCall.callId ?? event.toolCall.toolCallId,
+          argumentBytes: byteLength2(formatUnknown(event.toolCall.input))
         }
       }
     ];
@@ -2722,16 +2876,17 @@ function logsFromStreamEvent(props) {
     ];
   }
   if (event.type === "final") {
+    const result = event.result;
     return [
       runCompletedLog({
         sessionId,
         runId,
         durationMs: Date.now() - props.startedAt,
-        usage: event.usage,
-        output: event.output,
-        messageCount: event.messages.length
+        usage: result.usage,
+        output: result.text,
+        messageCount: result.messages.length
       }),
-      memorySavedLog({ sessionId, runId, messageCount: event.messages.length })
+      memorySavedLog({ sessionId, runId, messageCount: result.messages.length })
     ];
   }
   if (event.type === "error") {
@@ -2843,16 +2998,16 @@ function childAgentLog(event, sessionId, runId) {
         level: "debug",
         category: "tool",
         event: "child_tool.called",
-        message: `Child agent ${event.agentName ?? event.agentId} called ${child.toolCall.function.name}`,
+        message: `Child agent ${event.agentName ?? event.agentId} called ${child.toolCall.toolName}`,
         metadata: {
           parentToolName: event.toolName,
           agentId: event.agentId,
           hasAgentName: event.agentName !== void 0,
           turn: event.turn,
           childTurn: child.turn,
-          toolName: child.toolCall.function.name,
-          callId: child.toolCall.callId ?? child.toolCall.id,
-          argumentBytes: byteLength2(formatUnknown(child.toolCall.function.arguments))
+          toolName: child.toolCall.toolName,
+          callId: child.toolCall.callId ?? child.toolCall.toolCallId,
+          argumentBytes: byteLength2(formatUnknown(child.toolCall.input))
         }
       }
     ];
@@ -2903,14 +3058,16 @@ function childAgentLog(event, sessionId, runId) {
     ];
   }
   if (child.type === "final") {
+    const result = child.result;
     const metadata = {
       parentToolName: event.toolName,
       agentId: event.agentId,
       hasAgentName: event.agentName !== void 0,
-      outputBytes: byteLength2(child.output),
-      messageCount: child.messages.length
+      outputBytes: byteLength2(result.text),
+      messageCount: result.messages.length,
+      status: result.status
     };
-    const usage = usageSummary(child.usage);
+    const usage = usageSummary(result.usage);
     if (usage !== void 0) metadata.usage = usage;
     return [
       {
@@ -3036,12 +3193,12 @@ async function prepareAgentRun(c, props) {
     store: props.stores.sessions
   });
   const memoryMetadata = runMemoryMetadata(agentId, body, selectedModel, runId);
-  const promptMessage = normalizePromptMessage(body.message);
+  const promptMessage = body.messages.at(-1);
   const sessionStore = props.stores.sessions;
   const shouldPersistSessionMessages = session !== void 0 && sessionStore !== void 0 && !usesStoreAsAgentMemory(runAgent, sessionStore);
   if (shouldPersistSessionMessages) {
     await sessionStore.append({
-      context: { sessionId: session.id, metadata: memoryMetadata },
+      scope: { sessionId: session.id, metadata: memoryMetadata },
       runId,
       turn: 1,
       messages: [promptMessage]
@@ -3061,7 +3218,9 @@ async function prepareAgentRun(c, props) {
     body,
     memoryMetadata,
     execution,
-    options: createRunOptions(body, agentId, session),
+    failureMessages: void 0,
+    memoryCompactionLogged: false,
+    options: createRunOptions(body, agentId, session, c.req.raw.signal),
     runAgent,
     runId,
     runStartedAt,
@@ -3106,7 +3265,7 @@ async function recordRunReceived(props) {
     sessionId: props.session.id,
     runId: props.runId,
     agentId: props.agentId,
-    message: props.body.message,
+    message: props.body.messages.at(-1),
     stream: props.body.stream === true,
     hasTrace: props.body.trace !== void 0
   };
@@ -3154,21 +3313,29 @@ function runMemoryMetadata(agentId, body, selectedModel, runId) {
   return metadata;
 }
 function createRunExecution(props) {
-  if (props.session !== void 0 && props.runAgent.memory !== void 0) {
-    const session = props.runAgent.session(props.session.id, { metadata: props.memoryMetadata });
+  const session = props.session;
+  if (session !== void 0 && props.runAgent.memory !== void 0) {
     return {
-      generate: (options) => session.generate(props.body.message, options),
-      stream: (options) => session.stream(props.body.message, options)
+      generate: (options) => props.runAgent.generate({
+        prompt: props.promptMessage,
+        session: { sessionId: session.id, metadata: props.memoryMetadata },
+        ...options
+      }),
+      stream: (options) => props.runAgent.stream({
+        prompt: props.promptMessage,
+        session: { sessionId: session.id, metadata: props.memoryMetadata },
+        ...options
+      })
     };
   }
-  const input = props.session !== void 0 ? [...props.session.messages, props.promptMessage] : props.body.history !== void 0 ? [...props.body.history, props.promptMessage] : props.body.message;
+  const transcript = session !== void 0 ? [...session.messages, props.promptMessage] : props.body.messages;
   return {
-    generate: (options) => props.runAgent.generate(input, options),
-    stream: (options) => props.runAgent.stream(input, options)
+    generate: (options) => props.runAgent.generate({ messages: transcript, ...options }),
+    stream: (options) => props.runAgent.stream({ messages: transcript, ...options })
   };
 }
-function createRunOptions(body, agentId, session) {
-  const options = { retries: {} };
+function createRunOptions(body, agentId, session, abortSignal) {
+  const options = { abortSignal };
   if (body.maxTurns !== void 0) options.maxTurns = body.maxTurns;
   if (body.toolConcurrency !== void 0) options.toolConcurrency = body.toolConcurrency;
   if (body.trace !== void 0) {
@@ -3221,7 +3388,7 @@ function handleStreamingAgentRun(c, run, props) {
       }),
       store: run.sessionStore,
       session: run.session,
-      message: run.body.message,
+      message: run.body.messages.at(-1),
       runId: run.runId,
       startedAt: run.runStartedAt,
       persistGeneratedMessages: run.shouldPersistSessionMessages
@@ -3229,6 +3396,7 @@ function handleStreamingAgentRun(c, run, props) {
     stream = persistedRun.events;
   }
   return streamAgentRunEvents(c, stream, {
+    runId: run.runId,
     onCancel: async () => {
       props.approvalRuntime.cancelRun(run.runId);
       props.questionRuntime.cancelRun(run.runId);
@@ -3277,7 +3445,29 @@ async function startBufferedSessionRun(run, props) {
   if (run.session !== void 0) questionContext.sessionId = run.session.id;
   if (run.body.metadata !== void 0) questionContext.metadata = run.body.metadata;
   const effectiveHook = props.questionRuntime.createHook(questionContext);
-  return withInternalAgentRunOptions({ ...run.options }, { hook: effectiveHook, runId: run.runId });
+  const internalOptions = {
+    hook: effectiveHook,
+    onFailure: ({ messages }) => {
+      run.failureMessages = structuredClone(messages);
+    },
+    runId: run.runId
+  };
+  if (run.session !== void 0 && run.sessionStore !== void 0) {
+    const sessionId = run.session.id;
+    const sessionStore = run.sessionStore;
+    internalOptions.onMemoryCompaction = async (compaction) => {
+      await appendSessionLog(
+        sessionStore,
+        memoryCompactedLog({
+          sessionId,
+          runId: run.runId,
+          ...compaction
+        })
+      );
+      run.memoryCompactionLogged = true;
+    };
+  }
+  return withInternalAgentRunOptions({ ...run.options }, internalOptions);
 }
 function createApprovalContext(run, emit) {
   const context = {
@@ -3313,7 +3503,7 @@ async function completeBufferedSessionRun(run, response) {
     const generatedMessages = response.messages.slice(1);
     if (generatedMessages.length > 0) {
       await run.sessionStore.append({
-        context: { sessionId: run.session.id, metadata: run.memoryMetadata },
+        scope: { sessionId: run.session.id, metadata: run.memoryMetadata },
         runId: run.runId,
         turn: 1,
         messages: generatedMessages
@@ -3326,10 +3516,21 @@ async function completeBufferedSessionRun(run, response) {
   await run.sessionStore.saveSessionRunTranscript({
     id: run.session.id,
     runId: run.runId,
-    ...optionalTitle(run.body.message),
+    ...optionalTitle(run.body.messages.at(-1)),
     transcript,
     status: "success"
   });
+  if (response.memoryCompaction !== void 0 && !run.memoryCompactionLogged) {
+    await appendSessionLog(
+      run.sessionStore,
+      memoryCompactedLog({
+        sessionId: run.session.id,
+        runId: run.runId,
+        ...response.memoryCompaction
+      })
+    );
+    run.memoryCompactionLogged = true;
+  }
   await appendSessionLog(
     run.sessionStore,
     runCompletedLog({
@@ -3337,7 +3538,7 @@ async function completeBufferedSessionRun(run, response) {
       runId: run.runId,
       durationMs: durationMs2,
       usage: response.usage,
-      output: response.output,
+      output: response.text,
       messageCount: response.messages.length
     })
   );
@@ -3354,17 +3555,14 @@ async function failBufferedSessionRun(run, error) {
   if (run.session === void 0 || run.sessionStore === void 0) {
     return;
   }
-  const messages = await run.sessionStore.load({
-    sessionId: run.session.id,
-    metadata: run.memoryMetadata
-  });
   const durationMs2 = Date.now() - run.runStartedAt;
-  const transcript = transcriptFromMessages(messages.slice(run.session.messageCount));
+  const messages = run.failureMessages ?? [run.body.messages.at(-1)];
+  const transcript = transcriptFromMessages([...messages]);
   assignTranscriptRunDuration(transcript, durationMs2);
   await run.sessionStore.saveSessionRunTranscript({
     id: run.session.id,
     runId: run.runId,
-    ...optionalTitle(run.body.message),
+    ...optionalTitle(run.body.messages.at(-1)),
     transcript,
     status: "error",
     error: serializeError(error)
@@ -3374,9 +3572,6 @@ async function failBufferedSessionRun(run, error) {
     runFailedLog(run.session.id, run.runId, error, run.runStartedAt)
   );
 }
-function normalizePromptMessage(message) {
-  return typeof message === "string" ? Message.user(message) : message;
-}
 function usesStoreAsAgentMemory(agent, store) {
   const memoryStore = agent.memory?.store;
   return memoryStore !== void 0 && rawObservedStore(memoryStore) === rawObservedStore(store);
@@ -3763,7 +3958,7 @@ async function agentKnowledgeConfig(agent) {
 async function knowledgeSources(agent) {
   const toolIndexes = getAgentToolState(agent.agent).toolIndexes;
   const staticContext = staticContextDocuments(agent.agent);
-  const indexedContext = contextIndexes(agent.agent);
+  const indexedContext = vectorContexts(agent.agent);
   const sources = [
     {
       sourceId: staticSourceId(),
@@ -3775,20 +3970,20 @@ async function knowledgeSources(agent) {
     }
   ];
   const dynamicContextSources = await Promise.all(
-    indexedContext.map(async (contextIndex, index) => {
-      const inspect = inspectFn(contextIndex.index);
-      const count = await inspectableCount(inspect, contextIndex.filter);
+    indexedContext.map(async (vectorContext, index) => {
+      const inspect = inspectFn(vectorContext.store);
+      const count = await inspectableCount(inspect, vectorContext.filter);
       const source = {
         sourceId: dynamicContextSourceId(index),
         kind: "dynamic_context",
         label: `Dynamic context ${index + 1}`,
         count: 1,
         registrationIndex: index,
-        topK: contextIndex.topK,
+        topK: vectorContext.topK,
         inspectable: inspect !== void 0
       };
-      if (contextIndex.threshold !== void 0) {
-        source.threshold = contextIndex.threshold;
+      if (vectorContext.minScore !== void 0) {
+        source.minScore = vectorContext.minScore;
       }
       if (count !== void 0) source.itemCount = count;
       return source;
@@ -3807,8 +4002,8 @@ async function knowledgeSources(agent) {
         topK: toolIndex.topK,
         inspectable: inspect !== void 0
       };
-      if (toolIndex.threshold !== void 0) {
-        source.threshold = toolIndex.threshold;
+      if (toolIndex.minScore !== void 0) {
+        source.minScore = toolIndex.minScore;
       }
       if (count !== void 0) source.itemCount = count;
       return source;
@@ -3827,20 +4022,20 @@ async function knowledgeItemsPage(agent, sourceId, request) {
   if (sourceId === staticSourceId()) {
     return staticKnowledgeItemsPage(agent, request);
   }
-  const dynamicContextIndex = dynamicSourceIndex(sourceId, "dynamic_context");
-  if (dynamicContextIndex !== void 0) {
-    const contextIndex = contextIndexes(agent.agent)[dynamicContextIndex];
-    if (contextIndex === void 0) {
+  const vectorContextIndex = dynamicSourceIndex(sourceId, "dynamic_context");
+  if (vectorContextIndex !== void 0) {
+    const vectorContext = vectorContexts(agent.agent)[vectorContextIndex];
+    if (vectorContext === void 0) {
       return void 0;
     }
-    const inspect = inspectFn(contextIndex.index);
+    const inspect = inspectFn(vectorContext.store);
     if (inspect === void 0) {
       return nonInspectablePage(agent.id, sourceId, "dynamic_context");
     }
     const page = await inspect({
       limit: request.limit,
       cursor: request.cursor,
-      filter: contextIndex.filter
+      filter: vectorContext.filter
     });
     const result = {
       agentId: agent.id,
@@ -3881,12 +4076,12 @@ async function knowledgeItemsPage(agent, sourceId, request) {
   }
   return void 0;
 }
-function inspectFn(index) {
-  if (!isRecord3(index) || typeof index.inspect !== "function") {
+function inspectFn(store) {
+  if (!isRecord3(store) || typeof store.inspect !== "function") {
     return void 0;
   }
-  const inspect = index.inspect;
-  return (request) => inspect.call(index, request);
+  const inspect = store.inspect;
+  return (request) => inspect.call(store, request);
 }
 function staticKnowledgeItemsPage(agent, request) {
   const staticContext = staticContextDocuments(agent.agent);
@@ -4102,7 +4297,7 @@ function isRecord3(value) {
 
 // src/runtime/tool-metadata.ts
 import { getAgentToolState as getAgentToolState2 } from "@anvia/core/internal/agent";
-var MCP_TOOL_METADATA_KEY = /* @__PURE__ */ Symbol.for("anvia.mcp.tool.metadata");
+import { isMcpTool } from "@anvia/core/mcp";
 function agentToolItems(agent) {
   const state = getAgentToolState2(agent.agent);
   const items = state.staticTools.map((tool) => ({ tool, source: "static" }));
@@ -4135,15 +4330,10 @@ function toolRequiresApproval(tool) {
   return approval !== void 0 && approval !== false;
 }
 function mcpServerName(tool) {
-  const metadata = tool[MCP_TOOL_METADATA_KEY];
-  if (typeof metadata !== "object" || metadata === null) {
-    return void 0;
-  }
-  const serverName = metadata.serverName;
-  return typeof serverName === "string" && serverName.length > 0 ? serverName : void 0;
+  return isMcpTool(tool) ? tool.mcp.serverName : void 0;
 }
-function agentHasMcpTools(agent) {
-  return agentToolItems(agent).some(({ tool }) => mcpServerName(tool) !== void 0);
+function agentHasMcpServers(agent) {
+  return agent.agent.mcpServers.length > 0;
 }
 
 // src/runtime/config.ts
@@ -4165,7 +4355,7 @@ function agentConfig(agent) {
 function agentRuntimeSummary(agent) {
   const tools = agentToolItems(agent);
   const staticContext = staticContextDocuments(agent.agent);
-  const indexedContext = contextIndexes(agent.agent);
+  const indexedContext = vectorContexts(agent.agent);
   const name = agent.name ?? agent.agent.name;
   const description = agent.description ?? agent.agent.description;
   const summary = {
@@ -4178,7 +4368,7 @@ function agentRuntimeSummary(agent) {
     mcpToolCount: tools.filter((item) => mcpServerName(item.tool) !== void 0).length,
     staticContextCount: staticContext.length,
     dynamicContextCount: indexedContext.length,
-    observerCount: agent.agent.observers.length,
+    observerCount: Object.keys(agent.agent.observability?.observers ?? {}).length,
     hasMemory: agent.agent.memory !== void 0,
     hasLifecycle: agent.agent.lifecycle !== void 0,
     hasOutputSchema: agent.agent.outputSchema !== void 0
@@ -4250,7 +4440,7 @@ function capabilityConfig(_options, agents, pipelines, stores, sandboxCount = 0)
   if (agents.some((agent) => agent.agent.tools.length > 0)) {
     capabilities.tools = { enabled: true };
   }
-  if (agents.some(agentHasMcpTools)) {
+  if (agents.some(agentHasMcpServers)) {
     capabilities.mcps = { enabled: true };
   }
   if (sandboxCount > 0) {
@@ -4354,43 +4544,29 @@ function registerMcpRoutes(app, props) {
   });
 }
 async function agentMcpMetadata(agent) {
-  const servers = /* @__PURE__ */ new Map();
-  const seen = /* @__PURE__ */ new Set();
-  for (const { tool, source } of agentToolItems(agent)) {
-    const serverName = mcpServerName(tool);
-    if (serverName === void 0) {
-      continue;
-    }
-    const definition = await tool.definition("");
-    const key = `${serverName}:${source}:${definition.name}`;
-    if (seen.has(key)) {
-      continue;
-    }
-    seen.add(key);
-    const tools = servers.get(serverName) ?? [];
-    tools.push({
-      name: definition.name,
-      description: definition.description,
-      parameters: definition.parameters,
-      source,
-      approval: approvalMetadata(tool)
-    });
-    servers.set(serverName, tools);
-  }
-  return [...servers.entries()].map(([name, tools]) => {
-    const sortedTools = tools.sort((left, right) => {
-      if (left.source !== right.source) {
-        return left.source === "static" ? -1 : 1;
-      }
-      return left.name.localeCompare(right.name);
-    });
-    return {
-      agentId: agent.id,
-      name,
-      toolCount: sortedTools.length,
-      tools: sortedTools
-    };
-  }).sort((left, right) => left.name.localeCompare(right.name));
+  return Promise.all(
+    agent.agent.mcpServers.map(async (server) => {
+      const tools = await Promise.all(
+        server.tools.map(async (tool) => {
+          const definition = await tool.definition("");
+          return {
+            name: definition.name,
+            description: definition.description,
+            parameters: definition.parameters,
+            source: "static",
+            approval: approvalMetadata(tool)
+          };
+        })
+      );
+      const sortedTools = tools.sort((left, right) => left.name.localeCompare(right.name));
+      return {
+        agentId: agent.id,
+        name: server.name,
+        toolCount: sortedTools.length,
+        tools: sortedTools
+      };
+    })
+  ).then((servers) => servers.sort((left, right) => left.name.localeCompare(right.name)));
 }
 
 // src/runtime/memory.ts
@@ -4612,7 +4788,7 @@ function agentMemorySource(ref, label, agentId, storeKindValue, inspector) {
       ).slice(0, options.limit);
     },
     async getConversation(conversationRef) {
-      const conversation = await inspector.getConversation(conversationRef);
+      const conversation = await inspector.getConversation({ ref: conversationRef });
       return conversation === void 0 ? void 0 : inspectorConversationDetail(conversation, summary.agentIds);
     }
   };
@@ -4835,12 +5011,12 @@ function pipelineRunFailedLog(pipelineId, runId, error, startedAt) {
     }
   };
 }
-function pipelineStageLog(pipelineId, runId, event) {
+function pipelineStageLog(event, studioPipelineId = event.pipelineId) {
   const category = stageCategory(event.node);
   if (event.type === "stage_started") {
     return {
-      pipelineId,
-      runId,
+      pipelineId: studioPipelineId,
+      runId: event.runId,
       level: "debug",
       category,
       event: `${event.node.kind}.started`,
@@ -4850,8 +5026,8 @@ function pipelineStageLog(pipelineId, runId, event) {
   }
   if (event.type === "stage_completed") {
     return {
-      pipelineId,
-      runId,
+      pipelineId: studioPipelineId,
+      runId: event.runId,
       level: "debug",
       category,
       event: `${event.node.kind}.completed`,
@@ -4863,8 +5039,8 @@ function pipelineStageLog(pipelineId, runId, event) {
     };
   }
   return {
-    pipelineId,
-    runId,
+    pipelineId: studioPipelineId,
+    runId: event.runId,
     level: "error",
     category,
     event: `${event.node.kind}.failed`,
@@ -4891,6 +5067,7 @@ function stageCategory(node) {
 function nodeMetadata(node) {
   const metadata = {
     nodeId: node.id,
+    nodePath: [...node.path],
     kind: node.kind,
     label: node.label
   };
@@ -5052,17 +5229,24 @@ async function executePipelineRun(c, props, pipeline, body) {
     if (body.metadata !== void 0) streamOptions.metadata = body.metadata;
     if (props.logStore !== void 0) streamOptions.logStore = props.logStore;
     if (props.runStore !== void 0) streamOptions.runStore = props.runStore;
+    streamOptions.abortSignal = c.req.raw.signal;
     return streamPipelineRun(c, streamOptions);
   }
   try {
     await appendPipelineLog(props.logStore, pipelineRunStartedLog(pipeline, runId));
-    const output = await pipeline.pipeline.run(body.input, {
+    const result = await pipeline.pipeline.run({
+      input: body.input,
+      runId,
+      metadata: body.metadata,
+      abortSignal: c.req.raw.signal,
       observer: {
         async onEvent(event) {
-          await appendPipelineLog(props.logStore, pipelineStageLog(pipeline.id, runId, event));
+          await appendPipelineLog(props.logStore, pipelineStageLog(event, pipeline.id));
         }
-      }
+      },
+      failOnObserverError: true
     });
+    const output = result.output;
     const jsonOutput = toJsonValue(output);
     const endedAt = Date.now();
     const successRecord = {
@@ -5127,19 +5311,24 @@ function streamPipelineRun(_c, props) {
 async function* pipelineRunEvents(props) {
   yield* emitPipelineLog(props.logStore, pipelineRunStartedLog(props.pipeline, props.runId));
   const events = new AsyncEventQueue();
-  const run = props.pipeline.pipeline.run(props.input, {
+  const run = props.pipeline.pipeline.run({
+    input: props.input,
+    runId: props.runId,
+    metadata: props.metadata,
+    abortSignal: props.abortSignal,
     observer: {
       async onEvent(event) {
         const log = await appendPipelineLog(
           props.logStore,
-          pipelineStageLog(props.pipeline.id, props.runId, event)
+          pipelineStageLog(event, props.pipeline.id)
         );
         if (log !== void 0) {
           events.push({ type: "pipeline_log", log });
         }
       }
-    }
-  }).then(async (output) => {
+    },
+    failOnObserverError: true
+  }).then(async ({ output }) => {
     const jsonOutput = toJsonValue(output);
     const endedAt = Date.now();
     const successRecord = {
@@ -6143,6 +6332,16 @@ function createInMemoryStudioStore() {
 }
 var InMemoryStudioStore = class {
   kind = "memory";
+  compaction = {
+    snapshot: ({ scope }) => {
+      const messages = this.sessions.get(scope.sessionId)?.messages ?? [];
+      return Promise.resolve({
+        revision: memoryRevision(messages),
+        messages: cloneMessages(messages)
+      });
+    },
+    replacePrefix: (options) => this.replaceCompactionPrefix(options)
+  };
   sessions = /* @__PURE__ */ new Map();
   traces = /* @__PURE__ */ new Map();
   pipelineLogs = /* @__PURE__ */ new Map();
@@ -6184,20 +6383,20 @@ var InMemoryStudioStore = class {
     session.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     return materializeSession(session);
   }
-  load(context) {
-    return Promise.resolve(this.sessions.get(context.sessionId)?.messages ?? []);
+  load({ scope }) {
+    return Promise.resolve(cloneMessages(this.sessions.get(scope.sessionId)?.messages ?? []));
   }
   append(input) {
-    const session = this.sessions.get(input.context.sessionId);
+    const session = this.sessions.get(input.scope.sessionId);
     if (session !== void 0) {
-      session.messages.push(...input.messages);
+      session.messages.push(...cloneMessages(input.messages));
       session.messageCount = session.messages.length;
       session.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     }
     return Promise.resolve();
   }
-  clear(context) {
-    const session = this.sessions.get(context.sessionId);
+  clear({ scope }) {
+    const session = this.sessions.get(scope.sessionId);
     if (session !== void 0) {
       session.messages = [];
       session.runs = [];
@@ -6208,13 +6407,26 @@ var InMemoryStudioStore = class {
   }
   async recordError(input) {
     await this.saveSessionRunTranscript({
-      id: input.context.sessionId,
-      runId: studioRunId(input.context) ?? input.runId,
+      id: input.scope.sessionId,
+      runId: studioRunId(input.scope) ?? input.runId,
       transcript: transcriptFromMessages(input.messages),
       status: "error",
       error: serializeJsonError(input.error)
     });
   }
+  replaceCompactionPrefix(input) {
+    if (!Number.isSafeInteger(input.messageCount) || input.messageCount < 1) {
+      throw new RangeError("messageCount must be a positive integer.");
+    }
+    const session = this.sessions.get(input.scope.sessionId);
+    if (session === void 0 || memoryRevision(session.messages) !== input.revision || input.messageCount > session.messages.length) {
+      return Promise.resolve({ status: "conflict" });
+    }
+    session.messages.splice(0, input.messageCount, structuredClone(input.replacement));
+    session.messageCount = session.messages.length;
+    session.updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+    return Promise.resolve({ status: "committed" });
+  }
   saveSessionRunTranscript(input) {
     const session = this.sessions.get(input.id);
     if (session === void 0) {
@@ -6340,18 +6552,24 @@ function sessionSummary(session) {
 function materializeSession(session) {
   return {
     ...sessionSummary(session),
-    messages: [...session.messages],
+    messages: cloneMessages(session.messages),
     transcript: renumberTranscript(session.runs.flatMap((run) => run.transcript))
   };
 }
+function cloneMessages(messages) {
+  return structuredClone([...messages]);
+}
 function traceAgentId(trace) {
   const nestedMetadata = trace.metadata?.metadata;
   return isJsonObject(nestedMetadata) && typeof nestedMetadata.agentId === "string" ? nestedMetadata.agentId : void 0;
 }
-function studioRunId(context) {
-  const value = context.metadata?.studioRunId;
+function studioRunId(scope) {
+  const value = scope.metadata?.studioRunId;
   return typeof value === "string" && value.length > 0 ? value : void 0;
 }
+function memoryRevision(messages) {
+  return JSON.stringify(messages);
+}
 function serializeJsonError(error) {
   if (error instanceof Error) {
     return {
@@ -6877,11 +7095,11 @@ function uniqueAgentId(baseId, ids) {
 function agentMetadata(agent) {
   const metadata = {
     staticContextCount: staticContextDocuments(agent).length,
-    dynamicContextCount: contextIndexes(agent).length,
+    dynamicContextCount: vectorContexts(agent).length,
     dynamicToolCount: getAgentToolState3(agent).toolIndexes.length,
     hasLifecycle: agent.lifecycle !== void 0,
     hasOutputSchema: agent.outputSchema !== void 0,
-    observerCount: agent.observers.length,
+    observerCount: Object.keys(agent.observability?.observers ?? {}).length,
     approvalToolCount: agent.tools.filter(toolRequiresApproval).length
   };
   if (agent.defaultMaxTurns !== void 0) metadata.defaultMaxTurns = agent.defaultMaxTurns;
@@ -7012,30 +7230,37 @@ function createStudioApp(options) {
   return studio;
 }
 function withStudioTraceObserver(studioAgent, traceStore) {
-  if (traceStore === void 0 || hasStudioTraceObserver(studioAgent.agent)) {
-    return studioAgent;
+  if (traceStore === void 0) return studioAgent;
+  const existing = studioAgent.agent.observability;
+  const studioObserver = existing?.observers.studio;
+  if (studioObserver !== void 0 && !(studioObserver instanceof StudioTraceObserver)) {
+    throw new TypeError('Studio reserves the observer name "studio" for local trace persistence.');
+  }
+  for (const [name, observer] of Object.entries(existing?.observers ?? {})) {
+    if (observer instanceof StudioTraceObserver && name !== "studio") {
+      throw new TypeError('StudioTraceObserver must be registered with the name "studio".');
+    }
   }
   return {
     ...studioAgent,
     agent: cloneAgent(studioAgent.agent, {
-      observers: [
-        ...studioAgent.agent.observers,
-        { observer: new StudioTraceObserver({ store: traceStore }) }
-      ]
+      observability: {
+        observers: {
+          ...existing?.observers ?? {},
+          studio: studioObserver ?? new StudioTraceObserver({ store: traceStore })
+        },
+        primaryTrace: "studio",
+        errorPolicy: existing?.errorPolicy ?? "ignore"
+      }
     })
   };
 }
-function hasStudioTraceObserver(agent) {
-  return agent.observers.some(
-    (registration) => registration.observer instanceof StudioTraceObserver
-  );
-}
 
 // src/storage/sqlite-store.ts
 import { mkdirSync } from "fs";
 import { createRequire } from "module";
 import { dirname, resolve } from "path";
-import { isJsonValue as isJsonValue2 } from "@anvia/core/completion";
+import { isJsonValue as isJsonValue3 } from "@anvia/core/completion";
 var DatabaseSync;
 function createSqliteSessionStore(options = {}) {
   return new SqliteSessionStore(options.path ?? ":memory:");
@@ -7046,6 +7271,13 @@ var SqliteSessionStore = class {
   }
   path;
   kind = "sqlite";
+  compaction = {
+    snapshot: ({ scope }) => {
+      const messages = this.listSessionMessages(scope.sessionId);
+      return Promise.resolve({ revision: memoryRevision2(messages), messages });
+    },
+    replacePrefix: (options) => this.replaceCompactionPrefix(options)
+  };
   db;
   listSessions(options) {
     const db = this.database();
@@ -7117,8 +7349,8 @@ var SqliteSessionStore = class {
     }
     return this.getSession(id);
   }
-  load(context) {
-    const session = this.getSession(context.sessionId);
+  load({ scope }) {
+    const session = this.getSession(scope.sessionId);
     return Promise.resolve(session?.messages ?? []);
   }
   append(input) {
@@ -7129,20 +7361,20 @@ var SqliteSessionStore = class {
         `SELECT id, agent_id, title, metadata_json, created_at, updated_at
            FROM anvia_studio_sessions
            WHERE id = $id`
-      ).get({ $id: input.context.sessionId });
+      ).get({ $id: input.scope.sessionId });
       if (row === void 0) {
         db.exec("ROLLBACK");
         return Promise.resolve();
       }
       const updatedAt = (/* @__PURE__ */ new Date()).toISOString();
-      const nextIndex = this.nextMessageIndex(input.context.sessionId);
-      this.insertMessages(input.context.sessionId, input.messages, nextIndex, updatedAt);
+      const nextIndex = this.nextMessageIndex(input.scope.sessionId);
+      this.insertMessages(input.scope.sessionId, input.messages, nextIndex, updatedAt);
       db.prepare(
         `UPDATE anvia_studio_sessions
          SET updated_at = $updatedAt
          WHERE id = $id`
       ).run({
-        $id: input.context.sessionId,
+        $id: input.scope.sessionId,
         $updatedAt: updatedAt
       });
       db.exec("COMMIT");
@@ -7154,7 +7386,7 @@ var SqliteSessionStore = class {
       throw error;
     }
   }
-  clear(context) {
+  clear({ scope }) {
     const db = this.database();
     const updatedAt = (/* @__PURE__ */ new Date()).toISOString();
     try {
@@ -7164,14 +7396,14 @@ var SqliteSessionStore = class {
          SET updated_at = $updatedAt
          WHERE id = $id`
       ).run({
-        $id: context.sessionId,
+        $id: scope.sessionId,
         $updatedAt: updatedAt
       });
       db.prepare("DELETE FROM anvia_studio_session_messages WHERE session_id = $id").run({
-        $id: context.sessionId
+        $id: scope.sessionId
       });
       db.prepare("DELETE FROM anvia_studio_session_runs WHERE session_id = $id").run({
-        $id: context.sessionId
+        $id: scope.sessionId
       });
       db.exec("COMMIT");
       return Promise.resolve();
@@ -7183,17 +7415,51 @@ var SqliteSessionStore = class {
     }
   }
   async recordError(input) {
-    const runId = studioRunId2(input.context) ?? input.runId;
-    const existing = this.getSessionRun(input.context.sessionId, runId);
+    const runId = studioRunId2(input.scope) ?? input.runId;
+    const existing = this.getSessionRun(input.scope.sessionId, runId);
     const transcript = existing === void 0 || parseJsonArray(existing.transcript_json).length === 0 ? transcriptFromMessages(input.messages) : parseJsonArray(existing.transcript_json);
     await this.saveSessionRunTranscript({
-      id: input.context.sessionId,
+      id: input.scope.sessionId,
       runId,
       transcript,
       status: "error",
       error: serializeJsonError2(input.error)
     });
   }
+  replaceCompactionPrefix(input) {
+    if (!Number.isSafeInteger(input.messageCount) || input.messageCount < 1) {
+      throw new RangeError("messageCount must be a positive integer.");
+    }
+    const db = this.database();
+    try {
+      db.exec("BEGIN IMMEDIATE");
+      const messages = this.listSessionMessages(input.scope.sessionId);
+      if (memoryRevision2(messages) !== input.revision || input.messageCount > messages.length || this.getSessionRow(input.scope.sessionId) === void 0) {
+        db.exec("ROLLBACK");
+        return Promise.resolve({ status: "conflict" });
+      }
+      db.prepare("DELETE FROM anvia_studio_session_messages WHERE session_id = $id").run({
+        $id: input.scope.sessionId
+      });
+      const updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+      this.insertMessages(
+        input.scope.sessionId,
+        [input.replacement, ...messages.slice(input.messageCount)],
+        0,
+        updatedAt
+      );
+      db.prepare(
+        `UPDATE anvia_studio_sessions
+         SET updated_at = $updatedAt
+         WHERE id = $id`
+      ).run({ $id: input.scope.sessionId, $updatedAt: updatedAt });
+      db.exec("COMMIT");
+      return Promise.resolve({ status: "committed" });
+    } catch (error) {
+      if (db.isTransaction) db.exec("ROLLBACK");
+      throw error;
+    }
+  }
   saveSessionRunTranscript(input) {
     const db = this.database();
     const now = (/* @__PURE__ */ new Date()).toISOString();
@@ -7889,7 +8155,7 @@ var SqliteSessionStore = class {
     );
     messages.forEach((message, messageOffset) => {
       const messageIndex = startIndex + messageOffset;
-      if (message.metadata !== void 0 && !isJsonValue2(message.metadata)) {
+      if (message.metadata !== void 0 && !isJsonValue3(message.metadata)) {
         throw new TypeError("Studio message metadata must be a strict JSON value.");
       }
       insertMessage.run({
@@ -7990,6 +8256,9 @@ function messageParts(message) {
   if (message.role === "system") {
     return [{ type: "text", value: { type: "text", text: message.content } }];
   }
+  if (typeof message.content === "string") {
+    return [{ type: "text", value: { type: "text", text: message.content } }];
+  }
   return message.content.map((content) => ({
     type: content.type,
     value: content
@@ -7998,40 +8267,40 @@ function messageParts(message) {
 function messageFromRows(row, partRows) {
   const parts = partRows.map((partRow) => JSON.parse(partRow.part_json));
   const metadata = parseJsonValue(row.metadata_json);
-  if (metadata !== void 0 && !isJsonValue2(metadata)) {
-    throw new TypeError("Stored Studio message metadata is not a strict JSON value.");
+  if (metadata !== void 0 && (!isJsonValue3(metadata) || typeof metadata !== "object" || metadata === null || Array.isArray(metadata))) {
+    throw new TypeError("Stored Studio message metadata is not a strict JSON object.");
   }
   if (row.role === "system") {
     const message = {
       role: "system",
-      content: systemContentFromParts(parts)
+      content: systemContentFromParts(parts),
+      ...metadata === void 0 ? {} : { metadata }
     };
-    if (metadata !== void 0) message.metadata = metadata;
     return message;
   }
   if (row.role === "user") {
     const message = {
       role: "user",
-      content: parts
+      content: parts,
+      ...metadata === void 0 ? {} : { metadata }
     };
-    if (metadata !== void 0) message.metadata = metadata;
     return message;
   }
   if (row.role === "assistant") {
     const message = {
       role: "assistant",
-      content: parts
+      content: parts,
+      ...row.message_id === null ? {} : { id: row.message_id },
+      ...metadata === void 0 ? {} : { metadata }
     };
-    if (row.message_id !== null) message.id = row.message_id;
-    if (metadata !== void 0) message.metadata = metadata;
     return message;
   }
   if (row.role === "tool") {
     const message = {
       role: "tool",
-      content: parts
+      content: parts,
+      ...metadata === void 0 ? {} : { metadata }
     };
-    if (metadata !== void 0) message.metadata = metadata;
     return message;
   }
   throw new Error(`Unsupported stored message role: ${row.role}`);
@@ -8116,10 +8385,13 @@ function parseJsonValue(value) {
   }
   return JSON.parse(value);
 }
-function studioRunId2(context) {
-  const value = context.metadata?.studioRunId;
+function studioRunId2(scope) {
+  const value = scope.metadata?.studioRunId;
   return typeof value === "string" && value.length > 0 ? value : void 0;
 }
+function memoryRevision2(messages) {
+  return JSON.stringify(messages);
+}
 function serializeJsonError2(error) {
   if (error instanceof Error) {
     return {