@anvia/studio 0.7.28 → 0.7.30

package/dist/index.js

@@ -4,17 +4,6 @@ import { Pipeline } from "@anvia/core/pipeline";
 import { serve } from "@hono/node-server";
 import { Hono as HonoApp } from "hono";
 
-// src/shared/compact.ts
-function compact(obj) {
-  const result = {};
-  for (const [key, value] of Object.entries(obj)) {
-    if (value !== void 0) {
-      result[key] = value;
-    }
-  }
-  return result;
-}
-
 // src/runtime/json.ts
 function toJsonValue(value) {
   return toJsonValueInternal(value, /* @__PURE__ */ new WeakSet());
@@ -212,7 +201,6 @@ var StudioRunTraceObserver = class {
     const trace = {
       id: this.props.id,
       sessionId,
-      ...compact({ name: this.props.args.trace?.name }),
       status,
       trace: this.trace,
       startedAt: this.startedAt.toISOString(),
@@ -223,13 +211,14 @@ var StudioRunTraceObserver = class {
         prompt: this.props.args.prompt,
         history: this.props.args.history
       }),
-      ...compact({ output: result.output }),
-      ...compact({ error: result.error }),
-      ...compact({ usage: result.usage }),
       metadata,
       observations: this.observations,
       observationCount: this.observations.length
     };
+    if (this.props.args.trace?.name !== void 0) trace.name = this.props.args.trace.name;
+    if (result.output !== void 0) trace.output = result.output;
+    if (result.error !== void 0) trace.error = result.error;
+    if (result.usage !== void 0) trace.usage = result.usage;
     await store.saveTrace(trace);
   }
 };
