@anvia/studio 0.1.0 → 0.1.2

package/dist/index.js

@@ -1,7 +1,9 @@
 // src/runtime/studio.ts
 import {
   Agent,
-  createHook as createHook3
+  createHook as createHook3,
+  Message,
+  resolveMemoryOptions
 } from "@anvia/core";
 import { serve } from "@hono/node-server";
 import { Hono as HonoApp } from "hono";
@@ -77,34 +79,38 @@ var StudioRunTraceObserver = class {
   }
   startTool(args) {
     const startedAt = /* @__PURE__ */ new Date();
+    const childTrace = new ChildAgentToolTraceAccumulator(args);
     return {
+      streamEvent: (streamArgs) => {
+        childTrace.accept(streamArgs);
+      },
       end: (endArgs) => {
-        this.observations.push(
-          traceObservation({
-            kind: "tool",
-            name: args.toolName,
-            status: "success",
-            turn: args.turn,
-            startedAt,
-            input: parseOrString(args.args),
-            output: parseOrString(endArgs.result),
-            metadata: toolMetadata(args, endArgs.skipped)
-          })
-        );
+        const parentObservation = traceObservation({
+          kind: "tool",
+          name: args.toolName,
+          status: "success",
+          turn: args.turn,
+          startedAt,
+          input: parseOrString(args.args),
+          output: parseOrString(endArgs.result),
+          metadata: toolMetadata(args, endArgs.skipped)
+        });
+        this.observations.push(parentObservation);
+        this.observations.push(...childTrace.observations(parentObservation.id));
       },
       error: (errorArgs) => {
-        this.observations.push(
-          traceObservation({
-            kind: "tool",
-            name: args.toolName,
-            status: "error",
-            turn: args.turn,
-            startedAt,
-            input: parseOrString(args.args),
-            error: serializeError(errorArgs.error),
-            metadata: toolMetadata(args, false)
-          })
-        );
+        const parentObservation = traceObservation({
+          kind: "tool",
+          name: args.toolName,
+          status: "error",
+          turn: args.turn,
+          startedAt,
+          input: parseOrString(args.args),
+          error: serializeError(errorArgs.error),
+          metadata: toolMetadata(args, false)
+        });
+        this.observations.push(parentObservation);
+        this.observations.push(...childTrace.observations(parentObservation.id));
       }
     };
   }
@@ -155,10 +161,191 @@ var StudioRunTraceObserver = class {
     await store.saveTrace(trace);
   }
 };
+var ChildAgentToolTraceAccumulator = class {
+  constructor(parent) {
+    this.parent = parent;
+  }
+  parent;
+  agentStarts = /* @__PURE__ */ new Map();
+  generationStarts = /* @__PURE__ */ new Map();
+  toolStarts = [];
+  completedObservations = [];
+  accept(args) {
+    const wrapper = args.event;
+    const child = isRecord(wrapper.event) ? wrapper.event : void 0;
+    if (child === void 0) {
+      return;
+    }
+    const agentId = wrapper.agentId;
+    const agentName = wrapper.agentName;
+    const childTurn = typeof child.turn === "number" ? child.turn : this.parent.turn;
+    if (!this.agentStarts.has(agentId)) {
+      this.agentStarts.set(agentId, {
+        startedAt: /* @__PURE__ */ new Date(),
+        agentId,
+        ...agentName === void 0 ? {} : { agentName }
+      });
+    }
+    if (child.type === "turn_start") {
+      this.generationStarts.set(generationKey(agentId, childTurn), {
+        startedAt: /* @__PURE__ */ new Date(),
+        input: toJsonValue({
+          prompt: child.prompt,
+          history: child.history
+        }),
+        agentId,
+        ...agentName === void 0 ? {} : { agentName },
+        childTurn
+      });
+      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(),
+          ...start?.input === void 0 ? {} : { input: start.input },
+          output: toJsonValue(child.response),
+          metadata: this.childMetadata(agentId, agentName, childTurn)
+        })
+      );
+      return;
+    }
+    if (child.type === "tool_call" && isRecord(child.toolCall)) {
+      const toolCall = child.toolCall;
+      const toolCallFunction = isRecord(toolCall.function) ? toolCall.function : void 0;
+      const toolName = typeof toolCallFunction?.name === "string" ? toolCallFunction.name : "tool";
+      const callId = typeof toolCall.callId === "string" ? toolCall.callId : typeof toolCall.id === "string" ? toolCall.id : void 0;
+      this.toolStarts.push({
+        startedAt: /* @__PURE__ */ new Date(),
+        agentId,
+        ...agentName === void 0 ? {} : { agentName },
+        childTurn,
+        toolName,
+        ...callId === void 0 ? {} : { toolCallId: callId },
+        input: toJsonValue(toolCallFunction?.arguments ?? {}),
+        completed: false
+      });
+      return;
+    }
+    if (child.type === "tool_result") {
+      const toolName = typeof child.toolName === "string" ? child.toolName : "tool";
+      const toolCallId = typeof child.toolCallId === "string" ? child.toolCallId : void 0;
+      const internalCallId = typeof child.internalCallId === "string" ? child.internalCallId : void 0;
+      const start = this.findToolStart(agentId, toolName, toolCallId);
+      const input = start?.input ?? (typeof child.args === "string" ? parseOrString(child.args) : void 0);
+      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(),
+          ...input === void 0 ? {} : { input },
+          ...typeof child.result === "string" ? { output: parseOrString(child.result) } : {},
+          metadata: {
+            ...this.childMetadata(agentId, agentName, childTurn),
+            ...toolCallId === void 0 ? {} : { toolCallId },
+            ...internalCallId === void 0 ? {} : { internalCallId }
+          }
+        })
+      );
+      return;
+    }
+    if (child.type === "error") {
+      this.completedObservations.push(
+        traceObservation({
+          kind: "tool",
+          name: `${agentLabel(agentId, agentName)}.error`,
+          status: "error",
+          turn: this.parent.turn,
+          startedAt: /* @__PURE__ */ new Date(),
+          error: serializeError(child.error),
+          metadata: this.childMetadata(agentId, agentName, childTurn)
+        })
+      );
+    }
+  }
+  observations(parentObservationId) {
+    const observations = [];
+    const agentObservationIds = /* @__PURE__ */ new Map();
+    for (const agentStart of this.agentStarts.values()) {
+      const agentChildren = this.completedObservations.filter(
+        (observation) => isRecord(observation.metadata) && observation.metadata.childAgentId === agentStart.agentId
+      );
+      const childStartTimes = agentChildren.map((observation) => Date.parse(observation.startedAt));
+      const childEndTimes = agentChildren.map(
+        (observation) => Date.parse(observation.endedAt ?? observation.startedAt)
+      );
+      const startedAt = childStartTimes.length === 0 ? agentStart.startedAt : new Date(Math.min(agentStart.startedAt.getTime(), ...childStartTimes));
+      const endedAt = childEndTimes.length === 0 ? /* @__PURE__ */ new Date() : new Date(Math.max(...childEndTimes));
+      const agentObservation = traceObservation({
+        parentObservationId,
+        kind: "agent",
+        name: `${agentLabel(agentStart.agentId, agentStart.agentName)}.run`,
+        status: agentChildren.some((observation) => observation.status === "error") ? "error" : "success",
+        turn: this.parent.turn,
+        startedAt,
+        endedAt,
+        metadata: this.childMetadata(agentStart.agentId, agentStart.agentName, this.parent.turn)
+      });
+      observations.push(agentObservation);
+      agentObservationIds.set(agentStart.agentId, agentObservation.id);
+    }
+    for (const observation of this.completedObservations) {
+      const childAgentId = isRecord(observation.metadata) ? stringValue(observation.metadata.childAgentId) : void 0;
+      const childAgentObservationId = childAgentId === void 0 ? void 0 : agentObservationIds.get(childAgentId);
+      observations.push({
+        ...observation,
+        parentObservationId: childAgentObservationId ?? parentObservationId
+      });
+    }
+    return observations;
+  }
+  findToolStart(agentId, toolName, toolCallId) {
+    for (let index = this.toolStarts.length - 1; index >= 0; index -= 1) {
+      const start = this.toolStarts[index];
+      if (start === void 0 || start.completed || start.agentId !== agentId || start.toolName !== toolName) {
+        continue;
+      }
+      if (toolCallId === void 0 || start.toolCallId === toolCallId) {
+        return start;
+      }
+    }
+    return void 0;
+  }
+  childMetadata(agentId, agentName, childTurn) {
+    return compactJsonObject({
+      source: "agent_tool_event",
+      childAgentId: agentId,
+      childAgentName: agentName,
+      childTurn,
+      parentToolName: this.parent.toolName,
+      parentInternalCallId: this.parent.internalCallId,
+      parentToolCallId: this.parent.toolCallId
+    });
+  }
+};
+function generationKey(agentId, turn) {
+  return `${agentId}:${turn}`;
+}
+function agentLabel(agentId, agentName) {
+  return (agentName ?? agentId).replaceAll(/\s+/g, "_");
+}
 function traceObservation(props) {
-  const endedAt = /* @__PURE__ */ new Date();
+  const endedAt = props.endedAt ?? /* @__PURE__ */ new Date();
   return {
     id: globalThis.crypto.randomUUID(),
+    ...props.parentObservationId === void 0 ? {} : { parentObservationId: props.parentObservationId },
     kind: props.kind,
     name: props.name,
     status: props.status,
@@ -207,6 +394,12 @@ function parseOrString(value) {
     return value;
   }
 }
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function stringValue(value) {
+  return typeof value === "string" ? value : void 0;
+}
 function serializeError(error) {
   if (error instanceof Error) {
     return compactJsonObject({
@@ -544,15 +737,14 @@ var SqliteSessionStore = class {
     };
   }
   getSession(id) {
-    const db = this.database();
-    const row = db.prepare(
-      `SELECT id, agent_id, title, metadata_json, messages_json, transcript_json, created_at, updated_at
-         FROM runner_sessions
-         WHERE id = $id`
-    ).get({ $id: id });
-    return row === void 0 ? void 0 : toSession(row);
+    const row = this.getSessionRow(id);
+    return row === void 0 ? void 0 : toSession(row, this.listSessionRunRows(id));
+  }
+  load(context) {
+    const session = this.getSession(context.sessionId);
+    return Promise.resolve(session?.messages ?? []);
   }
-  appendSessionRun(input) {
+  append(input) {
     const db = this.database();
     try {
       db.exec("BEGIN IMMEDIATE");
@@ -560,39 +752,132 @@ var SqliteSessionStore = class {
         `SELECT id, agent_id, title, metadata_json, messages_json, transcript_json, created_at, updated_at
            FROM runner_sessions
            WHERE id = $id`
-      ).get({ $id: input.id });
+      ).get({ $id: input.context.sessionId });
       if (row === void 0) {
         db.exec("ROLLBACK");
-        return void 0;
+        return Promise.resolve();
       }
       const current = toSession(row);
       const messages = [...current.messages, ...input.messages];
-      const transcript = renumberTranscript([...current.transcript, ...input.transcript]);
-      const title = current.title ?? input.title;
       const updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+      db.prepare(
+        `UPDATE runner_sessions
+         SET messages_json = $messages,
+             updated_at = $updatedAt
+         WHERE id = $id`
+      ).run({
+        $id: input.context.sessionId,
+        $messages: JSON.stringify(messages),
+        $updatedAt: updatedAt
+      });
+      db.exec("COMMIT");
+      return Promise.resolve();
+    } catch (error) {
+      if (db.isTransaction) {
+        db.exec("ROLLBACK");
+      }
+      throw error;
+    }
+  }
+  clear(context) {
+    const db = this.database();
+    const updatedAt = (/* @__PURE__ */ new Date()).toISOString();
+    try {
+      db.exec("BEGIN IMMEDIATE");
+      db.prepare(
+        `UPDATE runner_sessions
+         SET messages_json = '[]',
+             transcript_json = '[]',
+             updated_at = $updatedAt
+         WHERE id = $id`
+      ).run({
+        $id: context.sessionId,
+        $updatedAt: updatedAt
+      });
+      db.prepare("DELETE FROM runner_session_runs WHERE session_id = $id").run({
+        $id: context.sessionId
+      });
+      db.exec("COMMIT");
+      return Promise.resolve();
+    } catch (error) {
+      if (db.isTransaction) {
+        db.exec("ROLLBACK");
+      }
+      throw error;
+    }
+  }
+  async recordError(input) {
+    const runId = studioRunId(input.context) ?? input.runId;
+    const existing = this.getSessionRun(input.context.sessionId, runId);
+    const transcript = existing === void 0 || parseJsonArray(existing.transcript_json).length === 0 ? transcriptFromMessagesFallback(input.messages) : parseJsonArray(existing.transcript_json);
+    await this.saveSessionRunTranscript({
+      id: input.context.sessionId,
+      runId,
+      transcript,
+      status: "error",
+      error: serializeJsonError(input.error)
+    });
+  }
+  saveSessionRunTranscript(input) {
+    const db = this.database();
+    const now = (/* @__PURE__ */ new Date()).toISOString();
+    try {
+      db.exec("BEGIN IMMEDIATE");
+      const row = this.getSessionRow(input.id);
+      if (row === void 0) {
+        db.exec("ROLLBACK");
+        return void 0;
+      }
+      const current = toSession(row, this.listSessionRunRows(input.id));
+      const title = current.title ?? input.title;
+      db.prepare(
+        `INSERT INTO runner_session_runs (
+          run_id,
+          session_id,
+          status,
+          title,
+          transcript_json,
+          error_json,
+          created_at,
+          updated_at
+        ) VALUES (
+          $runId,
+          $sessionId,
+          $status,
+          $title,
+          $transcript,
+          $error,
+          $now,
+          $now
+        )
+        ON CONFLICT(run_id) DO UPDATE SET
+          status = excluded.status,
+          title = COALESCE(runner_session_runs.title, excluded.title),
+          transcript_json = excluded.transcript_json,
+          error_json = excluded.error_json,
+          updated_at = excluded.updated_at`
+      ).run({
+        $runId: input.runId,
+        $sessionId: input.id,
+        $status: input.status,
+        $title: input.title ?? null,
+        $transcript: JSON.stringify(renumberTranscript(input.transcript)),
+        $error: input.error === void 0 ? null : JSON.stringify(input.error),
+        $now: now
+      });
       db.prepare(
         `UPDATE runner_sessions
          SET title = $title,
-             messages_json = $messages,
-             transcript_json = $transcript,
              updated_at = $updatedAt
          WHERE id = $id`
       ).run({
         $id: input.id,
         $title: title ?? null,
-        $messages: JSON.stringify(messages),
-        $transcript: JSON.stringify(transcript),
-        $updatedAt: updatedAt
+        $updatedAt: now
       });
       db.exec("COMMIT");
-      return {
-        ...current,
-        ...title === void 0 ? {} : { title },
-        updatedAt,
-        messageCount: messages.length,
-        messages,
-        transcript
-      };
+      const updated = this.getSession(input.id);
+      return updated;
     } catch (error) {
       if (db.isTransaction) {
         db.exec("ROLLBACK");
@@ -605,6 +890,7 @@ var SqliteSessionStore = class {
     try {
       db.exec("BEGIN IMMEDIATE");
       db.prepare("DELETE FROM runner_traces WHERE session_id = $id").run({ $id: id });
+      db.prepare("DELETE FROM runner_session_runs WHERE session_id = $id").run({ $id: id });
       const result = db.prepare("DELETE FROM runner_sessions WHERE id = $id").run({ $id: id });
       db.exec("COMMIT");
       return Number(result.changes) > 0;
@@ -765,6 +1051,19 @@ var SqliteSessionStore = class {
       ) STRICT;
       CREATE INDEX IF NOT EXISTS runner_sessions_agent_updated_idx
         ON runner_sessions(agent_id, updated_at DESC);
+      CREATE TABLE IF NOT EXISTS runner_session_runs (
+        run_id TEXT PRIMARY KEY,
+        session_id TEXT NOT NULL,
+        status TEXT NOT NULL,
+        title TEXT,
+        transcript_json TEXT NOT NULL,
+        error_json TEXT,
+        created_at TEXT NOT NULL,
+        updated_at TEXT NOT NULL,
+        FOREIGN KEY(session_id) REFERENCES runner_sessions(id) ON DELETE CASCADE
+      ) STRICT;
+      CREATE INDEX IF NOT EXISTS runner_session_runs_session_created_idx
+        ON runner_session_runs(session_id, created_at ASC);
       CREATE TABLE IF NOT EXISTS runner_traces (
         id TEXT PRIMARY KEY,
         session_id TEXT NOT NULL,
@@ -787,13 +1086,39 @@ var SqliteSessionStore = class {
     this.db = db;
     return db;
   }
+  getSessionRow(id) {
+    return this.database().prepare(
+      `SELECT id, agent_id, title, metadata_json, messages_json, transcript_json, created_at, updated_at
+         FROM runner_sessions
+         WHERE id = $id`
+    ).get({ $id: id });
+  }
+  getSessionRun(sessionId, runId) {
+    return this.database().prepare(
+      `SELECT run_id, session_id, status, title, transcript_json, error_json, created_at, updated_at
+         FROM runner_session_runs
+         WHERE session_id = $sessionId AND run_id = $runId`
+    ).get({ $sessionId: sessionId, $runId: runId });
+  }
+  listSessionRunRows(sessionId) {
+    return this.database().prepare(
+      `SELECT run_id, session_id, status, title, transcript_json, error_json, created_at, updated_at
+         FROM runner_session_runs
+         WHERE session_id = $sessionId
+         ORDER BY created_at ASC`
+    ).all({ $sessionId: sessionId });
+  }
 };
-function toSession(row) {
+function toSession(row, runRows = []) {
   const summary = toSessionSummary(row);
+  const legacyTranscript = parseJsonArray(row.transcript_json);
+  const runTranscript = runRows.flatMap(
+    (runRow) => parseJsonArray(runRow.transcript_json)
+  );
   return {
     ...summary,
     messages: parseJsonArray(row.messages_json),
-    transcript: renumberTranscript(parseJsonArray(row.transcript_json))
+    transcript: renumberTranscript([...legacyTranscript, ...runTranscript])
   };
 }
 function toSessionSummary(row) {
@@ -852,6 +1177,96 @@ function parseJsonValue(value) {
 function renumberTranscript(entries) {
   return entries.map((entry, entryId) => ({ ...entry, entryId }));
 }
+function studioRunId(context) {
+  const value = context.metadata?.studioRunId;
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+function serializeJsonError(error) {
+  if (error instanceof Error) {
+    return {
+      name: error.name,
+      message: error.message
+    };
+  }
+  if (error === null || typeof error === "string" || typeof error === "number" || typeof error === "boolean") {
+    return error;
+  }
+  return String(error);
+}
+function transcriptFromMessagesFallback(messages) {
+  const transcript = [];
+  for (const message of messages) {
+    if (message.role === "system") {
+      continue;
+    }
+    if (message.role === "user") {
+      for (const content of message.content) {
+        if (content.type === "text") {
+          transcript.push({
+            entryId: transcript.length,
+            kind: "message",
+            role: "user",
+            text: content.text
+          });
+        }
+      }
+      continue;
+    }
+    if (message.role === "tool") {
+      for (const content of message.content) {
+        transcript.push({
+          entryId: transcript.length,
+          kind: "tool",
+          toolName: "tool_result",
+          callId: content.callId ?? content.id,
+          result: content.content.map((item) => "text" in item ? item.text : "[image]").join("\n")
+        });
+      }
+      continue;
+    }
+    for (const content of message.content) {
+      if (content.type === "text") {
+        appendAssistantTranscriptText(transcript, content.text);
+      } else if (content.type === "reasoning") {
+        transcript.push({
+          entryId: transcript.length,
+          kind: "reasoning",
+          ...content.id === void 0 ? {} : { reasoningId: content.id },
+          text: content.text
+        });
+      } else if (content.type === "tool_call") {
+        transcript.push({
+          entryId: transcript.length,
+          kind: "tool",
+          toolName: content.function.name,
+          callId: content.callId ?? content.id,
+          args: formatJson(content.function.arguments)
+        });
+      }
+    }
+  }
+  return transcript;
+}
+function appendAssistantTranscriptText(transcript, text) {
+  const last = transcript.at(-1);
+  if (last?.kind === "message" && last.role === "assistant") {
+    last.text = `${last.text}${text}`;
+    return;
+  }
+  transcript.push({
+    entryId: transcript.length,
+    kind: "message",
+    role: "assistant",
+    text
+  });
+}
+function formatJson(value) {
+  try {
+    return JSON.stringify(value, null, 2);
+  } catch {
+    return String(value);
+  }
+}
 
 // src/runtime/shared.ts
 function resolveStores(options) {
@@ -1369,7 +1784,7 @@ async function recentKnowledgeEvidence(traceStore, limit) {
 }
 function evidenceFromTrace(trace) {
   return trace.observations.flatMap((observation) => {
-    if (observation.kind !== "generation" || !isRecord(observation.input)) {
+    if (observation.kind !== "generation" || !isRecord2(observation.input)) {
       return [];
     }
     const documents = Array.isArray(observation.input.documents) ? observation.input.documents.flatMap((document) => evidenceDocument(document)) : [];
@@ -1422,7 +1837,7 @@ function messageText(value) {
   if (typeof value === "string") {
     return value.trim();
   }
-  if (!isRecord(value)) {
+  if (!isRecord2(value)) {
     return "";
   }
   if (typeof value.text === "string") {
@@ -1440,7 +1855,7 @@ function contentText(value) {
   if (typeof value === "string") {
     return value.trim();
   }
-  if (!isRecord(value)) {
+  if (!isRecord2(value)) {
     return "";
   }
   if (typeof value.text === "string") {
@@ -1449,12 +1864,12 @@ function contentText(value) {
   return "";
 }
 function evidenceDocument(value) {
-  if (!isRecord(value)) {
+  if (!isRecord2(value)) {
     return [];
   }
   const id = typeof value.id === "string" ? value.id : void 0;
   const text = typeof value.text === "string" ? value.text : void 0;
-  const additionalProps = isRecord(value.additionalProps) ? jsonObjectFromRecord(value.additionalProps) : void 0;
+  const additionalProps = isRecord2(value.additionalProps) ? jsonObjectFromRecord(value.additionalProps) : void 0;
   if (id === void 0 && text === void 0 && additionalProps === void 0) {
     return [];
   }
@@ -1467,7 +1882,7 @@ function evidenceDocument(value) {
   ];
 }
 function evidenceToolName(value) {
-  if (!isRecord(value) || typeof value.name !== "string") {
+  if (!isRecord2(value) || typeof value.name !== "string") {
     return [];
   }
   return [value.name];
@@ -1475,7 +1890,7 @@ function evidenceToolName(value) {
 function jsonObjectFromRecord(value) {
   return compactJsonObject2(value);
 }
-function isRecord(value) {
+function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
@@ -1823,22 +2238,42 @@ function traceForRun(trace, agentId, session) {
     ...trace?.sessionId !== void 0 ? { sessionId: trace.sessionId } : session === void 0 ? {} : { sessionId: session.id }
   };
 }
-async function* persistStreamingSessionRun(props) {
+async function* persistStreamingSessionTranscript(props) {
   const transcript = [messageToTranscriptEntry(props.message, 0)];
-  for await (const event of props.stream) {
-    acceptTranscriptStreamEvent(transcript, event);
-    if (event.type === "final") {
-      const nextSession = await props.store.appendSessionRun({
+  const title = optionalTitle(props.message);
+  await props.store.saveSessionRunTranscript({
+    id: props.session.id,
+    runId: props.runId,
+    ...title,
+    transcript,
+    status: "running"
+  });
+  try {
+    for await (const event of props.stream) {
+      acceptTranscriptStreamEvent(transcript, event);
+      const nextSession = await props.store.saveSessionRunTranscript({
         id: props.session.id,
-        ...optionalTitle(props.message),
-        messages: event.messages,
-        transcript
+        runId: props.runId,
+        ...title,
+        transcript,
+        status: event.type === "final" ? "success" : event.type === "error" ? "error" : "running",
+        ...event.type === "error" ? { error: serializeError2(event.error) } : {}
       });
       if (nextSession === void 0) {
         throw new Error("Session not found");
       }
+      yield event;
     }
-    yield event;
+  } catch (error) {
+    await props.store.saveSessionRunTranscript({
+      id: props.session.id,
+      runId: props.runId,
+      ...title,
+      transcript,
+      status: "error",
+      error: serializeError2(error)
+    });
+    throw error;
   }
 }
 function acceptTranscriptStreamEvent(transcript, event) {
@@ -1854,7 +2289,7 @@ function acceptTranscriptStreamEvent(transcript, event) {
       kind: "tool",
       toolName: event.toolCall.function.name,
       callId: event.toolCall.callId ?? event.toolCall.id,
-      args: formatJson(event.toolCall.function.arguments)
+      args: formatJson2(event.toolCall.function.arguments)
     });
   }
   if (event.type === "tool_result") {
@@ -1873,6 +2308,22 @@ function acceptTranscriptStreamEvent(transcript, event) {
     matched.args = matched.args ?? event.args;
     matched.result = event.result;
   }
+  if (event.type === "agent_tool_event") {
+    const matched = findTranscriptToolEntry(transcript, event.toolName, event.toolCallId);
+    if (matched === void 0) {
+      transcript.push({
+        entryId: transcript.length,
+        kind: "tool",
+        toolName: event.toolName,
+        ...event.toolCallId === void 0 ? {} : { callId: event.toolCallId },
+        childEvents: [childAgentTranscriptEvent(event)].filter(
+          (childEvent) => childEvent !== void 0
+        )
+      });
+      return;
+    }
+    appendChildAgentTranscriptEvent(matched, event);
+  }
   if (event.type === "tool_approval_request") {
     const matched = findTranscriptToolEntry(
       transcript,
@@ -1945,6 +2396,112 @@ function approvalCallId(approval) {
 function questionCallId(question) {
   return question.callId ?? question.toolCallId;
 }
+function appendChildAgentTranscriptEvent(entry, event) {
+  const childEvent = childAgentTranscriptEvent(event);
+  if (childEvent === void 0) {
+    return;
+  }
+  const childEvents = entry.childEvents ?? [];
+  if (childEvent.kind === "message") {
+    const last = childEvents.at(-1);
+    if (last?.kind === "message" && last.agentId === childEvent.agentId) {
+      last.text = `${last.text}${childEvent.text}`;
+    } else {
+      childEvents.push(childEvent);
+    }
+  } else if (childEvent.kind === "reasoning") {
+    const last = childEvents.at(-1);
+    if (last?.kind === "reasoning" && last.agentId === childEvent.agentId && (last.reasoningId ?? "") === (childEvent.reasoningId ?? "")) {
+      last.text = `${last.text}${childEvent.text}`;
+    } else {
+      childEvents.push(childEvent);
+    }
+  } else {
+    const matched = findChildAgentToolEvent(childEvents, childEvent);
+    if (matched === void 0) {
+      childEvents.push(childEvent);
+    } else {
+      if (matched.args === void 0 && childEvent.args !== void 0) {
+        matched.args = childEvent.args;
+      }
+      if (childEvent.result !== void 0) {
+        matched.result = childEvent.result;
+      }
+    }
+  }
+  entry.childEvents = childEvents;
+}
+function childAgentTranscriptEvent(event) {
+  const child = event.event;
+  if (child.type === "text_delta") {
+    return {
+      kind: "message",
+      agentId: event.agentId,
+      ...event.agentName === void 0 ? {} : { agentName: event.agentName },
+      text: child.delta
+    };
+  }
+  if (child.type === "reasoning_delta") {
+    return {
+      kind: "reasoning",
+      agentId: event.agentId,
+      ...event.agentName === void 0 ? {} : { agentName: event.agentName },
+      ...child.id === void 0 ? {} : { reasoningId: child.id },
+      text: child.delta
+    };
+  }
+  if (child.type === "tool_call") {
+    return {
+      kind: "tool",
+      agentId: event.agentId,
+      ...event.agentName === void 0 ? {} : { agentName: event.agentName },
+      toolName: child.toolCall.function.name,
+      ...child.toolCall.callId === void 0 && child.toolCall.id === void 0 ? {} : { callId: child.toolCall.callId ?? child.toolCall.id },
+      args: formatJson2(child.toolCall.function.arguments)
+    };
+  }
+  if (child.type === "tool_result") {
+    return {
+      kind: "tool",
+      agentId: event.agentId,
+      ...event.agentName === void 0 ? {} : { agentName: event.agentName },
+      toolName: child.toolName,
+      ...child.toolCallId === void 0 ? {} : { callId: child.toolCallId },
+      args: child.args,
+      result: child.result
+    };
+  }
+  if (child.type === "error") {
+    return {
+      kind: "message",
+      agentId: event.agentId,
+      ...event.agentName === void 0 ? {} : { agentName: event.agentName },
+      text: `Error: ${errorText(child.error)}`
+    };
+  }
+  return void 0;
+}
+function errorText(error) {
+  if (error instanceof Error) {
+    return error.message;
+  }
+  if (typeof error === "string") {
+    return error;
+  }
+  return JSON.stringify(serializeError2(error));
+}
+function findChildAgentToolEvent(childEvents, event) {
+  for (let index = childEvents.length - 1; index >= 0; index -= 1) {
+    const childEvent = childEvents[index];
+    if (childEvent?.kind !== "tool" || childEvent.agentId !== event.agentId || childEvent.toolName !== event.toolName || childEvent.result !== void 0) {
+      continue;
+    }
+    if (event.callId === void 0 || childEvent.callId === event.callId) {
+      return childEvent;
+    }
+  }
+  return void 0;
+}
 function transcriptFromMessages(messages) {
   const transcript = [];
   for (const message of messages) {
@@ -1987,7 +2544,7 @@ function transcriptFromMessages(messages) {
           kind: "tool",
           toolName: content.function.name,
           callId: content.callId ?? content.id,
-          args: formatJson(content.function.arguments)
+          args: formatJson2(content.function.arguments)
         });
       }
     }
@@ -2073,7 +2630,7 @@ function extractMessageText(message) {
       return [item.text];
     }
     if (item.type === "tool_call") {
-      return [`${item.function.name}(${formatJson(item.function.arguments)})`];
+      return [`${item.function.name}(${formatJson2(item.function.arguments)})`];
     }
     if (item.type === "tool_result") {
       return item.content.map((result) => "text" in result ? result.text : "[image]");
@@ -2081,7 +2638,7 @@ function extractMessageText(message) {
     return [];
   }).join("\n");
 }
-function formatJson(value) {
+function formatJson2(value) {
   try {
     return JSON.stringify(value, null, 2);
   } catch {
@@ -2408,9 +2965,7 @@ function agentMetadata(agent) {
 }
 function createStudioApp(options) {
   const stores = resolveStores(options);
-  const agents = normalizeAgents(options.agents).map(
-    (agent) => withStudioTraceObserver(agent, stores.traces)
-  );
+  const agents = normalizeAgents(options.agents).map((agent) => withStudioSessionMemory(agent, stores.sessions)).map((agent) => withStudioTraceObserver(agent, stores.traces));
   const agentMap = new Map(agents.map((agent) => [agent.id, agent]));
   const approvalRuntime = createApprovalRuntime();
   const questionRuntime = createQuestionRuntime();
@@ -2469,12 +3024,14 @@ function createStudioApp(options) {
       return errorResponse(c, 400, "bad_request", "Session belongs to another agent");
     }
     const runId = globalThis.crypto.randomUUID();
-    const request = agent.agent.prompt(body.message);
-    if (session !== void 0) {
-      request.withHistory(session.messages);
-    } else if (body.history !== void 0) {
-      request.withHistory(body.history);
-    }
+    const memoryMetadata = {
+      agentId,
+      ...body.metadata ?? {},
+      studioRunId: runId
+    };
+    const request = session !== void 0 ? agent.agent.session(session.id, { metadata: memoryMetadata }).prompt(body.message) : agent.agent.prompt(
+      body.history !== void 0 ? [...body.history, normalizePromptMessage(body.message)] : body.message
+    );
     if (body.maxTurns !== void 0) {
       request.maxTurns(body.maxTurns);
     }
@@ -2512,11 +3069,12 @@ function createStudioApp(options) {
         request.requestHook(effectiveHook);
       }
       const runStream = mergeRunAndApprovalEvents(request.stream(), runtimeEvents);
-      const stream = session === void 0 || stores.sessions === void 0 ? runStream : persistStreamingSessionRun({
+      const stream = session === void 0 || stores.sessions === void 0 ? runStream : persistStreamingSessionTranscript({
         stream: runStream,
         store: stores.sessions,
         session,
-        message: body.message
+        message: body.message,
+        runId
       });
       return streamAgentRunEvents(c, stream);
     }
@@ -2544,15 +3102,30 @@ function createStudioApp(options) {
       }
       const response = await request.send();
       if (session !== void 0 && stores.sessions !== void 0) {
-        await stores.sessions.appendSessionRun({
+        await stores.sessions.saveSessionRunTranscript({
           id: session.id,
+          runId,
           ...optionalTitle(body.message),
-          messages: response.messages,
-          transcript: transcriptFromMessages(response.messages)
+          transcript: transcriptFromMessages(response.messages),
+          status: "success"
         });
       }
       return c.json(response);
     } catch (error) {
+      if (session !== void 0 && stores.sessions !== void 0) {
+        const messages = await stores.sessions.load({
+          sessionId: session.id,
+          metadata: memoryMetadata
+        });
+        await stores.sessions.saveSessionRunTranscript({
+          id: session.id,
+          runId,
+          ...optionalTitle(body.message),
+          transcript: transcriptFromMessages(messages.slice(session.messageCount)),
+          status: "error",
+          error: serializeError2(error)
+        });
+      }
       return errorResponse(c, 500, "internal_error", "Agent run failed", serializeError2(error));
     }
   });
@@ -2584,36 +3157,60 @@ function createStudioApp(options) {
     ...stores.traces === void 0 ? {} : { traceStore: stores.traces }
   };
 }
+function normalizePromptMessage(message) {
+  return typeof message === "string" ? Message.user(message) : message;
+}
+function withStudioSessionMemory(studioAgent, sessionStore) {
+  if (sessionStore === void 0) {
+    return studioAgent;
+  }
+  return {
+    ...studioAgent,
+    agent: cloneAgent(studioAgent.agent, {
+      memory: {
+        store: sessionStore,
+        options: resolveMemoryOptions({ savePolicy: "message" })
+      }
+    })
+  };
+}
 function withStudioTraceObserver(studioAgent, traceStore) {
   if (traceStore === void 0 || hasStudioTraceObserver(studioAgent.agent)) {
     return studioAgent;
   }
   return {
     ...studioAgent,
-    agent: new Agent({
-      id: studioAgent.agent.id,
-      name: studioAgent.agent.name,
-      description: studioAgent.agent.description,
-      model: studioAgent.agent.model,
-      instructions: studioAgent.agent.instructions,
-      staticContext: studioAgent.agent.staticContext,
-      temperature: studioAgent.agent.temperature,
-      maxTokens: studioAgent.agent.maxTokens,
-      additionalParams: studioAgent.agent.additionalParams,
-      toolSet: studioAgent.agent.toolSet,
-      toolChoice: studioAgent.agent.toolChoice,
-      defaultMaxTurns: studioAgent.agent.defaultMaxTurns,
-      hook: studioAgent.agent.hook,
-      outputSchema: studioAgent.agent.outputSchema,
+    agent: cloneAgent(studioAgent.agent, {
       observers: [
         ...studioAgent.agent.observers,
         { observer: new StudioTraceObserver({ store: traceStore }) }
-      ],
-      dynamicContexts: studioAgent.agent.dynamicContexts,
-      dynamicTools: studioAgent.agent.dynamicTools
+      ]
     })
   };
 }
+function cloneAgent(agent, overrides = {}) {
+  return new Agent({
+    id: agent.id,
+    name: agent.name,
+    description: agent.description,
+    model: agent.model,
+    instructions: agent.instructions,
+    staticContext: agent.staticContext,
+    temperature: agent.temperature,
+    maxTokens: agent.maxTokens,
+    additionalParams: agent.additionalParams,
+    toolSet: agent.toolSet,
+    toolChoice: agent.toolChoice,
+    defaultMaxTurns: agent.defaultMaxTurns,
+    hook: agent.hook,
+    outputSchema: agent.outputSchema,
+    observers: agent.observers,
+    dynamicContexts: agent.dynamicContexts,
+    dynamicTools: agent.dynamicTools,
+    memory: agent.memory,
+    ...overrides
+  });
+}
 function hasStudioTraceObserver(agent) {
   return agent.observers.some(
     (registration) => registration.observer instanceof StudioTraceObserver