@@ -252,41 +241,42 @@ var ChildAgentToolTraceAccumulator = class {
     const agentName = wrapper.agentName;
     const childTurn = typeof child.turn === "number" ? child.turn : this.parent.turn;
     if (!this.agentStarts.has(agentId)) {
-      this.agentStarts.set(agentId, {
+      const start = {
         startedAt: /* @__PURE__ */ new Date(),
-        agentId,
-        ...compact({ agentName })
-      });
+        agentId
+      };
+      if (agentName !== void 0) start.agentName = agentName;
+      this.agentStarts.set(agentId, start);
     }
     if (child.type === "turn_start") {
-      this.generationStarts.set(generationKey(agentId, childTurn), {
+      const start = {
         startedAt: /* @__PURE__ */ new Date(),
         input: toJsonValue({
           prompt: child.prompt,
           history: child.history
         }),
         agentId,
-        ...compact({ agentName }),
         childTurn
-      });
+      };
+      if (agentName !== void 0) start.agentName = agentName;
+      this.generationStarts.set(generationKey(agentId, childTurn), start);
       return;
     }
     if (child.type === "turn_end") {
       const key = generationKey(agentId, childTurn);
       const start = this.generationStarts.get(key);
       this.generationStarts.delete(key);
-      this.completedObservations.push(
-        traceObservation({
-          kind: "generation",
-          name: `${agentLabel(agentId, agentName)}.model.turn.${childTurn}`,
-          status: "success",
-          turn: this.parent.turn,
-          startedAt: start?.startedAt ?? /* @__PURE__ */ new Date(),
-          ...compact({ input: start?.input }),
-          output: toJsonValue(child.response),
-          metadata: this.childMetadata(agentId, agentName, childTurn)
-        })
-      );
+      const observation = {
+        kind: "generation",
+        name: `${agentLabel(agentId, agentName)}.model.turn.${childTurn}`,
+        status: "success",
+        turn: this.parent.turn,
+        startedAt: start?.startedAt ?? /* @__PURE__ */ new Date(),
+        output: toJsonValue(child.response),
+        metadata: this.childMetadata(agentId, agentName, childTurn)
+      };
+      if (start?.input !== void 0) observation.input = start.input;
+      this.completedObservations.push(traceObservation(observation));
       return;
     }
     if (child.type === "tool_call" && isRecord(child.toolCall)) {
@@ -294,16 +284,17 @@ var ChildAgentToolTraceAccumulator = class {
       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;
-      this.toolStarts.push({
+      const start = {
         startedAt: /* @__PURE__ */ new Date(),
         agentId,
-        ...compact({ agentName }),
         childTurn,
         toolName,
-        ...compact({ toolCallId: callId }),
         input: toJsonValue(toolCallFunction?.arguments ?? {}),
         completed: false
-      });
+      };
+      if (agentName !== void 0) start.agentName = agentName;
+      if (callId !== void 0) start.toolCallId = callId;
+      this.toolStarts.push(start);
       return;
     }
     if (child.type === "tool_result") {
@@ -315,22 +306,20 @@ var ChildAgentToolTraceAccumulator = class {
       if (start !== void 0) {
         start.completed = true;
       }
-      this.completedObservations.push(
-        traceObservation({
-          kind: "tool",
-          name: `${agentLabel(agentId, agentName)}.${toolName}`,
-          status: "success",
-          turn: this.parent.turn,
-          startedAt: start?.startedAt ?? /* @__PURE__ */ new Date(),
-          ...compact({ input }),
-          ...typeof child.result === "string" ? { output: parseOrString(child.result) } : {},
-          metadata: {
-            ...this.childMetadata(agentId, agentName, childTurn),
-            ...compact({ toolCallId }),
-            ...compact({ internalCallId })
-          }
-        })
-      );
+      const metadata = this.childMetadata(agentId, agentName, childTurn);
+      if (toolCallId !== void 0) metadata.toolCallId = toolCallId;
+      if (internalCallId !== void 0) metadata.internalCallId = internalCallId;
+      const observation = {
+        kind: "tool",
+        name: `${agentLabel(agentId, agentName)}.${toolName}`,
+        status: "success",
+        turn: this.parent.turn,
+        startedAt: start?.startedAt ?? /* @__PURE__ */ new Date(),
+        metadata
+      };
+      if (input !== void 0) observation.input = input;
+      if (typeof child.result === "string") observation.output = parseOrString(child.result);
+      this.completedObservations.push(traceObservation(observation));
       return;
     }
     if (child.type === "error") {
@@ -415,21 +404,24 @@ function agentLabel(agentId, agentName) {
 }
 function traceObservation(props) {
   const endedAt = props.endedAt ?? /* @__PURE__ */ new Date();
-  return {
+  const observation = {
     id: globalThis.crypto.randomUUID(),
-    ...props.parentObservationId === void 0 ? {} : { parentObservationId: props.parentObservationId },
     kind: props.kind,
     name: props.name,
     status: props.status,
     turn: props.turn,
     startedAt: props.startedAt.toISOString(),
     endedAt: endedAt.toISOString(),
-    durationMs: durationMs(props.startedAt, endedAt),
-    ...compact({ input: props.input }),
-    ...compact({ output: props.output }),
-    ...compact({ error: props.error }),
-    ...compact({ metadata: props.metadata })
+    durationMs: durationMs(props.startedAt, endedAt)
   };
+  if (props.parentObservationId !== void 0) {
+    observation.parentObservationId = props.parentObservationId;
+  }
+  if (props.input !== void 0) observation.input = props.input;
+  if (props.output !== void 0) observation.output = props.output;
+  if (props.error !== void 0) observation.error = props.error;
+  if (props.metadata !== void 0) observation.metadata = props.metadata;
+  return observation;
 }
 function traceMetadata(args, messages) {
   return compactJsonObject({
@@ -593,14 +585,15 @@ import { readFile } from "fs/promises";
 import { fileURLToPath } from "url";
 function resolveStudioUiOptions(ui) {
   const options = typeof ui === "object" ? ui : {};
-  return {
+  const resolved = {
     path: normalizeUiPath(options.path ?? "/ui"),
     title: options.title ?? "Anvia Studio",
     rootRoutes: options.rootRoutes ?? true,
     redirectRoot: options.redirectRoot ?? true,
-    ...options.clientScript === void 0 ? {} : { clientScript: options.clientScript },
     protectShell: options.protectShell ?? false
   };
+  if (options.clientScript !== void 0) resolved.clientScript = options.clientScript;
+  return resolved;
 }
 function isStudioUiEnabled(ui) {
   return ui !== false;
@@ -951,20 +944,17 @@ function serializeError(error) {
 }
 
 // src/runtime/type-guards.ts
+import {
+  isJsonValue as isCoreJsonValue
+} from "@anvia/core/completion";
 function isObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function isJsonObject(value) {
-  return isObject(value) && Object.values(value).every(isJsonValue);
+  return isObject(value) && isCoreJsonValue(value);
 }
 function isJsonValue(value) {
-  if (value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
-    return true;
-  }
-  if (Array.isArray(value)) {
-    return value.every(isJsonValue);
-  }
-  return isJsonObject(value);
+  return isCoreJsonValue(value);
 }
 function isMessageInput(value) {
   return typeof value === "string" || isMessage(value);
@@ -1049,23 +1039,25 @@ function createStudioModelRegistry(config) {
       }
       staticModels.set(modelId, { ...model, id: modelId });
     }
-    providers.set(id, {
+    const runtimeProvider = {
       ...provider,
       id,
-      ...compact({
-        defaultModel: provider.defaultModel !== void 0 ? normalizeModelId(provider.defaultModel) : void 0
-      }),
       staticModels
-    });
+    };
+    if (provider.defaultModel !== void 0) {
+      runtimeProvider.defaultModel = normalizeModelId(provider.defaultModel);
+    }
+    providers.set(id, runtimeProvider);
   }
-  return {
-    ...compact({
-      defaultModel: config.default !== void 0 ? normalizeModelRef(config.default) : void 0
-    }),
+  const registry = {
     providers,
     agentPolicies: normalizeAgentPolicies(config.agents ?? {}),
     modelCache: /* @__PURE__ */ new Map()
   };
+  if (config.default !== void 0) {
+    Object.assign(registry, { defaultModel: normalizeModelRef(config.default) });
+  }
+  return registry;
 }
 function studioModelsConfig(registry, agents) {
   if (registry === void 0) {
@@ -1075,25 +1067,25 @@ function studioModelsConfig(registry, agents) {
     const models = [...provider.staticModels.values()].map(
       (model) => modelSummary(provider, model.id, model)
     );
-    return {
+    const config2 = {
       id: provider.id,
-      ...compact({
-        name: provider.name,
-        defaultModel: provider.defaultModel,
-        metadata: provider.metadata
-      }),
       models
     };
+    if (provider.name !== void 0) config2.name = provider.name;
+    if (provider.defaultModel !== void 0) config2.defaultModel = provider.defaultModel;
+    if (provider.metadata !== void 0) config2.metadata = provider.metadata;
+    return config2;
   });
   const agentIds = new Set(agents.map((agent) => agent.id));
   const agentsConfig = Object.fromEntries(
     [...registry.agentPolicies.entries()].filter(([agentId]) => agentIds.has(agentId)).map(([agentId, policy]) => [agentId, publicPolicy(policy)])
   );
-  return {
+  const config = {
     providers,
-    ...compact({ default: registry.defaultModel }),
     agents: agentsConfig
   };
+  if (registry.defaultModel !== void 0) config.default = registry.defaultModel;
+  return config;
 }
 function registerModelRoutes(app, props) {
   app.get("/models", async (c) => {
@@ -1103,10 +1095,13 @@ function registerModelRoutes(app, props) {
     const providers = await Promise.all(
       [...props.registry.providers.values()].map((provider) => providerCatalog(provider))
     );
-    return c.json({
-      providers,
-      ...compact({ defaultModel: props.registry.defaultModel })
-    });
+    const response = {
+      providers
+    };
+    if (props.registry.defaultModel !== void 0) {
+      response.defaultModel = props.registry.defaultModel;
+    }
+    return c.json(response);
   });
   app.get("/models/:providerId", async (c) => {
     if (props.registry === void 0) {
@@ -1216,12 +1211,13 @@ async function agentModelsCatalog(registry, agent) {
     }
   });
   const defaultModel = policy?.default ?? registry.defaultModel;
-  return {
+  const summary = {
     agentId: agent.id,
-    ...compact({ defaultModel }),
-    models: [...models, ...exactPolicyModels],
-    ...compact({ warnings: warnings.length === 0 ? void 0 : warnings })
+    models: [...models, ...exactPolicyModels]
   };
+  if (defaultModel !== void 0) summary.defaultModel = defaultModel;
+  if (warnings.length > 0) summary.warnings = warnings;
+  return summary;
 }
 async function providerCatalog(provider) {
   const models = /* @__PURE__ */ new Map();
@@ -1234,48 +1230,43 @@ async function providerCatalog(provider) {
       const listed = await provider.listModels();
       for (const model of listed.data) {
         const staticModel = provider.staticModels.get(model.id);
-        models.set(
-          model.id,
-          modelSummary(provider, model.id, {
-            id: model.id,
-            ...compact({ name: model.name, description: model.description }),
-            ...staticModel ?? {},
-            metadata: {
-              ...compact({
-                type: model.type,
-                createdAt: model.createdAt,
-                ownedBy: model.ownedBy,
-                contextLength: model.contextLength
-              }),
-              ...staticModel?.metadata ?? {}
-            }
-          })
-        );
+        const definition = { id: model.id };
+        if (model.name !== void 0) definition.name = model.name;
+        if (model.description !== void 0) definition.description = model.description;
+        Object.assign(definition, staticModel);
+        const metadata = {};
+        if (model.type !== void 0) metadata.type = model.type;
+        if (model.createdAt !== void 0) metadata.createdAt = model.createdAt;
+        if (model.ownedBy !== void 0) metadata.ownedBy = model.ownedBy;
+        if (model.contextLength !== void 0) metadata.contextLength = model.contextLength;
+        Object.assign(metadata, staticModel?.metadata);
+        definition.metadata = metadata;
+        models.set(model.id, modelSummary(provider, model.id, definition));
       }
     } catch (error) {
       const serialized = serializeError(error);
       warning = typeof serialized === "object" && serialized !== null && "message" in serialized ? String(serialized.message) : String(error);
     }
   }
-  return {
+  const catalog = {
     id: provider.id,
-    ...compact({
-      name: provider.name,
-      defaultModel: provider.defaultModel,
-      metadata: provider.metadata,
-      warning
-    }),
     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.metadata !== void 0) catalog.metadata = provider.metadata;
+  if (warning !== void 0) catalog.warning = warning;
+  return catalog;
 }
 function modelSummary(provider, modelId, model) {
-  return {
+  const summary = {
     ...model,
     id: modelId,
     ref: `${provider.id}:${modelId}`,
-    providerId: provider.id,
-    ...compact({ providerName: provider.name })
+    providerId: provider.id
   };
+  if (provider.name !== void 0) summary.providerName = provider.name;
+  return summary;
 }
 function ensureModelAllowed(registry, agentId, ref) {
   const { providerId } = parseModelRef(ref);
@@ -1294,21 +1285,23 @@ function allowedByPolicy(allowed, ref) {
 }
 function normalizeAgentPolicies(policies) {
   return new Map(
-    Object.entries(policies).map(([agentId, policy]) => [
-      agentId.trim(),
-      {
-        ...compact({
-          default: policy.default !== void 0 ? normalizeModelRef(policy.default) : void 0,
-          allowed: policy.allowed?.map(
-            (entry) => typeof entry === "string" && entry.trim().endsWith(":*") ? `${normalizeProviderId(entry.trim().slice(0, -2))}:*` : normalizeModelRef(entry)
-          )
-        })
+    Object.entries(policies).map(([agentId, policy]) => {
+      const normalized = {};
+      if (policy.default !== void 0) normalized.default = normalizeModelRef(policy.default);
+      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)
+        );
       }
-    ])
+      return [agentId.trim(), normalized];
+    })
   );
 }
 function publicPolicy(policy) {
-  return compact({ default: policy.default, allowed: policy.allowed });
+  const config = {};
+  if (policy.default !== void 0) config.default = policy.default;
+  if (policy.allowed !== void 0) config.allowed = policy.allowed;
+  return config;
 }
 function modelWarnings(ref, model, request) {
   const warnings = [];
@@ -1428,20 +1421,21 @@ function studioStreamError(error) {
 
 // src/runtime/trace-summary.ts
 function traceSummary(trace) {
-  return compact({
+  const summary = {
     id: trace.id,
     sessionId: trace.sessionId,
-    name: trace.name,
     status: trace.status,
     startedAt: trace.startedAt,
-    endedAt: trace.endedAt,
-    durationMs: trace.durationMs,
-    output: trace.output,
-    error: trace.error,
-    usage: trace.usage,
-    metadata: trace.metadata,
     observationCount: trace.observations.length
-  });
+  };
+  if (trace.name !== void 0) summary.name = trace.name;
+  if (trace.endedAt !== void 0) summary.endedAt = trace.endedAt;
+  if (trace.durationMs !== void 0) summary.durationMs = trace.durationMs;
+  if (trace.output !== void 0) summary.output = trace.output;
+  if (trace.error !== void 0) summary.error = trace.error;
+  if (trace.usage !== void 0) summary.usage = trace.usage;
+  if (trace.metadata !== void 0) summary.metadata = trace.metadata;
+  return summary;
 }
 
 // src/runtime/observability.ts
@@ -1468,14 +1462,13 @@ var StudioObservabilityHub = class {
   }
 };
 function observeStores(stores, hub) {
-  return {
-    ...stores,
-    ...compact({
-      sessions: stores.sessions !== void 0 ? observeSessionStore(stores.sessions, hub) : void 0,
-      traces: stores.traces !== void 0 ? observeTraceStore(stores.traces, hub) : void 0,
-      pipelineLogs: stores.pipelineLogs !== void 0 ? observePipelineLogStore(stores.pipelineLogs, hub) : void 0
-    })
-  };
+  const observed = { ...stores };
+  if (stores.sessions !== void 0) observed.sessions = observeSessionStore(stores.sessions, hub);
+  if (stores.traces !== void 0) observed.traces = observeTraceStore(stores.traces, hub);
+  if (stores.pipelineLogs !== void 0) {
+    observed.pipelineLogs = observePipelineLogStore(stores.pipelineLogs, hub);
+  }
+  return observed;
 }
 function registerObservabilityRoutes(app, hub) {
   app.get("/observability/events", (c) => {
@@ -1495,7 +1488,9 @@ function registerObservabilityRoutes(app, hub) {
   });
 }
 function observabilityEvents(hub, types) {
-  const subscription = hub.subscribe(compact({ types }));
+  const options = {};
+  if (types !== void 0) options.types = types;
+  const subscription = hub.subscribe(options);
   return {
     [Symbol.asyncIterator]() {
       return {
@@ -1639,15 +1634,14 @@ function transcriptFromMessages(messages) {
       let textEntryAdded = false;
       for (const content of message.content) {
         if (content.type === "text") {
-          transcript.push(
-            compact({
-              entryId: transcript.length,
-              kind: "message",
-              role: "user",
-              text: content.text,
-              attachments: attachments.length === 0 ? void 0 : attachments
-            })
-          );
+          const entry = {
+            entryId: transcript.length,
+            kind: "message",
+            role: "user",
+            text: content.text
+          };
+          if (!textEntryAdded && attachments.length > 0) entry.attachments = attachments;
+          transcript.push(entry);
           textEntryAdded = true;
         }
       }
@@ -1681,14 +1675,13 @@ function transcriptFromMessages(messages) {
       if (content.type === "text") {
         appendAssistantTranscriptText(transcript, content.text);
       } else if (content.type === "reasoning") {
-        transcript.push(
-          compact({
-            entryId: transcript.length,
-            kind: "reasoning",
-            reasoningId: content.id,
-            text: content.text
-          })
-        );
+        const entry = {
+          entryId: transcript.length,
+          kind: "reasoning",
+          text: content.text
+        };
+        if (content.id !== void 0) entry.reasoningId = content.id;
+        transcript.push(entry);
       } else if (content.type === "tool_call") {
         transcript.push({
           entryId: transcript.length,
@@ -1708,23 +1701,22 @@ function attachmentsFromMessage(message) {
   }
   return message.content.flatMap((content) => {
     if (content.type === "image") {
-      return [
-        {
-          kind: "image",
-          ...content.source.type === "base64" ? { data: content.source.data, mediaType: content.source.mediaType } : { url: content.source.url }
-        }
-      ];
+      const attachment = { kind: "image" };
+      if (content.source.type === "base64") {
+        attachment.data = content.source.data;
+        attachment.mediaType = content.source.mediaType;
+      } else {
+        attachment.url = content.source.url;
+      }
+      return [attachment];
     }
     if (content.type === "document") {
-      return [
-        compact({
-          kind: "document",
-          name: content.source.filename,
-          mediaType: content.source.mediaType,
-          data: content.source.type === "base64" ? content.source.data : void 0,
-          url: content.source.type === "url" ? content.source.url : void 0
-        })
-      ];
+      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;
+      return [attachment];
     }
     return [];
   });
@@ -1820,15 +1812,15 @@ function streamAgentRunEvents(_c, events) {
   return streamStudioJsonl(events);
 }
 function traceForRun(trace, agentId, session) {
-  const metadata = {
-    ...trace?.metadata ?? {},
-    agentId
-  };
-  return {
-    ...trace ?? {},
-    metadata,
-    ...trace?.sessionId !== void 0 ? { sessionId: trace.sessionId } : session === void 0 ? {} : { sessionId: session.id }
-  };
+  const options = {};
+  if (trace !== void 0) Object.assign(options, trace);
+  const metadata = {};
+  if (trace?.metadata !== void 0) Object.assign(metadata, trace.metadata);
+  metadata.agentId = agentId;
+  options.metadata = metadata;
+  if (trace?.sessionId !== void 0) options.sessionId = trace.sessionId;
+  else if (session !== void 0) options.sessionId = session.id;
+  return options;
 }
 async function* persistStreamingSessionTranscript(props) {
   const transcript = [messageToTranscriptEntry(props.message, 0)];
@@ -1843,14 +1835,15 @@ async function* persistStreamingSessionTranscript(props) {
   try {
     for await (const event of props.stream) {
       acceptTranscriptStreamEvent(transcript, event);
-      const nextSession = await props.store.saveSessionRunTranscript({
+      const saveInput = {
         id: props.session.id,
         runId: props.runId,
         ...title,
         transcript,
-        status: event.type === "final" ? "success" : event.type === "error" ? "error" : "running",
-        ...event.type === "error" ? { error: serializeError(event.error) } : {}
-      });
+        status: event.type === "final" ? "success" : event.type === "error" ? "error" : "running"
+      };
+      if (event.type === "error") saveInput.error = serializeError(event.error);
+      const nextSession = await props.store.saveSessionRunTranscript(saveInput);
       if (nextSession === void 0) {
         throw new Error("Session not found");
       }
@@ -1897,17 +1890,16 @@ function acceptTranscriptStreamEvent(transcript, event) {
   if (event.type === "tool_result") {
     const matched = findTranscriptToolEntry(transcript, event.toolName, event.toolCallId);
     if (matched === void 0) {
-      transcript.push(
-        compact({
-          entryId: transcript.length,
-          kind: "tool",
-          toolName: event.toolName,
-          callId: event.toolCallId,
-          args: event.args,
-          result: event.result,
-          structuredResult: event.structuredResult
-        })
-      );
+      const entry = {
+        entryId: transcript.length,
+        kind: "tool",
+        toolName: event.toolName
+      };
+      if (event.toolCallId !== void 0) entry.callId = event.toolCallId;
+      if (event.args !== void 0) entry.args = event.args;
+      if (event.result !== void 0) entry.result = event.result;
+      if (event.structuredResult !== void 0) entry.structuredResult = event.structuredResult;
+      transcript.push(entry);
       return;
     }
     matched.args = matched.args ?? event.args;
@@ -1919,17 +1911,16 @@ function acceptTranscriptStreamEvent(transcript, event) {
   if (event.type === "agent_tool_event") {
     const matched = findTranscriptToolEntry(transcript, event.toolName, event.toolCallId);
     if (matched === void 0) {
-      transcript.push(
-        compact({
-          entryId: transcript.length,
-          kind: "tool",
-          toolName: event.toolName,
-          callId: event.toolCallId,
-          childEvents: [childAgentTranscriptEvent(event)].filter(
-            (childEvent) => childEvent !== void 0
-          )
-        })
-      );
+      const entry = {
+        entryId: transcript.length,
+        kind: "tool",
+        toolName: event.toolName,
+        childEvents: [childAgentTranscriptEvent(event)].filter(
+          (childEvent) => childEvent !== void 0
+        )
+      };
+      if (event.toolCallId !== void 0) entry.callId = event.toolCallId;
+      transcript.push(entry);
       return;
     }
     appendChildAgentTranscriptEvent(matched, event);
@@ -1955,13 +1946,14 @@ function acceptTranscriptStreamEvent(transcript, event) {
       approvalCallId(event.approval)
     );
     if (matched !== void 0) {
-      matched.approval = compact({
+      const approval = {
         id: event.approval.id,
         status: event.approval.status,
-        requestedAt: event.approval.requestedAt,
-        resolvedAt: event.approval.resolvedAt,
-        reason: event.approval.reason
-      });
+        requestedAt: event.approval.requestedAt
+      };
+      if (event.approval.resolvedAt !== void 0) approval.resolvedAt = event.approval.resolvedAt;
+      if (event.approval.reason !== void 0) approval.reason = event.approval.reason;
+      matched.approval = approval;
     }
   }
   if (event.type === "tool_question_request") {
@@ -1986,14 +1978,15 @@ function acceptTranscriptStreamEvent(transcript, event) {
       questionCallId(event.question)
     );
     if (matched !== void 0) {
-      matched.question = compact({
+      const question = {
         id: event.question.id,
         status: event.question.status,
         requestedAt: event.question.requestedAt,
-        answeredAt: event.question.answeredAt,
-        questions: event.question.questions,
-        answers: event.question.answers
-      });
+        questions: event.question.questions
+      };
+      if (event.question.answeredAt !== void 0) question.answeredAt = event.question.answeredAt;
+      if (event.question.answers !== void 0) question.answers = event.question.answers;
+      matched.question = question;
     }
   }
   if (event.type === "final" && event.trace?.traceId !== void 0) {
@@ -2047,51 +2040,56 @@ function appendChildAgentTranscriptEvent(entry, event) {
 function childAgentTranscriptEvent(event) {
   const child = event.event;
   if (child.type === "text_delta") {
-    return compact({
+    const entry = {
       kind: "message",
       agentId: event.agentId,
-      agentName: event.agentName,
       text: child.delta
-    });
+    };
+    if (event.agentName !== void 0) entry.agentName = event.agentName;
+    return entry;
   }
   if (child.type === "reasoning_delta") {
-    return compact({
+    const entry = {
       kind: "reasoning",
       agentId: event.agentId,
-      agentName: event.agentName,
-      reasoningId: child.id,
       text: child.delta
-    });
+    };
+    if (event.agentName !== void 0) entry.agentName = event.agentName;
+    if (child.id !== void 0) entry.reasoningId = child.id;
+    return entry;
   }
   if (child.type === "tool_call") {
-    return compact({
+    const entry = {
       kind: "tool",
       agentId: event.agentId,
-      agentName: event.agentName,
       toolName: child.toolCall.function.name,
       callId: child.toolCall.callId ?? child.toolCall.id,
       args: formatJson(child.toolCall.function.arguments)
-    });
+    };
+    if (event.agentName !== void 0) entry.agentName = event.agentName;
+    return entry;
   }
   if (child.type === "tool_result") {
-    return compact({
+    const entry = {
       kind: "tool",
       agentId: event.agentId,
-      agentName: event.agentName,
-      toolName: child.toolName,
-      callId: child.toolCallId,
-      args: child.args,
-      result: child.result,
-      structuredResult: child.structuredResult
-    });
+      toolName: child.toolName
+    };
+    if (event.agentName !== void 0) entry.agentName = event.agentName;
+    if (child.toolCallId !== void 0) entry.callId = child.toolCallId;
+    if (child.args !== void 0) entry.args = child.args;
+    if (child.result !== void 0) entry.result = child.result;
+    if (child.structuredResult !== void 0) entry.structuredResult = child.structuredResult;
+    return entry;
   }
   if (child.type === "error") {
-    return compact({
+    const entry = {
       kind: "message",
       agentId: event.agentId,
-      agentName: event.agentName,
       text: `Error: ${errorText(child.error)}`
-    });
+    };
+    if (event.agentName !== void 0) entry.agentName = event.agentName;
+    return entry;
   }
   return void 0;
 }
@@ -2115,13 +2113,14 @@ function findChildAgentToolEvent(childEvents, event) {
 }
 function messageToTranscriptEntry(message, entryId) {
   const role = typeof message === "string" || message.role !== "assistant" ? "user" : "assistant";
-  return {
+  const entry = {
     entryId,
     kind: "message",
     role,
-    text: extractMessageText(message),
-    ...role === "user" ? optionalTranscriptAttachments(message) : {}
+    text: extractMessageText(message)
   };
+  if (role === "user") Object.assign(entry, optionalTranscriptAttachments(message));
+  return entry;
 }
 function appendTranscriptAssistantText(transcript, delta) {
   const last = transcript.at(-1);
@@ -2164,14 +2163,13 @@ function appendTranscriptReasoningText(transcript, delta, reasoningId) {
     last.text = `${last.text}${delta}`;
     return;
   }
-  transcript.push(
-    compact({
-      entryId: transcript.length,
-      kind: "reasoning",
-      reasoningId,
-      text: delta
-    })
-  );
+  const entry = {
+    entryId: transcript.length,
+    kind: "reasoning",
+    text: delta
+  };
+  if (reasoningId !== void 0) entry.reasoningId = reasoningId;
+  transcript.push(entry);
 }
 function findTranscriptToolEntry(transcript, toolName, callId) {
   for (let index = transcript.length - 1; index >= 0; index -= 1) {
@@ -2224,23 +2222,22 @@ function optionalTranscriptAttachments(message) {
   }
   const attachments = message.content.flatMap((content) => {
     if (content.type === "image") {
-      return [
-        {
-          kind: "image",
-          ...content.source.type === "base64" ? { data: content.source.data, mediaType: content.source.mediaType } : { url: content.source.url }
-        }
-      ];
+      const attachment = { kind: "image" };
+      if (content.source.type === "base64") {
+        attachment.data = content.source.data;
+        attachment.mediaType = content.source.mediaType;
+      } else {
+        attachment.url = content.source.url;
+      }
+      return [attachment];
     }
     if (content.type === "document") {
-      return [
-        compact({
-          kind: "document",
-          name: content.source.filename,
-          mediaType: content.source.mediaType,
-          data: content.source.type === "base64" ? content.source.data : void 0,
-          url: content.source.type === "url" ? content.source.url : void 0
-        })
-      ];
+      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;
+      return [attachment];
     }
     return [];
   });
@@ -2298,10 +2295,9 @@ function parseUiRunRequestBody(c, body) {
     };
   }
   const history = messages.slice(0, -1);
-  return {
-    message,
-    ...history.length === 0 ? {} : { history }
-  };
+  const request = { message };
+  if (history.length > 0) request.history = history;
+  return request;
 }
 function parseRunRequestOptions(c, body, request) {
   if ("sessionId" in body) {
@@ -2407,14 +2403,23 @@ function sessionCreatedLog(session) {
     category: "session",
     event: "session.created",
     message: "Session created",
-    metadata: compact({
+    metadata: {
       agentId: session.agentId,
       hasTitle: session.title !== void 0,
       titleLength: session.title?.length ?? 0
-    })
+    }
   };
 }
 function runReceivedLog(props) {
+  const metadata = {
+    agentId: props.agentId,
+    stream: props.stream,
+    message: messageSummary(props.message),
+    hasTrace: props.hasTrace,
+    metadataKeys: Object.keys(props.metadata ?? {})
+  };
+  if (props.maxTurns !== void 0) metadata.maxTurns = props.maxTurns;
+  if (props.toolConcurrency !== void 0) metadata.toolConcurrency = props.toolConcurrency;
   return {
     sessionId: props.sessionId,
     runId: props.runId,
@@ -2422,15 +2427,7 @@ function runReceivedLog(props) {
     category: "api",
     event: "run.received",
     message: "Run request received",
-    metadata: compact({
-      agentId: props.agentId,
-      stream: props.stream,
-      message: messageSummary(props.message),
-      maxTurns: props.maxTurns,
-      toolConcurrency: props.toolConcurrency,
-      hasTrace: props.hasTrace,
-      metadataKeys: Object.keys(props.metadata ?? {})
-    })
+    metadata
   };
 }
 function runStartedLog(session, runId) {
@@ -2441,10 +2438,10 @@ function runStartedLog(session, runId) {
     category: "run",
     event: "run.started",
     message: "Run started",
-    metadata: compact({
+    metadata: {
       agentId: session.agentId,
       existingMessageCount: session.messageCount
-    })
+    }
   };
 }
 function memoryLoadedLog(session, runId) {
@@ -2455,13 +2452,20 @@ function memoryLoadedLog(session, runId) {
     category: "memory",
     event: "memory.loaded",
     message: "Session memory loaded",
-    metadata: compact({
+    metadata: {
       messageCount: session.messageCount,
       transcriptEntries: session.transcript.length
-    })
+    }
   };
 }
 function runCompletedLog(props) {
+  const metadata = {
+    durationMs: props.durationMs,
+    outputBytes: byteLength2(props.output)
+  };
+  const usage = usageSummary(props.usage);
+  if (usage !== void 0) metadata.usage = usage;
+  if (props.messageCount !== void 0) metadata.messageCount = props.messageCount;
   return {
     sessionId: props.sessionId,
     runId: props.runId,
@@ -2469,15 +2473,12 @@ function runCompletedLog(props) {
     category: "run",
     event: "run.completed",
     message: "Run completed",
-    metadata: compact({
-      durationMs: props.durationMs,
-      usage: usageSummary(props.usage),
-      outputBytes: byteLength2(props.output),
-      messageCount: props.messageCount
-    })
+    metadata
   };
 }
 function memorySavedLog(props) {
+  const metadata = {};
+  if (props.messageCount !== void 0) metadata.messageCount = props.messageCount;
   return {
     sessionId: props.sessionId,
     runId: props.runId,
@@ -2485,9 +2486,7 @@ function memorySavedLog(props) {
     category: "memory",
     event: "memory.saved",
     message: "Session memory saved",
-    metadata: compact({
-      messageCount: props.messageCount
-    })
+    metadata
   };
 }
 function runFailedLog(sessionId, runId, error, startedAt) {
@@ -2498,10 +2497,10 @@ function runFailedLog(sessionId, runId, error, startedAt) {
     category: "run",
     event: "run.failed",
     message: "Run failed",
-    metadata: compact({
+    metadata: {
       durationMs: Date.now() - startedAt,
       error: serializeError(error)
-    })
+    }
   };
 }
 function logsFromStreamEvent(props) {
@@ -2515,11 +2514,11 @@ function logsFromStreamEvent(props) {
         category: "prompt",
         event: "prompt.prepared",
         message: `Turn ${event.turn} prompt prepared`,
-        metadata: compact({
+        metadata: {
           turn: event.turn,
           prompt: messageSummary(event.prompt),
           historyCount: event.history.length
-        })
+        }
       }
     ];
   }
@@ -2532,16 +2531,27 @@ function logsFromStreamEvent(props) {
         category: "tool",
         event: "tool.called",
         message: `Tool ${event.toolCall.function.name} called`,
-        metadata: compact({
+        metadata: {
           turn: event.turn,
           toolName: event.toolCall.function.name,
           callId: event.toolCall.callId ?? event.toolCall.id,
           argumentBytes: byteLength2(formatUnknown(event.toolCall.function.arguments))
-        })
+        }
       }
     ];
   }
   if (event.type === "tool_result") {
+    const metadata = {
+      turn: event.turn,
+      toolName: event.toolName,
+      argumentBytes: byteLength2(event.args),
+      resultBytes: byteLength2(event.result)
+    };
+    if (event.toolCallId !== void 0) metadata.callId = event.toolCallId;
+    if (event.internalCallId !== void 0) metadata.internalCallId = event.internalCallId;
+    if (event.structuredResult !== void 0) {
+      metadata.structuredResultBytes = byteLength2(JSON.stringify(event.structuredResult));
+    }
     return [
       {
         sessionId,
@@ -2550,19 +2560,17 @@ function logsFromStreamEvent(props) {
         category: "tool",
         event: "tool.completed",
         message: `Tool ${event.toolName} completed`,
-        metadata: compact({
-          turn: event.turn,
-          toolName: event.toolName,
-          callId: event.toolCallId,
-          internalCallId: event.internalCallId,
-          argumentBytes: byteLength2(event.args),
-          resultBytes: byteLength2(event.result),
-          structuredResultBytes: event.structuredResult === void 0 ? void 0 : byteLength2(JSON.stringify(event.structuredResult))
-        })
+        metadata
       }
     ];
   }
   if (event.type === "turn_end") {
+    const metadata = {
+      turn: event.turn,
+      contentCount: event.response.choice.length
+    };
+    const usage = usageSummary(event.response.usage);
+    if (usage !== void 0) metadata.usage = usage;
     return [
       {
         sessionId,
@@ -2571,11 +2579,7 @@ function logsFromStreamEvent(props) {
         category: "model",
         event: "model.turn.completed",
         message: `Model turn ${event.turn} completed`,
-        metadata: compact({
-          turn: event.turn,
-          contentCount: event.response.choice.length,
-          usage: usageSummary(event.response.usage)
-        })
+        metadata
       }
     ];
   }
@@ -2596,6 +2600,14 @@ function logsFromStreamEvent(props) {
     return [runFailedLog(sessionId, runId, event.error, props.startedAt)];
   }
   if (event.type === "tool_approval_request") {
+    const metadata = {
+      approvalId: event.approval.id,
+      toolName: event.approval.toolName,
+      status: event.approval.status,
+      hasReason: event.approval.reason !== void 0,
+      argumentBytes: byteLength2(event.approval.args)
+    };
+    if (event.approval.callId !== void 0) metadata.callId = event.approval.callId;
     return [
       {
         sessionId,
@@ -2604,18 +2616,18 @@ function logsFromStreamEvent(props) {
         category: "approval",
         event: "approval.requested",
         message: `Approval requested for ${event.approval.toolName}`,
-        metadata: compact({
-          approvalId: event.approval.id,
-          toolName: event.approval.toolName,
-          callId: event.approval.callId,
-          status: event.approval.status,
-          hasReason: event.approval.reason !== void 0,
-          argumentBytes: byteLength2(event.approval.args)
-        })
+        metadata
       }
     ];
   }
   if (event.type === "tool_approval_result") {
+    const metadata = {
+      approvalId: event.approval.id,
+      toolName: event.approval.toolName,
+      status: event.approval.status,
+      hasReason: event.approval.reason !== void 0
+    };
+    if (event.approval.callId !== void 0) metadata.callId = event.approval.callId;
     return [
       {
         sessionId,
@@ -2624,17 +2636,19 @@ function logsFromStreamEvent(props) {
         category: "approval",
         event: "approval.resolved",
         message: `Approval ${event.approval.status} for ${event.approval.toolName}`,
-        metadata: compact({
-          approvalId: event.approval.id,
-          toolName: event.approval.toolName,
-          callId: event.approval.callId,
-          status: event.approval.status,
-          hasReason: event.approval.reason !== void 0
-        })
+        metadata
       }
     ];
   }
   if (event.type === "tool_question_request") {
+    const metadata = {
+      questionId: event.question.id,
+      toolName: event.question.toolName,
+      status: event.question.status,
+      questionCount: event.question.questions.length,
+      argumentBytes: byteLength2(event.question.args)
+    };
+    if (event.question.callId !== void 0) metadata.callId = event.question.callId;
     return [
       {
         sessionId,
@@ -2643,18 +2657,20 @@ function logsFromStreamEvent(props) {
         category: "question",
         event: "question.requested",
         message: `Question requested by ${event.question.toolName}`,
-        metadata: compact({
-          questionId: event.question.id,
-          toolName: event.question.toolName,
-          callId: event.question.callId,
-          status: event.question.status,
-          questionCount: event.question.questions.length,
-          argumentBytes: byteLength2(event.question.args)
-        })
+        metadata
       }
     ];
   }
   if (event.type === "tool_question_result") {
+    const metadata = {
+      questionId: event.question.id,
+      toolName: event.question.toolName,
+      status: event.question.status,
+      questionCount: event.question.questions.length,
+      argumentBytes: byteLength2(event.question.args),
+      answerCount: event.question.answers?.length ?? 0
+    };
+    if (event.question.callId !== void 0) metadata.callId = event.question.callId;
     return [
       {
         sessionId,
@@ -2663,13 +2679,7 @@ function logsFromStreamEvent(props) {
         category: "question",
         event: "question.answered",
         message: `Question answered for ${event.question.toolName}`,
-        metadata: compact({
-          questionId: event.question.id,
-          toolName: event.question.toolName,
-          callId: event.question.callId,
-          status: event.question.status,
-          answerCount: event.question.answers?.length ?? 0
-        })
+        metadata
       }
     ];
   }
@@ -2695,7 +2705,7 @@ function childAgentLog(event, sessionId, runId) {
         category: "tool",
         event: "child_tool.called",
         message: `Child agent ${event.agentName ?? event.agentId} called ${child.toolCall.function.name}`,
-        metadata: compact({
+        metadata: {
           parentToolName: event.toolName,
           agentId: event.agentId,
           hasAgentName: event.agentName !== void 0,
@@ -2704,11 +2714,24 @@ function childAgentLog(event, sessionId, runId) {
           toolName: child.toolCall.function.name,
           callId: child.toolCall.callId ?? child.toolCall.id,
           argumentBytes: byteLength2(formatUnknown(child.toolCall.function.arguments))
-        })
+        }
       }
     ];
   }
   if (child.type === "tool_result") {
+    const metadata = {
+      parentToolName: event.toolName,
+      agentId: event.agentId,
+      hasAgentName: event.agentName !== void 0,
+      turn: event.turn,
+      childTurn: child.turn,
+      toolName: child.toolName,
+      resultBytes: byteLength2(child.result)
+    };
+    if (child.toolCallId !== void 0) metadata.callId = child.toolCallId;
+    if (child.structuredResult !== void 0) {
+      metadata.structuredResultBytes = byteLength2(JSON.stringify(child.structuredResult));
+    }
     return [
       {
         sessionId,
@@ -2717,17 +2740,7 @@ function childAgentLog(event, sessionId, runId) {
         category: "tool",
         event: "child_tool.completed",
         message: `Child agent ${event.agentName ?? event.agentId} completed ${child.toolName}`,
-        metadata: compact({
-          parentToolName: event.toolName,
-          agentId: event.agentId,
-          hasAgentName: event.agentName !== void 0,
-          turn: event.turn,
-          childTurn: child.turn,
-          toolName: child.toolName,
-          callId: child.toolCallId,
-          resultBytes: byteLength2(child.result),
-          structuredResultBytes: child.structuredResult === void 0 ? void 0 : byteLength2(JSON.stringify(child.structuredResult))
-        })
+        metadata
       }
     ];
   }
@@ -2740,17 +2753,26 @@ function childAgentLog(event, sessionId, runId) {
         category: "run",
         event: "child_agent.turn_started",
         message: `Child agent ${event.agentName ?? event.agentId} turn ${child.turn} started`,
-        metadata: compact({
+        metadata: {
           parentToolName: event.toolName,
           agentId: event.agentId,
           hasAgentName: event.agentName !== void 0,
           childTurn: child.turn,
           historyCount: child.history.length
-        })
+        }
       }
     ];
   }
   if (child.type === "final") {
+    const metadata = {
+      parentToolName: event.toolName,
+      agentId: event.agentId,
+      hasAgentName: event.agentName !== void 0,
+      outputBytes: byteLength2(child.output),
+      messageCount: child.messages.length
+    };
+    const usage = usageSummary(child.usage);
+    if (usage !== void 0) metadata.usage = usage;
     return [
       {
         sessionId,
@@ -2759,14 +2781,7 @@ function childAgentLog(event, sessionId, runId) {
         category: "run",
         event: "child_agent.completed",
         message: `Child agent ${event.agentName ?? event.agentId} completed`,
-        metadata: compact({
-          parentToolName: event.toolName,
-          agentId: event.agentId,
-          hasAgentName: event.agentName !== void 0,
-          usage: usageSummary(child.usage),
-          outputBytes: byteLength2(child.output),
-          messageCount: child.messages.length
-        })
+        metadata
       }
     ];
   }
@@ -2779,12 +2794,12 @@ function childAgentLog(event, sessionId, runId) {
         category: "run",
         event: "child_agent.failed",
         message: `Child agent ${event.agentName ?? event.agentId} failed`,
-        metadata: compact({
+        metadata: {
           parentToolName: event.toolName,
           agentId: event.agentId,
           hasAgentName: event.agentName !== void 0,
           error: serializeError(child.error)
-        })
+        }
       }
     ];
   }
@@ -2810,13 +2825,20 @@ function usageSummary(value) {
     return void 0;
   }
   const record = value;
-  return compact({
-    inputTokens: numericValue(record.inputTokens),
-    outputTokens: numericValue(record.outputTokens),
-    totalTokens: numericValue(record.totalTokens),
-    cachedInputTokens: numericValue(record.cachedInputTokens),
-    cacheCreationInputTokens: numericValue(record.cacheCreationInputTokens)
-  });
+  const summary = {};
+  const inputTokens = numericValue(record.inputTokens);
+  const outputTokens = numericValue(record.outputTokens);
+  const totalTokens = numericValue(record.totalTokens);
+  const cachedInputTokens = numericValue(record.cachedInputTokens);
+  const cacheCreationInputTokens = numericValue(record.cacheCreationInputTokens);
+  if (inputTokens !== void 0) summary.inputTokens = inputTokens;
+  if (outputTokens !== void 0) summary.outputTokens = outputTokens;
+  if (totalTokens !== void 0) summary.totalTokens = totalTokens;
+  if (cachedInputTokens !== void 0) summary.cachedInputTokens = cachedInputTokens;
+  if (cacheCreationInputTokens !== void 0) {
+    summary.cacheCreationInputTokens = cacheCreationInputTokens;
+  }
+  return summary;
 }
 function numericValue(value) {
   return typeof value === "number" && Number.isFinite(value) ? value : void 0;
@@ -2940,25 +2962,27 @@ async function recordRunReceived(props) {
   if (props.session === void 0) {
     return;
   }
-  await appendSessionLog(
-    props.store,
-    runReceivedLog({
-      sessionId: props.session.id,
-      runId: props.runId,
-      agentId: props.agentId,
-      message: props.body.message,
-      stream: props.body.stream === true,
-      ...compact({ maxTurns: props.body.maxTurns }),
-      ...compact({ toolConcurrency: props.body.toolConcurrency }),
-      hasTrace: props.body.trace !== void 0,
-      ...props.body.metadata === void 0 && props.selectedModel.ref === void 0 ? {} : {
-        metadata: {
-          ...props.body.metadata ?? {},
-          ...props.selectedModel.ref === void 0 ? {} : { [STUDIO_MODEL_METADATA_KEY]: props.selectedModel.ref }
-        }
-      }
-    })
-  );
+  const input = {
+    sessionId: props.session.id,
+    runId: props.runId,
+    agentId: props.agentId,
+    message: props.body.message,
+    stream: props.body.stream === true,
+    hasTrace: props.body.trace !== void 0
+  };
+  if (props.body.maxTurns !== void 0) input.maxTurns = props.body.maxTurns;
+  if (props.body.toolConcurrency !== void 0) {
+    input.toolConcurrency = props.body.toolConcurrency;
+  }
+  if (props.body.metadata !== void 0 || props.selectedModel.ref !== void 0) {
+    const metadata = {};
+    Object.assign(metadata, props.body.metadata);
+    if (props.selectedModel.ref !== void 0) {
+      metadata[STUDIO_MODEL_METADATA_KEY] = props.selectedModel.ref;
+    }
+    input.metadata = metadata;
+  }
+  await appendSessionLog(props.store, runReceivedLog(input));
 }
 async function recordSelectedModelWarnings(props) {
   if (props.session === void 0 || props.selectedModel.ref === void 0) {
@@ -2976,19 +3000,18 @@ async function recordSelectedModelWarnings(props) {
     });
   }
   if (sessionModelRef(props.session.metadata) !== props.selectedModel.ref) {
-    await props.store?.updateSessionMetadata?.(props.session.id, {
-      ...props.session.metadata ?? {},
-      [STUDIO_MODEL_METADATA_KEY]: props.selectedModel.ref
-    });
+    const metadata = {};
+    Object.assign(metadata, props.session.metadata);
+    metadata[STUDIO_MODEL_METADATA_KEY] = props.selectedModel.ref;
+    await props.store?.updateSessionMetadata?.(props.session.id, metadata);
   }
 }
 function runMemoryMetadata(agentId, body, selectedModel, runId) {
-  return {
-    agentId,
-    ...body.metadata ?? {},
-    ...selectedModel.ref === void 0 ? {} : { [STUDIO_MODEL_METADATA_KEY]: selectedModel.ref },
-    studioRunId: runId
-  };
+  const metadata = { agentId };
+  Object.assign(metadata, body.metadata);
+  if (selectedModel.ref !== void 0) metadata[STUDIO_MODEL_METADATA_KEY] = selectedModel.ref;
+  metadata.studioRunId = runId;
+  return metadata;
 }
 function createRunRequest(props) {
   const request = props.session !== void 0 ? props.runAgent.memory === void 0 ? props.runAgent.prompt([...props.session.messages, props.promptMessage]) : props.runAgent.session(props.session.id, { metadata: props.memoryMetadata }).prompt(props.body.message) : props.runAgent.prompt(
@@ -3009,24 +3032,24 @@ function createRunRequest(props) {
 }
 function handleStreamingAgentRun(c, run, props) {
   const runtimeEvents = new AsyncEventQueue();
-  run.request.approvals(
-    props.approvalRuntime.createApprovals({
-      runId: run.runId,
-      agentId: run.agentId,
-      ...compact({ sessionId: run.session?.id }),
-      ...compact({ metadata: run.body.metadata }),
-      emit: (event) => runtimeEvents.push(event)
-    })
-  );
+  const approvalContext = {
+    runId: run.runId,
+    agentId: run.agentId,
+    emit: (event) => runtimeEvents.push(event)
+  };
+  if (run.session !== void 0) approvalContext.sessionId = run.session.id;
+  if (run.body.metadata !== void 0) approvalContext.metadata = run.body.metadata;
+  run.request.approvals(props.approvalRuntime.createApprovals(approvalContext));
+  const questionContext = {
+    runId: run.runId,
+    agentId: run.agentId,
+    emit: (event) => runtimeEvents.push(event)
+  };
+  if (run.session !== void 0) questionContext.sessionId = run.session.id;
+  if (run.body.metadata !== void 0) questionContext.metadata = run.body.metadata;
   const effectiveHook = composeHooks(
     run.runAgent.hook,
-    props.questionRuntime.createHook({
-      runId: run.runId,
-      agentId: run.agentId,
-      ...compact({ sessionId: run.session?.id }),
-      ...compact({ metadata: run.body.metadata }),
-      emit: (event) => runtimeEvents.push(event)
-    })
+    props.questionRuntime.createHook(questionContext)
   );
   if (effectiveHook !== void 0) {
     run.request.requestHook(effectiveHook);
@@ -3064,23 +3087,23 @@ async function startBufferedSessionRun(run, props) {
     await appendSessionLog(run.sessionStore, runStartedLog(run.session, run.runId));
     await appendSessionLog(run.sessionStore, memoryLoadedLog(run.session, run.runId));
   }
+  const questionContext = {
+    runId: run.runId,
+    agentId: run.agentId
+  };
+  if (run.session !== void 0) questionContext.sessionId = run.session.id;
+  if (run.body.metadata !== void 0) questionContext.metadata = run.body.metadata;
   const effectiveHook = composeHooks(
     run.runAgent.hook,
-    props.questionRuntime.createHook({
-      runId: run.runId,
-      agentId: run.agentId,
-      ...compact({ sessionId: run.session?.id }),
-      ...compact({ metadata: run.body.metadata })
-    })
-  );
-  run.request.approvals(
-    props.approvalRuntime.createApprovals({
-      runId: run.runId,
-      agentId: run.agentId,
-      ...compact({ sessionId: run.session?.id }),
-      ...compact({ metadata: run.body.metadata })
-    })
+    props.questionRuntime.createHook(questionContext)
   );
+  const approvalContext = {
+    runId: run.runId,
+    agentId: run.agentId
+  };
+  if (run.session !== void 0) approvalContext.sessionId = run.session.id;
+  if (run.body.metadata !== void 0) approvalContext.metadata = run.body.metadata;
+  run.request.approvals(props.approvalRuntime.createApprovals(approvalContext));
   if (effectiveHook !== void 0) {
     run.request.requestHook(effectiveHook);
   }
@@ -3254,10 +3277,8 @@ async function parseApprovalDecisionRequest(c) {
   if ("reason" in body && typeof body.reason !== "string") {
     return { error: errorResponse(c, 400, "bad_request", "reason must be a string") };
   }
-  return compact({
-    approved: body.approved,
-    reason: typeof body.reason === "string" && body.reason.trim().length > 0 ? body.reason.trim() : void 0
-  });
+  const reason = typeof body.reason === "string" && body.reason.trim().length > 0 ? body.reason.trim() : void 0;
+  return approvalDecision(body.approved, reason);
 }
 function createApprovalRuntime() {
   const approvals = /* @__PURE__ */ new Map();
@@ -3266,19 +3287,18 @@ function createApprovalRuntime() {
     createApprovals(context) {
       return {
         async handler(request) {
-          const decision = await requestApproval(
-            approvals,
-            context,
-            compact({
-              toolName: request.toolName,
-              toolCallId: request.toolCallId,
-              internalCallId: request.internalCallId,
-              args: request.rawArgs,
-              reason: request.reason,
-              rejectMessage: request.rejectMessage
-            })
-          );
-          return decision.approved ? compact({ approved: true, reason: decision.reason }) : compact({ approved: false, reason: decision.reason });
+          const approvalRequest = {
+            toolName: request.toolName,
+            internalCallId: request.internalCallId,
+            args: request.rawArgs
+          };
+          if (request.toolCallId !== void 0) approvalRequest.toolCallId = request.toolCallId;
+          if (request.reason !== void 0) approvalRequest.reason = request.reason;
+          if (request.rejectMessage !== void 0) {
+            approvalRequest.rejectMessage = request.rejectMessage;
+          }
+          const decision = await requestApproval(approvals, context, approvalRequest);
+          return approvalDecision(decision.approved, decision.reason);
         }
       };
     },
@@ -3314,16 +3334,11 @@ function createApprovalRuntime() {
       const resolved = resolveApproval(
         approval,
         decision.approved ? "approved" : "rejected",
-        compact({ reason })
+        reason === void 0 ? {} : { reason }
       );
       approvals.set(id, resolved);
       approval.emit?.({ type: "tool_approval_result", approval: resolved });
-      approval.resolve(
-        compact({
-          approved: decision.approved,
-          reason
-        })
-      );
+      approval.resolve(approvalDecision(decision.approved, reason));
       return publicApproval(resolved);
     }
   };
@@ -3331,35 +3346,28 @@ function createApprovalRuntime() {
 async function requestApproval(approvals, context, request) {
   const id = globalThis.crypto.randomUUID();
   const approval = {
-    ...compact({
-      id,
-      runId: context.runId,
-      agentId: context.agentId,
-      sessionId: context.sessionId,
-      toolName: request.toolName,
-      callId: request.toolCallId,
-      internalCallId: request.internalCallId,
-      args: request.args,
-      status: "pending",
-      requestedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      reason: request.reason,
-      rejectMessage: request.rejectMessage,
-      emit: context.emit
-    }),
+    id,
+    runId: context.runId,
+    agentId: context.agentId,
+    toolName: request.toolName,
+    internalCallId: request.internalCallId,
+    args: request.args,
+    status: "pending",
+    requestedAt: (/* @__PURE__ */ new Date()).toISOString(),
     resolve: () => {
     }
   };
+  if (context.sessionId !== void 0) approval.sessionId = context.sessionId;
+  if (request.toolCallId !== void 0) approval.callId = request.toolCallId;
+  if (request.reason !== void 0) approval.reason = request.reason;
+  if (request.rejectMessage !== void 0) approval.rejectMessage = request.rejectMessage;
+  if (context.emit !== void 0) approval.emit = context.emit;
   const decision = new Promise((resolve2) => {
     approval.resolve = (decision2) => {
       const current = approvals.get(id);
       if (!isPendingApproval(current)) {
         if (current !== void 0) {
-          resolve2(
-            compact({
-              approved: current.status === "approved",
-              reason: current.reason
-            })
-          );
+          resolve2(approvalDecision(current.status === "approved", current.reason));
         }
         return;
       }
@@ -3367,16 +3375,11 @@ async function requestApproval(approvals, context, request) {
       const resolved = resolveApproval(
         current,
         decision2.approved ? "approved" : "rejected",
-        compact({ reason })
+        reason === void 0 ? {} : { reason }
       );
       approvals.set(id, resolved);
       context.emit?.({ type: "tool_approval_result", approval: resolved });
-      resolve2(
-        compact({
-          approved: decision2.approved,
-          reason
-        })
-      );
+      resolve2(approvalDecision(decision2.approved, reason));
     };
   });
   approvals.set(id, approval);
@@ -3387,14 +3390,18 @@ function isPendingApproval(approval) {
   return approval !== void 0 && approval.status === "pending" && "resolve" in approval;
 }
 function resolveApproval(approval, status, options = {}) {
-  return publicApproval({
+  const resolved = {
     ...approval,
-    ...compact({
-      status,
-      resolvedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      reason: options.reason
-    })
-  });
+    status,
+    resolvedAt: (/* @__PURE__ */ new Date()).toISOString()
+  };
+  if (options.reason !== void 0) resolved.reason = options.reason;
+  return publicApproval(resolved);
+}
+function approvalDecision(approved, reason) {
+  const decision = { approved };
+  if (reason !== void 0) decision.reason = reason;
+  return decision;
 }
 function publicApproval(approval) {
   const { emit, rejectMessage, resolve: resolve2, ...rest } = approval;
@@ -3410,18 +3417,19 @@ var PREVIEW_VALUE_MAX_LENGTH = 500;
 function evalConfig(suite) {
   const casePreviews = suite.cases.slice(0, CASE_PREVIEW_LIMIT).map(casePreview);
   const metricSummaries = suite.metrics.map(metricSummary);
-  return compact({
+  const config = {
     id: suite.id ?? suite.name,
     name: suite.name,
-    description: suite.description,
     caseCount: suite.cases.length,
     metricNames: suite.metrics.map((metric) => metric.name),
     casePreviewCount: casePreviews.length,
     casePreviews,
-    metricSummaries,
-    concurrency: suite.concurrency,
-    metadata: suite.metadata
-  });
+    metricSummaries
+  };
+  if (suite.description !== void 0) config.description = suite.description;
+  if (suite.concurrency !== void 0) config.concurrency = suite.concurrency;
+  if (suite.metadata !== void 0) config.metadata = suite.metadata;
+  return config;
 }
 function casePreview(testCase, index) {
   if (!isRecord2(testCase)) {
@@ -3430,24 +3438,29 @@ function casePreview(testCase, index) {
       input: previewValue(testCase)
     };
   }
-  return compact({
-    id: typeof testCase.id === "string" && testCase.id.length > 0 ? testCase.id : `case-${index + 1}`,
-    input: "input" in testCase ? previewValue(testCase.input) : void 0,
-    expected: "expected" in testCase ? previewValue(testCase.expected) : void 0,
-    metadataKeys: metadataKeys(testCase.metadata)
-  });
+  const preview = {
+    id: typeof testCase.id === "string" && testCase.id.length > 0 ? testCase.id : `case-${index + 1}`
+  };
+  if ("input" in testCase) preview.input = previewValue(testCase.input);
+  if ("expected" in testCase) preview.expected = previewValue(testCase.expected);
+  const keys = metadataKeys(testCase.metadata);
+  if (keys !== void 0) preview.metadataKeys = keys;
+  return preview;
 }
 function metricSummary(metric, index) {
   if (!isRecord2(metric)) {
     return { name: `metric-${index + 1}` };
   }
-  return compact({
-    name: typeof metric.name === "string" && metric.name.length > 0 ? metric.name : `metric-${index + 1}`,
-    dataType: metricDataType(metric.dataType),
-    configId: typeof metric.configId === "string" ? metric.configId : void 0,
-    scoreConfigId: typeof metric.scoreConfigId === "string" ? metric.scoreConfigId : void 0,
-    metadataKeys: metadataKeys(metric.metadata)
-  });
+  const summary = {
+    name: typeof metric.name === "string" && metric.name.length > 0 ? metric.name : `metric-${index + 1}`
+  };
+  const dataType = metricDataType(metric.dataType);
+  if (dataType !== void 0) summary.dataType = dataType;
+  if (typeof metric.configId === "string") summary.configId = metric.configId;
+  if (typeof metric.scoreConfigId === "string") summary.scoreConfigId = metric.scoreConfigId;
+  const keys = metadataKeys(metric.metadata);
+  if (keys !== void 0) summary.metadataKeys = keys;
+  return summary;
 }
 function previewValue(value) {
   const jsonValue = toJsonValue(value);
@@ -3492,11 +3505,10 @@ function approvalMetadata(tool) {
     return { required: false };
   }
   const policy = approval;
-  return {
-    required: true,
-    ...typeof policy.reason === "string" ? { reason: policy.reason } : {},
-    ...typeof policy.rejectMessage === "string" ? { rejectMessage: policy.rejectMessage } : {}
-  };
+  const metadata = { required: true };
+  if (typeof policy.reason === "string") metadata.reason = policy.reason;
+  if (typeof policy.rejectMessage === "string") metadata.rejectMessage = policy.rejectMessage;
+  return metadata;
 }
 function mcpServerName(tool) {
   const metadata = tool[MCP_TOOL_METADATA_KEY];
@@ -3517,22 +3529,21 @@ function runnerId(options) {
 function agentConfig(agent) {
   const name = agent.name ?? agent.agent.name;
   const description = agent.description ?? agent.agent.description;
-  return compact({
+  const config = {
     id: agent.id,
-    name,
-    description,
-    quickPrompts: agent.quickPrompts ?? [],
-    metadata: agent.metadata
-  });
+    quickPrompts: agent.quickPrompts ?? []
+  };
+  if (name !== void 0) config.name = name;
+  if (description !== void 0) config.description = description;
+  if (agent.metadata !== void 0) config.metadata = agent.metadata;
+  return config;
 }
 function agentRuntimeSummary(agent) {
   const tools = agentToolItems(agent);
   const name = agent.name ?? agent.agent.name;
   const description = agent.description ?? agent.agent.description;
-  return compact({
+  const summary = {
     id: agent.id,
-    name,
-    description,
     model: toJsonValue2(agent.agent.model),
     toolCount: tools.length,
     staticToolCount: tools.filter((item) => item.source === "static").length,
@@ -3544,35 +3555,37 @@ function agentRuntimeSummary(agent) {
     observerCount: agent.agent.observers.length,
     hasMemory: agent.agent.memory !== void 0,
     hasHook: agent.agent.hook !== void 0,
-    hasOutputSchema: agent.agent.outputSchema !== void 0,
-    defaultMaxTurns: agent.agent.defaultMaxTurns,
-    metadata: agent.metadata
-  });
+    hasOutputSchema: agent.agent.outputSchema !== void 0
+  };
+  if (name !== void 0) summary.name = name;
+  if (description !== void 0) summary.description = description;
+  if (agent.agent.defaultMaxTurns !== void 0) {
+    summary.defaultMaxTurns = agent.agent.defaultMaxTurns;
+  }
+  if (agent.metadata !== void 0) summary.metadata = agent.metadata;
+  return summary;
 }
 function pipelineConfig(pipeline) {
   const graph = pipeline.pipeline.graph();
   const stageNodes = graph.nodes.filter((node) => node.kind !== "input" && node.kind !== "output");
-  return compact({
+  const config = {
     id: pipeline.id,
-    name: pipeline.name,
-    description: pipeline.description,
-    metadata: pipeline.metadata,
     stageCount: stageNodes.length,
     edgeCount: graph.edges.length,
     hasParallelStages: graph.nodes.some((node) => node.kind === "parallel"),
     agentCount: graph.nodes.filter((node) => node.kind === "agent").length,
     extractorCount: graph.nodes.filter((node) => node.kind === "extractor").length
-  });
+  };
+  if (pipeline.name !== void 0) config.name = pipeline.name;
+  if (pipeline.description !== void 0) config.description = pipeline.description;
+  if (pipeline.metadata !== void 0) config.metadata = pipeline.metadata;
+  return config;
 }
 function buildConfig(options, agents, pipelines, stores) {
   const models = options.models === void 0 ? void 0 : studioModelsConfig(createStudioModelRegistry(options.models), agents);
-  return compact({
+  const config = {
     id: runnerId(options),
-    name: options.name,
-    description: options.description,
-    version: options.version,
     agents: agents.map(agentConfig),
-    models,
     pipelines: pipelines.map(pipelineConfig),
     evals: options.evals.map(evalConfig),
     chat: {
@@ -3580,7 +3593,12 @@ function buildConfig(options, agents, pipelines, stores) {
     },
     capabilities: capabilityConfig(options, agents, pipelines, stores),
     unsupportedCapabilities: unsupportedCapabilities(stores)
-  });
+  };
+  if (options.name !== void 0) config.name = options.name;
+  if (options.description !== void 0) config.description = options.description;
+  if (options.version !== void 0) config.version = options.version;
+  if (models !== void 0) config.models = models;
+  return config;
 }
 function capabilityConfig(_options, agents, pipelines, stores) {
   const capabilities = {
@@ -3622,10 +3640,10 @@ function capabilityConfig(_options, agents, pipelines, stores) {
   return capabilities;
 }
 function unsupportedCapabilities(stores) {
-  return [
-    ...stores.sessions === void 0 ? ["sessions"] : [],
-    ...stores.traces === void 0 ? ["traces"] : []
-  ];
+  const capabilities = [];
+  if (stores.sessions === void 0) capabilities.push("sessions");
+  if (stores.traces === void 0) capabilities.push("traces");
+  return capabilities;
 }
 function toJsonValue2(value) {
   return serializeUnknown(value);
@@ -3658,10 +3676,9 @@ function registerEvalRoutes(app, props) {
     }
     const runId = globalThis.crypto.randomUUID();
     const startedAt = Date.now();
-    const result = await runEvalSuite({
-      ...suite,
-      ...compact({ concurrency: body.concurrency })
-    });
+    const runOptions = { ...suite };
+    if (body.concurrency !== void 0) runOptions.concurrency = body.concurrency;
+    const result = await runEvalSuite(runOptions);
     const endedAt = Date.now();
     const jsonResult = toJsonValue(result);
     const response = {
@@ -3736,18 +3753,19 @@ function registerKnowledgeRoutes(app, props) {
 }
 async function agentKnowledgeConfig(agent) {
   const agentName = agent.name ?? agent.agent.name;
-  return {
+  const config = {
     agentId: agent.id,
-    ...compact({ agentName }),
     sources: await knowledgeSources(agent),
-    staticContext: agent.agent.staticContext.map((document) => ({
-      id: document.id,
-      text: document.text,
-      ...compact({
-        additionalProps: document.additionalProps !== void 0 ? jsonObjectFromRecord(document.additionalProps) : void 0
-      })
-    }))
+    staticContext: agent.agent.staticContext.map((document) => {
+      const item = { id: document.id, text: document.text };
+      if (document.additionalProps !== void 0) {
+        item.additionalProps = jsonObjectFromRecord(document.additionalProps);
+      }
+      return item;
+    })
   };
+  if (agentName !== void 0) config.agentName = agentName;
+  return config;
 }
 async function knowledgeSources(agent) {
   const sources = [
@@ -3764,34 +3782,40 @@ async function knowledgeSources(agent) {
     agent.agent.dynamicContexts.map(async (registration, index) => {
       const inspect = inspectFn(registration.index);
       const count = await inspectableCount(inspect, registration.options.filter);
-      return {
+      const source = {
         sourceId: dynamicContextSourceId(index),
         kind: "dynamic_context",
         label: `Dynamic context ${index + 1}`,
         count: 1,
         registrationIndex: index,
         topK: registration.options.topK,
-        ...compact({ threshold: registration.options.threshold }),
-        inspectable: inspect !== void 0,
-        ...compact({ itemCount: count })
+        inspectable: inspect !== void 0
       };
+      if (registration.options.threshold !== void 0) {
+        source.threshold = registration.options.threshold;
+      }
+      if (count !== void 0) source.itemCount = count;
+      return source;
     })
   );
   const dynamicToolSources = await Promise.all(
     agent.agent.dynamicTools.map(async (registration, index) => {
       const inspect = inspectFn(registration.index);
       const count = await inspectableCount(inspect, registration.options.filter);
-      return {
+      const source = {
         sourceId: dynamicToolsSourceId(index),
         kind: "dynamic_tools",
         label: `Dynamic tools ${index + 1}`,
         count: 1,
         registrationIndex: index,
         topK: registration.options.topK,
-        ...compact({ threshold: registration.options.threshold }),
-        inspectable: inspect !== void 0,
-        ...compact({ itemCount: count })
+        inspectable: inspect !== void 0
       };
+      if (registration.options.threshold !== void 0) {
+        source.threshold = registration.options.threshold;
+      }
+      if (count !== void 0) source.itemCount = count;
+      return source;
     })
   );
   return [...sources, ...dynamicContextSources, ...dynamicToolSources];
@@ -3822,14 +3846,16 @@ async function knowledgeItemsPage(agent, sourceId, request) {
       cursor: request.cursor,
       filter: registration.options.filter
     });
-    return {
+    const result = {
       agentId: agent.id,
       sourceId,
       kind: "dynamic_context",
       inspectable: true,
-      items: page.items.map((item) => dynamicContextItem(item)),
-      ...compact({ nextCursor: page.nextCursor, totalCount: page.totalCount })
+      items: page.items.map((item) => dynamicContextItem(item))
     };
+    if (page.nextCursor !== void 0) result.nextCursor = page.nextCursor;
+    if (page.totalCount !== void 0) result.totalCount = page.totalCount;
+    return result;
   }
   const dynamicToolsIndex = dynamicSourceIndex(sourceId, "dynamic_tools");
   if (dynamicToolsIndex !== void 0) {
@@ -3846,14 +3872,16 @@ async function knowledgeItemsPage(agent, sourceId, request) {
       cursor: request.cursor,
       filter: registration.options.filter
     });
-    return {
+    const result = {
       agentId: agent.id,
       sourceId,
       kind: "dynamic_tools",
       inspectable: true,
-      items: page.items.map((item) => dynamicToolItem(item)),
-      ...compact({ nextCursor: page.nextCursor, totalCount: page.totalCount })
+      items: page.items.map((item) => dynamicToolItem(item))
     };
+    if (page.nextCursor !== void 0) result.nextCursor = page.nextCursor;
+    if (page.totalCount !== void 0) result.totalCount = page.totalCount;
+    return result;
   }
   return void 0;
 }
@@ -3868,24 +3896,26 @@ function staticKnowledgeItemsPage(agent, request) {
   const start = Math.max(0, Math.trunc(Number(request.cursor ?? "0")));
   const page = agent.agent.staticContext.slice(start, start + request.limit);
   const nextOffset = start + page.length;
-  return {
+  const result = {
     agentId: agent.id,
     sourceId: staticSourceId(),
     kind: "static_context",
     inspectable: true,
-    items: page.map((document) => ({
-      id: document.id,
-      kind: "static_context",
-      text: document.text,
-      ...compact({
-        metadata: document.additionalProps !== void 0 ? jsonObjectFromRecord(document.additionalProps) : void 0
-      })
-    })),
-    ...compact({
-      nextCursor: nextOffset < agent.agent.staticContext.length ? String(nextOffset) : void 0
+    items: page.map((document) => {
+      const item = {
+        id: document.id,
+        kind: "static_context",
+        text: document.text
+      };
+      if (document.additionalProps !== void 0) {
+        item.metadata = jsonObjectFromRecord(document.additionalProps);
+      }
+      return item;
     }),
     totalCount: agent.agent.staticContext.length
   };
+  if (nextOffset < agent.agent.staticContext.length) result.nextCursor = String(nextOffset);
+  return result;
 }
 function nonInspectablePage(agentId, sourceId, kind) {
   return {
@@ -3899,31 +3929,30 @@ function nonInspectablePage(agentId, sourceId, kind) {
 }
 function dynamicContextItem(item) {
   const text = isRecord3(item.document) && typeof item.document.text === "string" ? item.document.text : typeof item.document === "string" ? item.document : void 0;
-  return {
+  const result = {
     id: item.id,
-    kind: "dynamic_context",
-    ...text === void 0 ? { document: toJsonValue(item.document) } : { text },
-    ...compact({
-      metadata: item.metadata !== void 0 ? jsonObjectFromRecord(item.metadata) : void 0
-    })
+    kind: "dynamic_context"
   };
+  if (text === void 0) result.document = toJsonValue(item.document);
+  else result.text = text;
+  if (item.metadata !== void 0) result.metadata = jsonObjectFromRecord(item.metadata);
+  return result;
 }
 function dynamicToolItem(item) {
   const document = isRecord3(item.document) ? item.document : {};
   const definition = isRecord3(document.definition) ? document.definition : {};
   const toolName = typeof document.toolName === "string" ? document.toolName : typeof definition.name === "string" ? definition.name : item.id;
   const description = typeof definition.description === "string" ? definition.description : "";
-  return {
+  const result = {
     id: item.id,
     kind: "dynamic_tool",
     toolName,
     description,
     parameterKeys: parameterKeys(definition.parameters),
-    document: toJsonValue(item.document),
-    ...compact({
-      metadata: item.metadata !== void 0 ? jsonObjectFromRecord(item.metadata) : void 0
-    })
+    document: toJsonValue(item.document)
   };
+  if (item.metadata !== void 0) result.metadata = jsonObjectFromRecord(item.metadata);
+  return result;
 }
 function parameterKeys(parameters) {
   if (!isRecord3(parameters) || !isRecord3(parameters.properties)) {
@@ -3976,21 +4005,20 @@ function evidenceFromTrace(trace) {
       return [];
     }
     const query = queryFromGenerationInput(observation.input);
-    return [
-      {
-        traceId: trace.id,
-        sessionId: trace.sessionId,
-        observationId: observation.id,
-        observationName: observation.name,
-        turn: observation.turn,
-        startedAt: observation.startedAt,
-        ...compact({ query }),
-        documentCount: documents.length,
-        toolCount: tools.length,
-        documents,
-        tools
-      }
-    ];
+    const evidence = {
+      traceId: trace.id,
+      sessionId: trace.sessionId,
+      observationId: observation.id,
+      observationName: observation.name,
+      turn: observation.turn,
+      startedAt: observation.startedAt,
+      documentCount: documents.length,
+      toolCount: tools.length,
+      documents,
+      tools
+    };
+    if (query !== void 0) evidence.query = query;
+    return [evidence];
   });
 }
 function queryFromGenerationInput(value) {
@@ -4056,7 +4084,11 @@ function evidenceDocument(value) {
   if (id === void 0 && text === void 0 && additionalProps === void 0) {
     return [];
   }
-  return [compact({ id, text, additionalProps })];
+  const document = {};
+  if (id !== void 0) document.id = id;
+  if (text !== void 0) document.text = text;
+  if (additionalProps !== void 0) document.additionalProps = additionalProps;
+  return [document];
 }
 function evidenceToolName(value) {
   if (!isRecord3(value) || typeof value.name !== "string") {
@@ -4167,10 +4199,9 @@ function registerMemoryRoutes(app, props) {
     }
     const agentId = optionalQueryString(c.req.query("agentId"));
     const userId = optionalQueryString(c.req.query("userId"));
-    const sessions = await props.sessionStore.listSessions({
-      ...compact({ agentId }),
-      limit: 100
-    });
+    const listInput = { limit: 100 };
+    if (agentId !== void 0) listInput.agentId = agentId;
+    const sessions = await props.sessionStore.listSessions(listInput);
     const conversations = sessions.map(memoryConversationSummary).filter((session) => userId === void 0 || session.userId === userId).slice(0, limit);
     return c.json({
       conversations,
@@ -4200,16 +4231,17 @@ function registerMemoryRoutes(app, props) {
   });
 }
 function memoryConversationSummary(session) {
-  return compact({
+  const summary = {
     id: session.id,
     userId: sessionUserId(session),
     agentId: session.agentId,
-    title: session.title,
     createdAt: session.createdAt,
     updatedAt: session.updatedAt,
-    messageCount: session.messageCount,
-    metadata: session.metadata
-  });
+    messageCount: session.messageCount
+  };
+  if (session.title !== void 0) summary.title = session.title;
+  if (session.metadata !== void 0) summary.metadata = session.metadata;
+  return summary;
 }
 function sessionUserId(session) {
   const userId = session.metadata?.userId;
@@ -4227,6 +4259,12 @@ async function* emitPipelineLog(store, input) {
   }
 }
 function pipelineRunReceivedLog(props) {
+  const metadata = {
+    stream: props.stream,
+    metadataKeys: Object.keys(props.metadata ?? {})
+  };
+  const inputBytes = byteLength3(formatUnknown(props.input));
+  if (inputBytes !== void 0) metadata.inputBytes = inputBytes;
   return {
     pipelineId: props.pipeline.id,
     runId: props.runId,
@@ -4234,11 +4272,7 @@ function pipelineRunReceivedLog(props) {
     category: "api",
     event: "pipeline.run_received",
     message: "Pipeline run request received",
-    metadata: compact({
-      stream: props.stream,
-      inputBytes: byteLength3(formatUnknown(props.input)),
-      metadataKeys: Object.keys(props.metadata ?? {})
-    })
+    metadata
   };
 }
 function pipelineRunStartedLog(pipeline, runId) {
@@ -4250,13 +4284,16 @@ function pipelineRunStartedLog(pipeline, runId) {
     category: "run",
     event: "pipeline.run_started",
     message: "Pipeline run started",
-    metadata: compact({
+    metadata: {
       stageCount: graph.nodes.filter((node) => node.kind !== "input" && node.kind !== "output").length,
       edgeCount: graph.edges.length
-    })
+    }
   };
 }
 function pipelineRunCompletedLog(props) {
+  const metadata = { durationMs: props.durationMs };
+  const outputBytes = byteLength3(formatUnknown(props.output));
+  if (outputBytes !== void 0) metadata.outputBytes = outputBytes;
   return {
     pipelineId: props.pipelineId,
     runId: props.runId,
@@ -4264,10 +4301,7 @@ function pipelineRunCompletedLog(props) {
     category: "run",
     event: "pipeline.run_completed",
     message: "Pipeline run completed",
-    metadata: compact({
-      durationMs: props.durationMs,
-      outputBytes: byteLength3(formatUnknown(props.output))
-    })
+    metadata
   };
 }
 function pipelineRunFailedLog(pipelineId, runId, error, startedAt) {
@@ -4278,10 +4312,10 @@ function pipelineRunFailedLog(pipelineId, runId, error, startedAt) {
     category: "run",
     event: "pipeline.run_failed",
     message: "Pipeline run failed",
-    metadata: compact({
+    metadata: {
       durationMs: Date.now() - startedAt,
       error: serializeError(error)
-    })
+    }
   };
 }
 function pipelineStageLog(pipelineId, runId, event) {
@@ -4305,10 +4339,10 @@ function pipelineStageLog(pipelineId, runId, event) {
       category,
       event: `${event.node.kind}.completed`,
       message: `${event.node.label} completed`,
-      metadata: compact({
+      metadata: {
         ...nodeMetadata(event.node),
         durationMs: event.durationMs
-      })
+      }
     };
   }
   return {
@@ -4318,11 +4352,11 @@ function pipelineStageLog(pipelineId, runId, event) {
     category,
     event: `${event.node.kind}.failed`,
     message: `${event.node.label} failed`,
-    metadata: compact({
+    metadata: {
       ...nodeMetadata(event.node),
       durationMs: event.durationMs,
       error: serializeError(event.error)
-    })
+    }
   };
 }
 function stageCategory(node) {
@@ -4338,14 +4372,15 @@ function stageCategory(node) {
   return "stage";
 }
 function nodeMetadata(node) {
-  return compact({
+  const metadata = {
     nodeId: node.id,
     kind: node.kind,
-    label: node.label,
-    agentId: node.agentId,
-    pipelineId: node.pipelineId,
-    branchKey: node.branchKey
-  });
+    label: node.label
+  };
+  if (node.agentId !== void 0) metadata.agentId = node.agentId;
+  if (node.pipelineId !== void 0) metadata.pipelineId = node.pipelineId;
+  if (node.branchKey !== void 0) metadata.branchKey = node.branchKey;
+  return metadata;
 }
 function byteLength3(value) {
   return value === void 0 ? void 0 : new TextEncoder().encode(value).length;
@@ -4388,16 +4423,16 @@ function registerPipelineRoutes(app, props) {
     if (after === false) {
       return errorResponse(c, 400, "bad_request", "after must be a non-negative integer");
     }
-    const logs = await props.logStore.listPipelineLogs({
+    const listInput = {
       pipelineId,
-      limit,
-      ...compact({ after })
-    });
+      limit
+    };
+    if (after !== void 0) listInput.after = after;
+    const logs = await props.logStore.listPipelineLogs(listInput);
     const last = logs.at(-1);
-    return c.json({
-      logs,
-      ...logs.length === limit && last !== void 0 ? { nextCursor: last.sequence } : {}
-    });
+    const response = { logs };
+    if (logs.length === limit && last !== void 0) response.nextCursor = last.sequence;
+    return c.json(response);
   });
   app.get("/pipelines/:pipelineId/runs", async (c) => {
     const pipelineId = c.req.param("pipelineId");
@@ -4460,45 +4495,47 @@ function registerPipelineRoutes(app, props) {
     if (sourceRun.status === "running") {
       return errorResponse(c, 409, "conflict", "Cannot replay a running pipeline run");
     }
-    return executePipelineRun(c, props, pipeline, {
+    const replayRequest = {
       input: sourceRun.input,
-      ...compact({ stream: body.stream }),
       metadata: replayMetadata(sourceRun.metadata, body.metadata, sourceRun.runId)
-    });
+    };
+    if (body.stream !== void 0) replayRequest.stream = body.stream;
+    return executePipelineRun(c, props, pipeline, replayRequest);
   });
 }
 async function executePipelineRun(c, props, pipeline, body) {
   const runId = globalThis.crypto.randomUUID();
   const startedAt = Date.now();
   const startedAtIso = new Date(startedAt).toISOString();
-  await appendPipelineLog(
-    props.logStore,
-    pipelineRunReceivedLog({
-      pipeline,
-      runId,
-      stream: body.stream === true,
-      input: body.input,
-      ...compact({ metadata: body.metadata })
-    })
-  );
-  await savePipelineRun(props.runStore, {
+  const receivedInput = {
+    pipeline,
+    runId,
+    stream: body.stream === true,
+    input: body.input
+  };
+  if (body.metadata !== void 0) receivedInput.metadata = body.metadata;
+  await appendPipelineLog(props.logStore, pipelineRunReceivedLog(receivedInput));
+  const runningRecord = {
     runId,
     pipelineId: pipeline.id,
     status: "running",
     input: body.input,
-    ...compact({ metadata: body.metadata }),
     startedAt: startedAtIso
-  });
+  };
+  if (body.metadata !== void 0) runningRecord.metadata = body.metadata;
+  await savePipelineRun(props.runStore, runningRecord);
   if (body.stream === true) {
-    return streamPipelineRun(c, {
+    const streamOptions = {
       pipeline,
       runId,
       input: body.input,
       startedAt,
-      startedAtIso,
-      ...compact({ metadata: body.metadata }),
-      ...compact({ logStore: props.logStore, runStore: props.runStore })
-    });
+      startedAtIso
+    };
+    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;
+    return streamPipelineRun(c, streamOptions);
   }
   try {
     await appendPipelineLog(props.logStore, pipelineRunStartedLog(pipeline, runId));
@@ -4511,17 +4548,18 @@ async function executePipelineRun(c, props, pipeline, body) {
     });
     const jsonOutput = toJsonValue(output);
     const endedAt = Date.now();
-    await savePipelineRun(props.runStore, {
+    const successRecord = {
       runId,
       pipelineId: pipeline.id,
       status: "success",
       input: body.input,
       output: jsonOutput,
-      ...compact({ metadata: body.metadata }),
       startedAt: startedAtIso,
       endedAt: new Date(endedAt).toISOString(),
       durationMs: endedAt - startedAt
-    });
+    };
+    if (body.metadata !== void 0) successRecord.metadata = body.metadata;
+    await savePipelineRun(props.runStore, successRecord);
     await appendPipelineLog(
       props.logStore,
       pipelineRunCompletedLog({
@@ -4539,17 +4577,18 @@ async function executePipelineRun(c, props, pipeline, body) {
     return c.json(response);
   } catch (error) {
     const endedAt = Date.now();
-    await savePipelineRun(props.runStore, {
+    const errorRecord = {
       runId,
       pipelineId: pipeline.id,
       status: "error",
       input: body.input,
       error: serializeError(error),
-      ...compact({ metadata: body.metadata }),
       startedAt: startedAtIso,
       endedAt: new Date(endedAt).toISOString(),
       durationMs: endedAt - startedAt
-    });
+    };
+    if (body.metadata !== void 0) errorRecord.metadata = body.metadata;
+    await savePipelineRun(props.runStore, errorRecord);
     await appendPipelineLog(
       props.logStore,
       pipelineRunFailedLog(pipeline.id, runId, error, startedAt)
@@ -4586,17 +4625,18 @@ async function* pipelineRunEvents(props) {
   }).then(async (output) => {
     const jsonOutput = toJsonValue(output);
     const endedAt = Date.now();
-    await savePipelineRun(props.runStore, {
+    const successRecord = {
       runId: props.runId,
       pipelineId: props.pipeline.id,
       status: "success",
       input: props.input,
       output: jsonOutput,
-      ...compact({ metadata: props.metadata }),
       startedAt: props.startedAtIso,
       endedAt: new Date(endedAt).toISOString(),
       durationMs: endedAt - props.startedAt
-    });
+    };
+    if (props.metadata !== void 0) successRecord.metadata = props.metadata;
+    await savePipelineRun(props.runStore, successRecord);
     const log = await appendPipelineLog(
       props.logStore,
       pipelineRunCompletedLog({
@@ -4617,17 +4657,18 @@ async function* pipelineRunEvents(props) {
     });
   }).catch(async (error) => {
     const endedAt = Date.now();
-    await savePipelineRun(props.runStore, {
+    const errorRecord = {
       runId: props.runId,
       pipelineId: props.pipeline.id,
       status: "error",
       input: props.input,
       error: serializeError(error),
-      ...compact({ metadata: props.metadata }),
       startedAt: props.startedAtIso,
       endedAt: new Date(endedAt).toISOString(),
       durationMs: endedAt - props.startedAt
-    });
+    };
+    if (props.metadata !== void 0) errorRecord.metadata = props.metadata;
+    await savePipelineRun(props.runStore, errorRecord);
     const log = await appendPipelineLog(
       props.logStore,
       pipelineRunFailedLog(props.pipeline.id, props.runId, error, props.startedAt)
@@ -4662,7 +4703,7 @@ async function parsePipelineRunRequest(c) {
   if (!isObject(body)) {
     return { error: errorResponse(c, 400, "bad_request", "Request body must be an object") };
   }
-  if (!("input" in body) || !isJsonValue2(body.input)) {
+  if (!("input" in body) || !isJsonValue(body.input)) {
     return { error: errorResponse(c, 400, "bad_request", "input must be JSON-compatible") };
   }
   const request = {
@@ -4708,11 +4749,10 @@ async function parsePipelineReplayRequest(c) {
   return request;
 }
 function replayMetadata(sourceMetadata, requestMetadata, sourceRunId) {
-  return {
-    ...sourceMetadata ?? {},
-    ...requestMetadata ?? {},
-    replayOf: sourceRunId
-  };
+  const metadata = {};
+  Object.assign(metadata, sourceMetadata, requestMetadata);
+  metadata.replayOf = sourceRunId;
+  return metadata;
 }
 function parsePipelineLogLimit(value) {
   if (value === void 0 || value.trim().length === 0) {
@@ -4734,18 +4774,6 @@ function parsePipelineLogAfter(value) {
   }
   return after;
 }
-function isJsonValue2(value) {
-  if (value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
-    return Number.isFinite(value) || typeof value !== "number";
-  }
-  if (Array.isArray(value)) {
-    return value.every(isJsonValue2);
-  }
-  if (isObject(value)) {
-    return Object.values(value).every((item) => item === void 0 || isJsonValue2(item));
-  }
-  return false;
-}
 
 // src/runtime/questions.ts
 import { createHook as createHook2 } from "@anvia/core/hooks";
@@ -4826,14 +4854,13 @@ async function parseQuestionAnswerRequest(c) {
     if ("custom" in answer && typeof answer.custom !== "boolean") {
       return { error: errorResponse(c, 400, "bad_request", "custom must be a boolean") };
     }
-    answers.push(
-      compact({
-        questionId: answer.questionId.trim(),
-        answer: answer.answer.trim(),
-        choice: typeof answer.choice === "string" ? answer.choice : void 0,
-        custom: typeof answer.custom === "boolean" ? answer.custom : void 0
-      })
-    );
+    const normalized = {
+      questionId: answer.questionId.trim(),
+      answer: answer.answer.trim()
+    };
+    if (typeof answer.choice === "string") normalized.choice = answer.choice;
+    if (typeof answer.custom === "boolean") normalized.custom = answer.custom;
+    answers.push(normalized);
   }
   return { answers };
 }
@@ -4851,17 +4878,14 @@ function createQuestionRuntime() {
           if ("error" in prompts) {
             return control.skip(prompts.error);
           }
-          const answers = await requestQuestion(
-            questions,
-            context,
-            compact({
-              toolName,
-              toolCallId,
-              internalCallId,
-              args,
-              questions: prompts.questions
-            })
-          );
+          const request = {
+            toolName,
+            internalCallId,
+            args,
+            questions: prompts.questions
+          };
+          if (toolCallId !== void 0) request.toolCallId = toolCallId;
+          const answers = await requestQuestion(questions, context, request);
           return control.skip(JSON.stringify({ answers }));
         }
       });
@@ -4905,23 +4929,21 @@ function createQuestionRuntime() {
 async function requestQuestion(questions, context, request) {
   const id = globalThis.crypto.randomUUID();
   const question = {
-    ...compact({
-      id,
-      runId: context.runId,
-      agentId: context.agentId,
-      sessionId: context.sessionId,
-      toolName: request.toolName,
-      callId: request.toolCallId,
-      internalCallId: request.internalCallId,
-      args: request.args,
-      questions: request.questions,
-      status: "pending",
-      requestedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      emit: context.emit
-    }),
+    id,
+    runId: context.runId,
+    agentId: context.agentId,
+    toolName: request.toolName,
+    internalCallId: request.internalCallId,
+    args: request.args,
+    questions: request.questions,
+    status: "pending",
+    requestedAt: (/* @__PURE__ */ new Date()).toISOString(),
     resolve: () => {
     }
   };
+  if (context.sessionId !== void 0) question.sessionId = context.sessionId;
+  if (request.toolCallId !== void 0) question.callId = request.toolCallId;
+  if (context.emit !== void 0) question.emit = context.emit;
   const answer = new Promise((resolve2) => {
     question.resolve = (answers) => {
       resolve2(answers);
@@ -5006,10 +5028,9 @@ function registerSessionRoutes(app, props) {
     if (limit === void 0) {
       return errorResponse(c, 400, "bad_request", "limit must be a positive integer");
     }
-    const sessions = await props.sessionStore.listSessions({
-      ...compact({ agentId }),
-      limit
-    });
+    const listInput = { limit };
+    if (agentId !== void 0) listInput.agentId = agentId;
+    const sessions = await props.sessionStore.listSessions(listInput);
     return c.json({ sessions });
   });
   app.post("/sessions", async (c) => {
@@ -5020,11 +5041,13 @@ function registerSessionRoutes(app, props) {
     if (!props.agentMap.has(body.agentId)) {
       return errorResponse(c, 404, "not_found", "Agent not found");
     }
-    const session = await props.sessionStore.createSession({
+    const createInput = {
       id: globalThis.crypto.randomUUID(),
-      agentId: body.agentId,
-      ...compact({ title: body.title, metadata: body.metadata })
-    });
+      agentId: body.agentId
+    };
+    if (body.title !== void 0) createInput.title = body.title;
+    if (body.metadata !== void 0) createInput.metadata = body.metadata;
+    const session = await props.sessionStore.createSession(createInput);
     await appendSessionLog(props.sessionStore, sessionCreatedLog(session));
     return c.json(session, 201);
   });
@@ -5058,16 +5081,16 @@ function registerSessionRoutes(app, props) {
     if (after === false) {
       return errorResponse(c, 400, "bad_request", "after must be a non-negative integer");
     }
-    const logs = await props.sessionStore.listSessionLogs({
+    const listInput = {
       sessionId,
-      limit,
-      ...compact({ after })
-    });
+      limit
+    };
+    if (after !== void 0) listInput.after = after;
+    const logs = await props.sessionStore.listSessionLogs(listInput);
     const last = logs.at(-1);
-    return c.json({
-      logs,
-      ...logs.length === limit && last !== void 0 ? { nextCursor: last.sequence } : {}
-    });
+    const response = { logs };
+    if (logs.length === limit && last !== void 0) response.nextCursor = last.sequence;
+    return c.json(response);
   });
   app.delete("/sessions/:sessionId", async (c) => {
     if (props.sessionStore.deleteSession === void 0) {
@@ -5152,19 +5175,17 @@ var InMemoryStudioStore = class {
   createSession(input) {
     const now = (/* @__PURE__ */ new Date()).toISOString();
     const session = {
-      ...compact({
-        id: input.id,
-        agentId: input.agentId,
-        title: input.title,
-        createdAt: now,
-        updatedAt: now,
-        messageCount: 0,
-        metadata: input.metadata
-      }),
+      id: input.id,
+      agentId: input.agentId,
+      createdAt: now,
+      updatedAt: now,
+      messageCount: 0,
       messages: [],
       runs: [],
       logs: []
     };
+    if (input.title !== void 0) session.title = input.title;
+    if (input.metadata !== void 0) session.metadata = input.metadata;
     this.sessions.set(input.id, session);
     return sessionSummary(session);
   }
@@ -5240,18 +5261,18 @@ var InMemoryStudioStore = class {
   appendSessionLog(input) {
     const session = this.sessions.get(input.sessionId);
     const logs = session?.logs ?? [];
-    const entry = compact({
+    const entry = {
       id: globalThis.crypto.randomUUID(),
       sessionId: input.sessionId,
-      runId: input.runId,
       sequence: logs.length,
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       level: input.level,
       category: input.category,
       event: input.event,
-      message: input.message,
-      metadata: input.metadata
-    });
+      message: input.message
+    };
+    if (input.runId !== void 0) entry.runId = input.runId;
+    if (input.metadata !== void 0) entry.metadata = input.metadata;
     if (session !== void 0) {
       session.logs.push(entry);
       session.updatedAt = entry.timestamp;
@@ -5270,7 +5291,7 @@ var InMemoryStudioStore = class {
     return this.sessions.delete(id);
   }
   listTraces(options) {
-    return [...this.traces.values()].filter((trace) => options.sessionId === void 0 || trace.sessionId === options.sessionId).filter((trace) => options.status === void 0 || trace.status === options.status).filter((trace) => options.agentId === void 0 || traceAgentId(trace) === options.agentId).sort((left, right) => Date.parse(right.startedAt) - Date.parse(left.startedAt)).slice(0, options.limit).map(traceSummary2);
+    return [...this.traces.values()].filter((trace) => options.sessionId === void 0 || trace.sessionId === options.sessionId).filter((trace) => options.status === void 0 || trace.status === options.status).filter((trace) => options.agentId === void 0 || traceAgentId(trace) === options.agentId).sort((left, right) => Date.parse(right.startedAt) - Date.parse(left.startedAt)).slice(0, options.limit).map(traceSummary);
   }
   listSessionTraces(options) {
     return this.listTraces({ sessionId: options.sessionId, limit: options.limit });
@@ -5284,18 +5305,18 @@ var InMemoryStudioStore = class {
   }
   appendPipelineLog(input) {
     const logs = this.pipelineLogs.get(input.pipelineId) ?? [];
-    const entry = compact({
+    const entry = {
       id: globalThis.crypto.randomUUID(),
       pipelineId: input.pipelineId,
-      runId: input.runId,
       sequence: logs.length,
       timestamp: (/* @__PURE__ */ new Date()).toISOString(),
       level: input.level,
       category: input.category,
       event: input.event,
-      message: input.message,
-      metadata: input.metadata
-    });
+      message: input.message
+    };
+    if (input.runId !== void 0) entry.runId = input.runId;
+    if (input.metadata !== void 0) entry.metadata = input.metadata;
     this.pipelineLogs.set(input.pipelineId, [...logs, entry]);
     return entry;
   }
@@ -5303,18 +5324,18 @@ var InMemoryStudioStore = class {
     return (this.pipelineLogs.get(options.pipelineId) ?? []).filter((log) => options.after === void 0 || log.sequence > options.after).slice(0, options.limit);
   }
   savePipelineRun(input) {
-    const record = compact({
+    const record = {
       runId: input.runId,
       pipelineId: input.pipelineId,
       status: input.status,
       input: input.input,
-      output: input.output,
-      error: input.error,
-      metadata: input.metadata,
-      startedAt: input.startedAt,
-      endedAt: input.endedAt,
-      durationMs: input.durationMs
-    });
+      startedAt: input.startedAt
+    };
+    if (input.output !== void 0) record.output = input.output;
+    if (input.error !== void 0) record.error = input.error;
+    if (input.metadata !== void 0) record.metadata = input.metadata;
+    if (input.endedAt !== void 0) record.endedAt = input.endedAt;
+    if (input.durationMs !== void 0) record.durationMs = input.durationMs;
     this.pipelineRuns.set(input.runId, record);
     return record;
   }
@@ -5327,15 +5348,16 @@ var InMemoryStudioStore = class {
   }
 };
 function sessionSummary(session) {
-  return compact({
+  const summary = {
     id: session.id,
     agentId: session.agentId,
-    title: session.title,
     createdAt: session.createdAt,
     updatedAt: session.updatedAt,
-    messageCount: session.messages.length,
-    metadata: session.metadata
-  });
+    messageCount: session.messages.length
+  };
+  if (session.title !== void 0) summary.title = session.title;
+  if (session.metadata !== void 0) summary.metadata = session.metadata;
+  return summary;
 }
 function materializeSession(session) {
   return {
@@ -5344,25 +5366,9 @@ function materializeSession(session) {
     transcript: renumberTranscript(session.runs.flatMap((run) => run.transcript))
   };
 }
-function traceSummary2(trace) {
-  return compact({
-    id: trace.id,
-    sessionId: trace.sessionId,
-    name: trace.name,
-    status: trace.status,
-    startedAt: trace.startedAt,
-    endedAt: trace.endedAt,
-    durationMs: trace.durationMs,
-    output: trace.output,
-    error: trace.error,
-    usage: trace.usage,
-    metadata: trace.metadata,
-    observationCount: trace.observations.length
-  });
-}
 function traceAgentId(trace) {
   const nestedMetadata = trace.metadata?.metadata;
-  return isJsonObject2(nestedMetadata) && typeof nestedMetadata.agentId === "string" ? nestedMetadata.agentId : void 0;
+  return isJsonObject(nestedMetadata) && typeof nestedMetadata.agentId === "string" ? nestedMetadata.agentId : void 0;
 }
 function studioRunId(context) {
   const value = context.metadata?.studioRunId;
@@ -5375,19 +5381,7 @@ function serializeJsonError(error) {
       message: error.message
     };
   }
-  return isJsonValue3(error) ? error : String(error);
-}
-function isJsonObject2(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-function isJsonValue3(value) {
-  if (value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
-    return true;
-  }
-  if (Array.isArray(value)) {
-    return value.every(isJsonValue3);
-  }
-  return isJsonObject2(value) && Object.values(value).every(isJsonValue3);
+  return isJsonValue(error) ? error : String(error);
 }
 
 // src/runtime/shared.ts
@@ -5397,12 +5391,12 @@ function resolveStores(options) {
   const traces = resolveTraceStore(options, sessions, defaultStore);
   const pipelineLogs = resolvePipelineLogStore(options, sessions, defaultStore);
   const pipelineRuns = resolvePipelineRunStore(options, sessions, pipelineLogs, defaultStore);
-  return compact({
-    sessions,
-    traces,
-    pipelineLogs,
-    pipelineRuns
-  });
+  const stores = {};
+  if (sessions !== void 0) stores.sessions = sessions;
+  if (traces !== void 0) stores.traces = traces;
+  if (pipelineLogs !== void 0) stores.pipelineLogs = pipelineLogs;
+  if (pipelineRuns !== void 0) stores.pipelineRuns = pipelineRuns;
+  return stores;
 }
 function defaultStudioStore() {
   return createInMemoryStudioStore();
@@ -5499,35 +5493,38 @@ function normalizePipelines(pipelines) {
 // src/runtime/status.ts
 function registerStatusRoutes(app, props) {
   app.get("/status", async (c) => {
+    const runner = { id: runnerId(props.options) };
+    if (props.options.name !== void 0) runner.name = props.options.name;
+    if (props.options.version !== void 0) runner.version = props.options.version;
+    const storage = {};
+    if (props.stores.sessions?.kind !== void 0) storage.sessions = props.stores.sessions.kind;
+    if (props.stores.traces?.kind !== void 0) storage.traces = props.stores.traces.kind;
+    if (props.stores.pipelineLogs !== void 0) storage.pipelineLogs = "available";
+    if (props.stores.pipelineRuns !== void 0) storage.pipelineRuns = "available";
+    const counts = {
+      agents: props.agents.length,
+      pipelines: props.pipelines.length
+    };
+    if (props.stores.sessions !== void 0) {
+      counts.sessions = (await props.stores.sessions.listSessions({ limit: 100 })).length;
+    }
+    if (props.stores.traces?.listTraces !== void 0) {
+      counts.traces = (await props.stores.traces.listTraces({ limit: 100 })).length;
+    }
+    if (props.stores.pipelineRuns !== void 0 && props.pipelines.length > 0) {
+      counts.pipelineRuns = (await Promise.all(
+        props.pipelines.map(
+          (pipeline) => props.stores.pipelineRuns?.listPipelineRuns({
+            pipelineId: pipeline.id,
+            limit: 100
+          })
+        )
+      )).reduce((sum, runs) => sum + (runs?.length ?? 0), 0);
+    }
     const summary = {
-      runner: {
-        id: runnerId(props.options),
-        ...compact({ name: props.options.name, version: props.options.version })
-      },
-      storage: {
-        ...compact({
-          sessions: props.stores.sessions?.kind,
-          traces: props.stores.traces?.kind,
-          pipelineLogs: props.stores.pipelineLogs !== void 0 ? "available" : void 0,
-          pipelineRuns: props.stores.pipelineRuns !== void 0 ? "available" : void 0
-        })
-      },
-      counts: {
-        agents: props.agents.length,
-        pipelines: props.pipelines.length,
-        ...compact({
-          sessions: props.stores.sessions !== void 0 ? (await props.stores.sessions.listSessions({ limit: 100 })).length : void 0,
-          traces: props.stores.traces?.listTraces !== void 0 ? (await props.stores.traces.listTraces({ limit: 100 })).length : void 0,
-          pipelineRuns: props.stores.pipelineRuns !== void 0 && props.pipelines.length > 0 ? (await Promise.all(
-            props.pipelines.map(
-              (pipeline) => props.stores.pipelineRuns?.listPipelineRuns({
-                pipelineId: pipeline.id,
-                limit: 100
-              })
-            )
-          )).reduce((sum, runs) => sum + (runs?.length ?? 0), 0) : void 0
-        })
-      },
+      runner,
+      storage,
+      counts,
       capabilities: capabilityConfig(props.options, props.agents, props.pipelines, props.stores),
       generatedAt: (/* @__PURE__ */ new Date()).toISOString()
     };
@@ -5637,15 +5634,16 @@ async function agentToolMetadata(agent) {
     seen.add(key);
     const definition = await tool.definition("");
     const serverName = mcpServerName(tool);
-    metadata.push({
+    const item = {
       agentId: agent.id,
       name: definition.name,
       description: definition.description,
       parameters: definition.parameters,
       source,
-      ...serverName === void 0 ? {} : { mcpServerName: serverName },
       approval: approvalMetadata(tool)
-    });
+    };
+    if (serverName !== void 0) item.mcpServerName = serverName;
+    metadata.push(item);
   }
   return metadata.sort((left, right) => {
     if (left.source !== right.source) {
@@ -5677,10 +5675,11 @@ function registerTraceRoutes(app, traceStore) {
     }
     const agentId = optionalQueryString(c.req.query("agentId"));
     const sessionId = optionalQueryString(c.req.query("sessionId"));
-    const traces = await traceStore.listTraces({
-      limit,
-      ...compact({ agentId, sessionId, status })
-    });
+    const input = { limit };
+    if (agentId !== void 0) input.agentId = agentId;
+    if (sessionId !== void 0) input.sessionId = sessionId;
+    if (status !== void 0) input.status = status;
+    const traces = await traceStore.listTraces(input);
     if (c.req.query("include") === "detail") {
       const detailed = await Promise.all(
         traces.map((trace) => Promise.resolve(traceStore.getTrace(trace.id)))
@@ -5726,11 +5725,12 @@ var Studio = class {
     this.close();
     this.studio = createStudioApp(this.options);
     const port = serveOptions.port ?? Number(process.env.RUNNER_PORT ?? 4021);
-    this.server = serve({
+    const serverOptions = {
       fetch: (request) => this.fetch(request),
-      ...compact({ hostname: serveOptions.hostname }),
       port
-    });
+    };
+    if (serveOptions.hostname !== void 0) serverOptions.hostname = serveOptions.hostname;
+    this.server = serve(serverOptions);
     const log = serveOptions.log ?? true;
     if (log) {
       const host = serveOptions.hostname ?? "localhost";
@@ -5764,14 +5764,15 @@ function studioOptionsFromTargets(targets, options) {
     // biome-ignore lint/suspicious/noExplicitAny: Studio accepts heterogeneous user pipelines.
     (target) => target instanceof Pipeline
   );
-  return {
+  const runtimeOptions = {
     agents: inferStudioAgents(agents, options.quickPrompts ?? {}),
     pipelines: inferStudioPipelines(pipelines),
-    evals: options.evals ?? [],
-    ...compact({ models: options.models }),
-    ...compact({ stores: options.stores }),
-    ...compact({ ui: options.ui })
+    evals: options.evals ?? []
   };
+  if (options.models !== void 0) runtimeOptions.models = options.models;
+  if (options.stores !== void 0) runtimeOptions.stores = options.stores;
+  if (options.ui !== void 0) runtimeOptions.ui = options.ui;
+  return runtimeOptions;
 }
 function inferStudioAgents(agents, quickPrompts) {
   const ids = /* @__PURE__ */ new Set();
@@ -5789,13 +5790,14 @@ function inferStudioPipelines(pipelines) {
   const ids = /* @__PURE__ */ new Set();
   return pipelines.map((pipeline) => {
     const id = uniqueAgentId(pipeline.id || "pipeline", ids);
-    return {
+    const studioPipeline = {
       id,
-      pipeline,
-      ...compact({ name: pipeline.name }),
-      ...compact({ description: pipeline.description }),
-      ...compact({ metadata: pipeline.metadata })
+      pipeline
     };
+    if (pipeline.name !== void 0) studioPipeline.name = pipeline.name;
+    if (pipeline.description !== void 0) studioPipeline.description = pipeline.description;
+    if (pipeline.metadata !== void 0) studioPipeline.metadata = pipeline.metadata;
+    return studioPipeline;
   });
 }
 function uniqueAgentId(baseId, ids) {
@@ -5809,8 +5811,7 @@ function uniqueAgentId(baseId, ids) {
   return id;
 }
 function agentMetadata(agent) {
-  return {
-    ...compact({ defaultMaxTurns: agent.defaultMaxTurns }),
+  const metadata = {
     staticContextCount: agent.staticContext.length,
     dynamicContextCount: agent.dynamicContexts.length,
     dynamicToolCount: agent.dynamicTools.length,
@@ -5819,6 +5820,8 @@ function agentMetadata(agent) {
     observerCount: agent.observers.length,
     approvalToolCount: agent.toolSet.values().filter((tool) => tool.approval !== void 0).length
   };
+  if (agent.defaultMaxTurns !== void 0) metadata.defaultMaxTurns = agent.defaultMaxTurns;
+  return metadata;
 }
 function createStudioApp(options) {
   const observabilityHub = new StudioObservabilityHub();
@@ -5879,16 +5882,16 @@ function createStudioApp(options) {
     evals: options.evals,
     evalMap
   });
-  registerKnowledgeRoutes(app, {
-    agents,
-    ...compact({ traceStore: stores.traces })
-  });
-  registerPipelineRoutes(app, {
+  const knowledgeOptions = { agents };
+  if (stores.traces !== void 0) knowledgeOptions.traceStore = stores.traces;
+  registerKnowledgeRoutes(app, knowledgeOptions);
+  const pipelineOptions = {
     pipelines,
-    pipelineMap,
-    ...compact({ logStore: stores.pipelineLogs }),
-    ...compact({ runStore: stores.pipelineRuns })
-  });
+    pipelineMap
+  };
+  if (stores.pipelineLogs !== void 0) pipelineOptions.logStore = stores.pipelineLogs;
+  if (stores.pipelineRuns !== void 0) pipelineOptions.runStore = stores.pipelineRuns;
+  registerPipelineRoutes(app, pipelineOptions);
   registerAgentRunRoute(app, {
     agentMap,
     stores,
@@ -5900,11 +5903,12 @@ function createStudioApp(options) {
     registerMemoryRoutes(app, {
       sessionStore: stores.sessions
     });
-    registerSessionRoutes(app, {
+    const sessionOptions = {
       agentMap,
-      sessionStore: stores.sessions,
-      ...compact({ traceStore: stores.traces })
-    });
+      sessionStore: stores.sessions
+    };
+    if (stores.traces !== void 0) sessionOptions.traceStore = stores.traces;
+    registerSessionRoutes(app, sessionOptions);
   }
   if (stores.traces !== void 0) {
     registerTraceRoutes(app, stores.traces);
@@ -5913,7 +5917,7 @@ function createStudioApp(options) {
     app.all(`/${capability}`, (c) => unsupportedCapability(c, capability));
     app.all(`/${capability}/*`, (c) => unsupportedCapability(c, capability));
   }
-  return {
+  const studio = {
     app,
     fetch(request) {
       return app.fetch(request);
@@ -5922,10 +5926,11 @@ function createStudioApp(options) {
       return buildConfig(options, agents, pipelines, stores);
     },
     close() {
-    },
-    ...compact({ sessionStore: stores.sessions }),
-    ...compact({ traceStore: stores.traces })
+    }
   };
+  if (stores.sessions !== void 0) Object.assign(studio, { sessionStore: stores.sessions });
+  if (stores.traces !== void 0) Object.assign(studio, { traceStore: stores.traces });
+  return studio;
 }
 function withStudioTraceObserver(studioAgent, traceStore) {
   if (traceStore === void 0 || hasStudioTraceObserver(studioAgent.agent)) {
@@ -5951,6 +5956,7 @@ function hasStudioTraceObserver(agent) {
 import { mkdirSync } from "fs";
 import { createRequire } from "module";
 import { dirname, resolve } from "path";
+import { isJsonValue as isJsonValue2 } from "@anvia/core/completion";
 var DatabaseSync;
 function createSqliteSessionStore(options = {}) {
   return new SqliteSessionStore(options.path ?? ":memory:");
@@ -5999,15 +6005,16 @@ var SqliteSessionStore = class {
       $metadata: input.metadata === void 0 ? null : JSON.stringify(input.metadata),
       $now: now
     });
-    return {
+    const session = {
       id: input.id,
       agentId: input.agentId,
-      ...compact({ title: input.title }),
       createdAt: now,
       updatedAt: now,
-      messageCount: 0,
-      ...compact({ metadata: input.metadata })
+      messageCount: 0
     };
+    if (input.title !== void 0) session.title = input.title;
+    if (input.metadata !== void 0) session.metadata = input.metadata;
+    return session;
   }
   getSession(id) {
     const row = this.getSessionRow(id);
@@ -6192,15 +6199,15 @@ var SqliteSessionStore = class {
       const entry = {
         id: globalThis.crypto.randomUUID(),
         sessionId: input.sessionId,
-        ...compact({ runId: input.runId }),
         sequence,
         timestamp: now,
         level: input.level,
         category: input.category,
         event: input.event,
-        message: input.message,
-        ...compact({ metadata: input.metadata })
+        message: input.message
       };
+      if (input.runId !== void 0) entry.runId = input.runId;
+      if (input.metadata !== void 0) entry.metadata = input.metadata;
       db.prepare(
         `INSERT INTO anvia_studio_session_logs (
           id,
@@ -6273,15 +6280,15 @@ var SqliteSessionStore = class {
       const entry = {
         id: globalThis.crypto.randomUUID(),
         pipelineId: input.pipelineId,
-        ...compact({ runId: input.runId }),
         sequence,
         timestamp: now,
         level: input.level,
         category: input.category,
         event: input.event,
-        message: input.message,
-        ...compact({ metadata: input.metadata })
+        message: input.message
       };
+      if (input.runId !== void 0) entry.runId = input.runId;
+      if (input.metadata !== void 0) entry.metadata = input.metadata;
       db.prepare(
         `INSERT INTO anvia_studio_pipeline_logs (
           id,
@@ -6393,18 +6400,19 @@ var SqliteSessionStore = class {
       $endedAt: input.endedAt ?? null,
       $durationMs: input.durationMs ?? null
     });
-    return {
+    const record = {
       runId: input.runId,
       pipelineId: input.pipelineId,
       status: input.status,
       input: input.input,
-      ...compact({ output: input.output }),
-      ...compact({ error: input.error }),
-      ...compact({ metadata: input.metadata }),
-      startedAt: input.startedAt,
-      ...compact({ endedAt: input.endedAt }),
-      ...compact({ durationMs: input.durationMs })
+      startedAt: input.startedAt
     };
+    if (input.output !== void 0) record.output = input.output;
+    if (input.error !== void 0) record.error = input.error;
+    if (input.metadata !== void 0) record.metadata = input.metadata;
+    if (input.endedAt !== void 0) record.endedAt = input.endedAt;
+    if (input.durationMs !== void 0) record.durationMs = input.durationMs;
+    return record;
   }
   getPipelineRun(options) {
     const db = this.database();
@@ -6607,6 +6615,7 @@ var SqliteSessionStore = class {
         message_index INTEGER NOT NULL,
         role TEXT NOT NULL,
         message_id TEXT,
+        metadata_json TEXT,
         created_at TEXT NOT NULL,
         PRIMARY KEY(session_id, message_index),
         FOREIGN KEY(session_id) REFERENCES anvia_studio_sessions(id) ON DELETE CASCADE
@@ -6701,6 +6710,7 @@ var SqliteSessionStore = class {
       CREATE INDEX IF NOT EXISTS anvia_studio_traces_session_started_idx
         ON anvia_studio_traces(session_id, started_at DESC);
     `);
+    ensureMessageMetadataColumn(db);
     this.db = db;
     return db;
   }
@@ -6745,7 +6755,7 @@ var SqliteSessionStore = class {
   listSessionMessages(sessionId) {
     const db = this.database();
     const messageRows = db.prepare(
-      `SELECT session_id, message_index, role, message_id, created_at
+      `SELECT session_id, message_index, role, message_id, metadata_json, created_at
          FROM anvia_studio_session_messages
          WHERE session_id = $sessionId
          ORDER BY message_index ASC`
@@ -6785,8 +6795,9 @@ var SqliteSessionStore = class {
         message_index,
         role,
         message_id,
+        metadata_json,
         created_at
-      ) VALUES ($sessionId, $messageIndex, $role, $messageId, $createdAt)`
+      ) VALUES ($sessionId, $messageIndex, $role, $messageId, $metadata, $createdAt)`
     );
     const insertPart = db.prepare(
       `INSERT INTO anvia_studio_session_message_parts (
@@ -6799,11 +6810,15 @@ var SqliteSessionStore = class {
     );
     messages.forEach((message, messageOffset) => {
       const messageIndex = startIndex + messageOffset;
+      if (message.metadata !== void 0 && !isJsonValue2(message.metadata)) {
+        throw new TypeError("Studio message metadata must be a strict JSON value.");
+      }
       insertMessage.run({
         $sessionId: sessionId,
         $messageIndex: messageIndex,
         $role: message.role,
         $messageId: message.role === "assistant" ? message.id ?? null : null,
+        $metadata: message.metadata === void 0 ? null : JSON.stringify(message.metadata),
         $createdAt: createdAt
       });
       messageParts(message).forEach((part, partIndex) => {
@@ -6831,62 +6846,66 @@ function toSession(row, messages, runRows = []) {
 }
 function toSessionSummary(row) {
   const metadata = parseJsonValue(row.metadata_json);
-  return {
+  const summary = {
     id: row.id,
     agentId: row.agent_id,
-    ...compact({ title: row.title ?? void 0 }),
     createdAt: row.created_at,
     updatedAt: row.updated_at,
-    messageCount: row.message_count,
-    ...compact({ metadata })
+    messageCount: row.message_count
   };
+  if (row.title !== null) summary.title = row.title;
+  if (metadata !== void 0) summary.metadata = metadata;
+  return summary;
 }
 function toSessionLog(row) {
   const metadata = parseJsonValue(row.metadata_json);
-  return {
+  const entry = {
     id: row.id,
     sessionId: row.session_id,
-    ...compact({ runId: row.run_id ?? void 0 }),
     sequence: row.sequence,
     timestamp: row.timestamp,
     level: row.level,
     category: row.category,
     event: row.event,
-    message: row.message,
-    ...compact({ metadata })
+    message: row.message
   };
+  if (row.run_id !== null) entry.runId = row.run_id;
+  if (metadata !== void 0) entry.metadata = metadata;
+  return entry;
 }
 function toPipelineLog(row) {
   const metadata = parseJsonValue(row.metadata_json);
-  return {
+  const entry = {
     id: row.id,
     pipelineId: row.pipeline_id,
-    ...compact({ runId: row.run_id ?? void 0 }),
     sequence: row.sequence,
     timestamp: row.timestamp,
     level: row.level,
     category: row.category,
     event: row.event,
-    message: row.message,
-    ...compact({ metadata })
+    message: row.message
   };
+  if (row.run_id !== null) entry.runId = row.run_id;
+  if (metadata !== void 0) entry.metadata = metadata;
+  return entry;
 }
 function toPipelineRun(row) {
   const output = parseJsonValue(row.output_json);
   const error = parseJsonValue(row.error_json);
   const metadata = parseJsonValue(row.metadata_json);
-  return {
+  const record = {
     runId: row.run_id,
     pipelineId: row.pipeline_id,
     status: row.status,
     input: JSON.parse(row.input_json),
-    ...compact({ output }),
-    ...compact({ error }),
-    ...compact({ metadata }),
-    startedAt: row.started_at,
-    ...compact({ endedAt: row.ended_at ?? void 0 }),
-    ...compact({ durationMs: row.duration_ms ?? void 0 })
+    startedAt: row.started_at
   };
+  if (output !== void 0) record.output = output;
+  if (error !== void 0) record.error = error;
+  if (metadata !== void 0) record.metadata = metadata;
+  if (row.ended_at !== null) record.endedAt = row.ended_at;
+  if (row.duration_ms !== null) record.durationMs = row.duration_ms;
+  return record;
 }
 function messageParts(message) {
   if (message.role === "system") {
@@ -6899,27 +6918,42 @@ 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 (row.role === "system") {
-    return { role: "system", content: systemContentFromParts(parts) };
+    const message = {
+      role: "system",
+      content: systemContentFromParts(parts)
+    };
+    if (metadata !== void 0) message.metadata = metadata;
+    return message;
   }
   if (row.role === "user") {
-    return {
+    const message = {
       role: "user",
       content: parts
     };
+    if (metadata !== void 0) message.metadata = metadata;
+    return message;
   }
   if (row.role === "assistant") {
-    return {
+    const message = {
       role: "assistant",
-      ...compact({ id: row.message_id ?? void 0 }),
       content: parts
     };
+    if (row.message_id !== null) message.id = row.message_id;
+    if (metadata !== void 0) message.metadata = metadata;
+    return message;
   }
   if (row.role === "tool") {
-    return {
+    const message = {
       role: "tool",
       content: parts
     };
+    if (metadata !== void 0) message.metadata = metadata;
+    return message;
   }
   throw new Error(`Unsupported stored message role: ${row.role}`);
 }
@@ -6938,6 +6972,12 @@ function guardAgainstLegacySessionSchema(db) {
     );
   }
 }
+function ensureMessageMetadataColumn(db) {
+  const columns = db.prepare("PRAGMA table_info('anvia_studio_session_messages')").all();
+  if (!columns.some((column) => column.name === "metadata_json")) {
+    db.exec("ALTER TABLE anvia_studio_session_messages ADD COLUMN metadata_json TEXT");
+  }
+}
 function loadDatabaseSync() {
   if (DatabaseSync !== void 0) {
     return DatabaseSync;
@@ -6957,32 +6997,34 @@ function loadDatabaseSync() {
 function toTrace(row) {
   const trace = parseJsonValue(row.trace_json);
   const input = parseJsonValue(row.input_json);
-  return {
+  const result = {
     ...toTraceSummary(row),
-    ...compact({ trace }),
-    ...compact({ input }),
     observations: parseJsonArray(row.observations_json)
   };
+  if (trace !== void 0) result.trace = trace;
+  if (input !== void 0) result.input = input;
+  return result;
 }
 function toTraceSummary(row) {
   const observations = parseJsonArray(row.observations_json);
   const error = parseJsonValue(row.error_json);
   const usage = parseJsonValue(row.usage_json);
   const metadata = parseJsonValue(row.metadata_json);
-  return {
+  const summary = {
     id: row.id,
     sessionId: row.session_id,
-    ...compact({ name: row.name ?? void 0 }),
     status: row.status,
     startedAt: row.started_at,
-    ...compact({ endedAt: row.ended_at ?? void 0 }),
-    ...compact({ durationMs: row.duration_ms ?? void 0 }),
-    ...compact({ output: row.output ?? void 0 }),
-    ...compact({ error }),
-    ...compact({ usage }),
-    ...compact({ metadata }),
     observationCount: observations.length
   };
+  if (row.name !== null) summary.name = row.name;
+  if (row.ended_at !== null) summary.endedAt = row.ended_at;
+  if (row.duration_ms !== null) summary.durationMs = row.duration_ms;
+  if (row.output !== null) summary.output = row.output;
+  if (error !== void 0) summary.error = error;
+  if (usage !== void 0) summary.usage = usage;
+  if (metadata !== void 0) summary.metadata = metadata;
+  return summary;
 }
 function parseJsonArray(value) {
   const parsed = JSON.parse(value);
@@ -7010,29 +7052,11 @@ function serializeJsonError2(error) {
   }
   return String(error);
 }
-
-// src/types.ts
-function traceSummary3(trace) {
-  return compact({
-    id: trace.id,
-    sessionId: trace.sessionId,
-    name: trace.name,
-    status: trace.status,
-    startedAt: trace.startedAt,
-    endedAt: trace.endedAt,
-    durationMs: trace.durationMs,
-    output: trace.output,
-    error: trace.error,
-    usage: trace.usage,
-    metadata: trace.metadata,
-    observationCount: trace.observations.length
-  });
-}
 export {
   Studio,
   StudioTraceObserver,
   createInMemoryStudioStore,
   createSqliteSessionStore,
-  traceSummary3 as traceSummary
+  traceSummary
 };
 //# sourceMappingURL=index.js.map