@rowan-agent/agent 0.20.2 → 0.21.0

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _rowan_agent_models from '@rowan-agent/models';
-import { ContentBlock, LlmContentPart, ModelRef, ScopeRef, ToolCallStatus, JsonValue as JsonValue$1, ToolProgress, ToolCallContent, ToolCallLocation, JsonObject as JsonObject$1, ToolKind, ModelConfig, StreamFn, ToolAnnotations, ThinkingLevel, ToolCall as ToolCall$1, ToolCallUpdate } from '@rowan-agent/models';
+import { ContentBlock, ModelRef, LlmTokenUsage, LlmContentPart, ScopeRef, ToolCallStatus, JsonValue as JsonValue$1, ToolProgress, ToolCallContent, ToolCallLocation, JsonObject as JsonObject$1, ToolKind, ModelConfig, StreamFn, ToolAnnotations, ThinkingLevel, ToolCall as ToolCall$1, ToolCallUpdate } from '@rowan-agent/models';
 export { ModelConfig, ModelRef, ProviderCallContext, ProviderConfig, ProviderModelConfig, ProviderStreamFn, ScopeRef, StreamFn, ThinkingLevel, ToolAnnotations, ToolCall, ToolCallContent, ToolCallLocation, ToolCallOptions, ToolCallOutcome, ToolCallStatus, ToolCallUpdate, ToolDefinitionSummary, ToolKind, ToolProgress } from '@rowan-agent/models';
 import Type from 'typebox';
 
@@ -8,6 +8,8 @@ type ModelInvokeOutput = {
     contentBlocks: ContentBlock[];
     toolCalls: ToolCall[];
     stopReason?: string;
+    model?: ModelRef;
+    usage?: LlmTokenUsage;
 };
 /** Snapshot of phase-level context for restore */
 type PhaseContextSnapshot = {
@@ -27,7 +29,10 @@ type PhaseExecution = {
     }): Promise<ModelInvokeOutput>;
     reportStatus(status: PhaseStatus): Promise<void>;
     executeTool(context: AgentContext, toolCall: ToolCall): Promise<ToolResult>;
-    executeTools(context: AgentContext, toolCalls: readonly ToolCall[], contentBlocks?: readonly ContentBlock[]): Promise<readonly ToolResult[]>;
+    executeTools(context: AgentContext, toolCalls: readonly ToolCall[], contentBlocks?: readonly ContentBlock[], meta?: {
+        model?: ModelRef;
+        usage?: LlmTokenUsage;
+    }): Promise<readonly ToolResult[]>;
     interaction: RunInteractionDriver;
     /** Message lifecycle manager for streaming updates from programmatic phases */
     messages: PhaseMessageManager;
@@ -45,7 +50,10 @@ type PhaseMessageManager = {
     /** Replace the active message content with model-native content parts */
     replaceContent(messageId: string, content: string | LlmContentPart[]): void;
     /** End the message stream, appends to transcript */
-    end(messageId: string): Promise<void>;
+    end(messageId: string, meta?: {
+        model?: ModelRef;
+        usage?: LlmTokenUsage;
+    }): Promise<void>;
     /** Drop an unstarted stream that produced no content. */
     discard(messageId: string): void;
 };
@@ -1078,6 +1086,8 @@ interface OwnedStore {
         locations?: ToolCallLocation[];
         content?: ToolCallContent[];
         _meta?: JsonObject;
+        model?: ModelRef;
+        usage?: LlmTokenUsage;
     }): Promise<ToolCommit>;
     reserveToolCalls(input: {
         runId: RunId;
@@ -1087,6 +1097,8 @@ interface OwnedStore {
         calls: readonly ToolCallReservation[];
         /** The model response's blocks, so the request message keeps what preceded the Tool Calls. */
         contentBlocks?: readonly ContentBlock[];
+        model?: ModelRef;
+        usage?: LlmTokenUsage;
     }): Promise<ToolBatchCommit>;
     startToolCall(input: {
         runId: RunId;
@@ -1163,6 +1175,9 @@ type AgentRuntimeOptions = Readonly<{
     concurrency?: number;
     bootstrap?: (registry: RuntimeBootstrapRegistry) => void | Promise<void>;
     host?: ExtensionHost;
+    sessionFiles?: Readonly<{
+        dir: string;
+    }>;
     /** @internal Private / testing parameter to override retry delay */
     retryDelayMs?: number;
 }>;
@@ -2088,6 +2103,8 @@ type AssistantMessage = MessageBase & Readonly<{
     role: "assistant";
     content: AssistantContent;
     interrupted?: boolean;
+    model?: ModelRef;
+    usage?: LlmTokenUsage;
 }>;
 type ToolMessage = MessageBase & Readonly<{
     role: "tool";
@@ -2343,6 +2360,8 @@ type AgentMessage = {
         phase?: string;
     };
     contexts?: readonly ContextCandidate[];
+    model?: ModelRef;
+    usage?: LlmTokenUsage;
 };
 type Skill = {
     name: string;
@@ -2754,6 +2773,8 @@ declare class InMemoryStore implements DurableStore {
         args: JsonValue;
         toolCallId?: ToolCallId;
         providerToolCallId?: string;
+        model?: ModelRef;
+        usage?: LlmTokenUsage;
     }): ToolCommit;
     reserveToolCalls(lease: OwnerLease, input: {
         runId: RunId;
@@ -2763,6 +2784,8 @@ declare class InMemoryStore implements DurableStore {
         calls: readonly ToolCallReservation[];
         /** The model response's blocks, so the request message keeps what preceded the Tool Calls. */
         contentBlocks?: readonly ContentBlock[];
+        model?: ModelRef;
+        usage?: LlmTokenUsage;
     }): ToolBatchCommit;
     startToolCall(lease: OwnerLease, input: {
         runId: RunId;
@@ -3018,6 +3041,8 @@ declare class SqliteStore implements DurableStore {
         locations?: ToolCallLocation[];
         content?: ToolCallContent[];
         _meta?: JsonObject;
+        model?: _rowan_agent_models.ModelRef;
+        usage?: _rowan_agent_models.LlmTokenUsage;
     }): Promise<ToolCommit>;
     reserveToolCalls(lease: OwnerLease, input: {
         runId: RunId;
@@ -3026,6 +3051,8 @@ declare class SqliteStore implements DurableStore {
         requestMessageId: MessageId;
         calls: readonly ToolCallReservation[];
         contentBlocks?: readonly ContentBlock[];
+        model?: _rowan_agent_models.ModelRef;
+        usage?: _rowan_agent_models.LlmTokenUsage;
     }): Promise<ToolBatchCommit>;
     startToolCall(lease: OwnerLease, input: {
         runId: RunId;

package/dist/index.js

@@ -944,7 +944,7 @@ function createRuntimeCoreTools(input = {}) {
 // src/runtime/durable-runtime.ts
 import { mkdir as mkdir2, chmod as chmod2, writeFile as writeFile2 } from "fs/promises";
 import { randomUUID } from "crypto";
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 import { createModelStream, isValidToolProgress } from "@rowan-agent/models";
 
 // src/utils.ts
@@ -1401,7 +1401,8 @@ async function invokeModel(input) {
     metadataPhase: input.phaseId,
     output: input.output,
     onThinkingDelta: input.onThinkingDelta,
-    onToolCallDelta: input.onToolCallDelta
+    onToolCallDelta: input.onToolCallDelta,
+    model: input.request.model
   });
   const response = result.doneResponse ?? {
     content: result.text,
@@ -1417,6 +1418,8 @@ async function invokeModel(input) {
     contentBlocks: result.contentBlocks,
     toolCalls: result.toolCalls,
     stopReason: result.stopReason,
+    model: input.request.model,
+    usage: response.usage,
     transcript: {
       request: input.request,
       response
@@ -1540,7 +1543,7 @@ async function collectStreamResult(input) {
         input.message.replaceContent(activeMessageId, contentBlocksToMessageContent(contentBlocks2));
       }
       if (persistAssistant && activeMessageId) {
-        if (hasContent2) await input.message.end(activeMessageId);
+        if (hasContent2) await input.message.end(activeMessageId, { model: input.model, usage: event.response?.usage });
         else input.message.discard(activeMessageId);
         activeMessageId = void 0;
       }
@@ -1549,13 +1552,13 @@ async function collectStreamResult(input) {
   const abortResult = LoopGuard.checkAbort(input.config.signal);
   if (abortResult.stopReason !== "none") {
     if (persistAssistant && activeMessageId) {
-      await input.message.end(activeMessageId);
+      await input.message.end(activeMessageId, { model: input.model });
       activeMessageId = void 0;
     }
     return { text: abortResult.message, contentBlocks: [], toolCalls: [], stopReason: "aborted" };
   }
   if (persistAssistant && activeMessageId) {
-    await input.message.end(activeMessageId);
+    await input.message.end(activeMessageId, { model: input.model, usage: doneResponse?.usage });
   }
   const hasContent = (lastPartial?.contentBlocks?.length ?? 0) > 0 || (doneResponse?.content?.length ?? 0) > 0 || (doneResponse?.toolCalls?.length ?? 0) > 0;
   if (!hasContent && stopReason !== "error" && stopReason !== "aborted") {
@@ -2706,6 +2709,7 @@ function buildModelRequest(input, options) {
     model: options?.model ?? { provider: "", id: "" },
     ...options?.thinkingLevel === void 0 ? {} : { thinkingLevel: options.thinkingLevel },
     ...options?.providerOptions === void 0 ? {} : { providerOptions: options.providerOptions },
+    ...options?.sessionId === void 0 ? {} : { sessionId: options.sessionId },
     system: systemText,
     messages,
     tools: modelTools.length > 0 ? modelTools : void 0
@@ -2971,9 +2975,15 @@ function createMessageManager(context, onMessage, onMessageDelta) {
       if (!active) return;
       active.message.content = content;
     },
-    async end(messageId) {
+    async end(messageId, meta) {
       const active = activeMessages.get(messageId);
       if (!active) return;
+      if (meta?.model) {
+        active.message.model = meta.model;
+      }
+      if (meta?.usage) {
+        active.message.usage = meta.usage;
+      }
       if (!active.emitted && (active.message.content === "" || active.message.content.length === 0)) {
         activeMessages.delete(messageId);
         return;
@@ -3042,6 +3052,7 @@ async function executePhaseWithModel(ctx) {
     };
     let executableToolCalls;
     let roundContentBlocks;
+    let collected;
     const checkpoint = ctx.execution.interaction.checkpoint();
     if (checkpoint && typeof checkpoint === "object" && checkpoint.kind === "tool_call_suspension") {
       const toolSuspension = checkpoint;
@@ -3054,7 +3065,7 @@ async function executePhaseWithModel(ctx) {
         toolCalls: [...toolSuspension.toolCalls]
       };
     } else {
-      const collected = await ctx.execution.invokeModel(roundContext);
+      collected = await ctx.execution.invokeModel(roundContext);
       output = {
         message: collected.text,
         phase: ctx.phase.name,
@@ -3087,7 +3098,13 @@ async function executePhaseWithModel(ctx) {
         return output;
       }
     }
-    const results = await ctx.execution.executeTools(roundContext, executableToolCalls, roundContentBlocks);
+    const currentModel = ctx.phase.model ?? ctx.config.model;
+    const results = await ctx.execution.executeTools(
+      roundContext,
+      executableToolCalls,
+      roundContentBlocks,
+      { model: currentModel, usage: collected?.usage }
+    );
     for (const result of results) {
       const messageId = ctx.messageManager.start("tool", createToolResultContent(result), {
         phase: ctx.phase.name
@@ -3641,7 +3658,9 @@ async function executeToolCalls(input) {
       config: input.config,
       toolCalls: input.toolCalls,
       contentBlocks: input.contentBlocks,
-      driver: input.driver
+      driver: input.driver,
+      model: input.model,
+      usage: input.usage
     });
     if (results2.length !== input.toolCalls.length) throw new Error("Runtime returned an invalid Tool batch result");
     return results2.map((result, index) => ({
@@ -3713,6 +3732,7 @@ function createPhaseExecution(config, state, phase, messageManager, toolExecutio
         appendSystemPrompt: phaseContext.appendSystemPrompt
       }, {
         model: phase.model ?? config.model,
+        sessionId: config.execution.agentId,
         ...config.thinkingLevel === void 0 ? {} : { thinkingLevel: config.thinkingLevel },
         ...config.providerOptions === void 0 ? {} : { providerOptions: config.providerOptions }
       });
@@ -3798,7 +3818,7 @@ function createPhaseExecution(config, state, phase, messageManager, toolExecutio
       await config.onPhaseStatus?.(phase.name, status);
     },
     executeTool: executePhaseTool,
-    async executeTools(phaseContext, toolCalls, contentBlocks) {
+    async executeTools(phaseContext, toolCalls, contentBlocks, meta) {
       return runTurn(async () => {
         const tools = phaseContext.tools.filter((tool) => tool.name !== PhaseRouteTool);
         for (const toolCall of toolCalls) {
@@ -3816,7 +3836,9 @@ function createPhaseExecution(config, state, phase, messageManager, toolExecutio
           tools,
           toolCalls,
           contentBlocks,
-          driver: interaction
+          driver: interaction,
+          model: meta?.model,
+          usage: meta?.usage
         });
         for (const result of results) {
           await toolExecutionManager.end(result.toolCallId, result.toolName, result, !result.ok);
@@ -4283,7 +4305,7 @@ function normalizeUserInput(input) {
   return normalized;
 }
 function isAssistantMessage(value) {
-  return isRecord3(value) && hasOnlyKeys(value, ["id", "agentId", "runId", "messageRevision", "role", "content", "metadata", "sequenceWithinRun", "createdAt", "interrupted"]) && typeof value.id === "string" && typeof value.agentId === "string" && typeof value.runId === "string" && value.role === "assistant" && (value.messageRevision === void 0 || Number.isInteger(value.messageRevision) && value.messageRevision >= 0) && Number.isInteger(value.sequenceWithinRun) && value.sequenceWithinRun >= 0 && typeof value.createdAt === "string" && isAssistantContent(value.content) && (value.metadata === void 0 || isMetadata(value.metadata)) && (value.interrupted === void 0 || typeof value.interrupted === "boolean");
+  return isRecord3(value) && hasOnlyKeys(value, ["id", "agentId", "runId", "messageRevision", "role", "content", "metadata", "sequenceWithinRun", "createdAt", "interrupted", "model", "usage"]) && typeof value.id === "string" && typeof value.agentId === "string" && typeof value.runId === "string" && value.role === "assistant" && (value.messageRevision === void 0 || Number.isInteger(value.messageRevision) && value.messageRevision >= 0) && Number.isInteger(value.sequenceWithinRun) && value.sequenceWithinRun >= 0 && typeof value.createdAt === "string" && isAssistantContent(value.content) && (value.metadata === void 0 || isMetadata(value.metadata)) && (value.interrupted === void 0 || typeof value.interrupted === "boolean") && (value.model === void 0 || isRecord3(value.model) && typeof value.model.provider === "string" && typeof value.model.id === "string") && (value.usage === void 0 || isRecord3(value.usage));
 }
 function isToolResult(value) {
   if (!isRecord3(value)) return false;
@@ -4999,7 +5021,9 @@ function projectAssistantMessage(message, agentId, runId, sequenceWithinRun, opt
     sequenceWithinRun,
     createdAt: message.createdAt,
     ...message.metadata ? { metadata: message.metadata } : {},
-    ...options.interrupted ? { interrupted: true } : {}
+    ...options.interrupted ? { interrupted: true } : {},
+    ...message.model ? { model: message.model } : {},
+    ...message.usage ? { usage: message.usage } : {}
   };
 }
 function durableInterruptedAssistantContent(content) {
@@ -5251,6 +5275,333 @@ function fromLoopResult(result) {
   };
 }
 
+// src/runtime/session-files.ts
+import { appendFileSync, chmodSync, existsSync as existsSync3, mkdirSync, readFileSync } from "fs";
+import { dirname as dirname5, join as join3 } from "path";
+function toEpochMs(isoString) {
+  if (!isoString) return Date.now();
+  const ms = new Date(isoString).getTime();
+  return Number.isNaN(ms) ? Date.now() : ms;
+}
+function isContentBlock(value) {
+  if (!value || typeof value !== "object") return false;
+  const candidate = value;
+  if (candidate.type === "text" && typeof candidate.text === "string") return true;
+  if (candidate.type === "image" && typeof candidate.data === "string" && typeof candidate.mimeType === "string") return true;
+  return false;
+}
+function convertToolResultContent(content) {
+  if (content === void 0 || content === null) {
+    return [{ type: "text", text: "" }];
+  }
+  if (typeof content === "string") {
+    return [{ type: "text", text: content }];
+  }
+  if (isContentBlock(content)) {
+    return content.type === "image" ? [{ type: "image", data: content.data, mimeType: content.mimeType }] : [{ type: "text", text: content.text }];
+  }
+  if (Array.isArray(content)) {
+    if (content.length > 0 && content.every(isContentBlock)) {
+      return content.map(
+        (item) => item.type === "image" ? { type: "image", data: item.data, mimeType: item.mimeType } : { type: "text", text: item.text }
+      );
+    }
+    return [{ type: "text", text: JSON.stringify(content) }];
+  }
+  return [{ type: "text", text: JSON.stringify(content) }];
+}
+function convertUserContent(content) {
+  if (typeof content === "string") return content;
+  return content.map(
+    (part) => part.type === "image" ? { type: "image", data: part.data, mimeType: part.mimeType } : { type: "text", text: part.text }
+  );
+}
+function convertAssistantContent(content, onToolCall) {
+  if (typeof content === "string") {
+    return {
+      parts: [{ type: "text", text: content }],
+      hasToolCall: false
+    };
+  }
+  let hasToolCall = false;
+  const parts = [];
+  for (const part of content) {
+    if (part.type === "text") {
+      parts.push({ type: "text", text: part.text });
+    } else if (part.type === "thinking") {
+      parts.push({
+        type: "thinking",
+        thinking: part.thinking,
+        ...part.signature ? { thinkingSignature: part.signature } : {}
+      });
+    } else if (part.type === "tool_use") {
+      hasToolCall = true;
+      const callId = part.providerToolCallId ?? part.toolCallId;
+      onToolCall?.(callId, part.name, part.toolCallId);
+      parts.push({
+        type: "toolCall",
+        id: callId,
+        name: part.name,
+        arguments: part.input
+      });
+    }
+  }
+  return { parts, hasToolCall };
+}
+async function getAgentCreatedAt(runtime, agentId) {
+  let after;
+  while (true) {
+    const page = await runtime.listAgents(after ? { after, limit: 100 } : { limit: 100 });
+    const agent = page.items.find((item) => item.id === agentId);
+    if (agent) return agent.createdAt;
+    if (!page.next) break;
+    after = page.next;
+  }
+  return (/* @__PURE__ */ new Date()).toISOString();
+}
+async function getFirstRunCwd(runtime, agentId) {
+  let after;
+  while (true) {
+    const page = await runtime.listRuns(after ? { agentId, after, limit: 100 } : { agentId, limit: 100 });
+    for (const runSummary of page.items) {
+      try {
+        const snapshot = await runtime.run(runSummary.id).snapshot();
+        if (snapshot.cwd && snapshot.cwd.trim().length > 0) {
+          return snapshot.cwd;
+        }
+      } catch {
+      }
+    }
+    if (!page.next) break;
+    after = page.next;
+  }
+  return "";
+}
+function writeSessionEntry(state, entry) {
+  appendFileSync(state.filePath, `${JSON.stringify(entry)}
+`, { encoding: "utf8", mode: 384 });
+  try {
+    chmodSync(state.filePath, 384);
+  } catch {
+  }
+  state.knownEntryIds.add(entry.id);
+  state.entryIdToParentId.set(entry.id, entry.parentId);
+  state.lastEntryId = entry.id;
+}
+async function startSessionFilesConsumer(runtime, options) {
+  const agentStates = /* @__PURE__ */ new Map();
+  async function getOrInitState(agentId) {
+    let state = agentStates.get(agentId);
+    if (state) return state;
+    const createdAt = await getAgentCreatedAt(runtime, agentId);
+    const cwd = await getFirstRunCwd(runtime, agentId);
+    const folderName = cwd.length > 0 ? `--${cwd.replace(/^[/\\]/, "").replace(/[/\\:]/g, "-")}--` : "--unknown--";
+    const fileTimestamp = createdAt.replace(/[:.]/g, "-");
+    const fileName = `${fileTimestamp}_${agentId}.jsonl`;
+    const filePath = join3(options.dir, folderName, fileName);
+    const knownEntryIds = /* @__PURE__ */ new Set();
+    let lastEntryId = null;
+    let lastModel;
+    const entryIdToParentId = /* @__PURE__ */ new Map();
+    const toolCallIdToName = /* @__PURE__ */ new Map();
+    const writeHeader = () => {
+      const header = { type: "session", version: 3, id: agentId, timestamp: createdAt, cwd };
+      appendFileSync(filePath, `${JSON.stringify(header)}
+`, { encoding: "utf8", mode: 384 });
+    };
+    mkdirSync(dirname5(filePath), { recursive: true, mode: 448 });
+    if (existsSync3(filePath)) {
+      const content = readFileSync(filePath, "utf8");
+      if (content.trim().length === 0) {
+        writeHeader();
+      } else {
+        for (const line of content.split("\n")) {
+          const trimmed = line.trim();
+          if (!trimmed) continue;
+          let parsed;
+          try {
+            parsed = JSON.parse(trimmed);
+          } catch {
+            continue;
+          }
+          if (parsed.type === "session") continue;
+          if (typeof parsed.id === "string") {
+            knownEntryIds.add(parsed.id);
+            entryIdToParentId.set(parsed.id, parsed.parentId ?? null);
+            lastEntryId = parsed.id;
+          }
+          if (parsed.type === "model_change" && typeof parsed.provider === "string" && typeof parsed.modelId === "string") {
+            lastModel = { provider: parsed.provider, modelId: parsed.modelId };
+          }
+          if (parsed.type === "message" && parsed.message?.role === "assistant" && Array.isArray(parsed.message.content)) {
+            for (const part of parsed.message.content) {
+              if (part && part.type === "toolCall" && typeof part.id === "string" && typeof part.name === "string") {
+                toolCallIdToName.set(part.id, part.name);
+              }
+            }
+          }
+        }
+      }
+    } else {
+      writeHeader();
+    }
+    state = {
+      filePath,
+      knownEntryIds,
+      lastEntryId,
+      entryIdToParentId,
+      toolCallIdToName,
+      ...lastModel ? { lastModel } : {}
+    };
+    agentStates.set(agentId, state);
+    return state;
+  }
+  async function onEvent(event) {
+    try {
+      if (event.kind !== "message_committed" && event.kind !== "message_revised") {
+        return;
+      }
+      if (event.kind === "message_committed" && event.message.role === "interaction") {
+        return;
+      }
+      const state = await getOrInitState(event.agentId);
+      if (event.kind === "message_committed") {
+        if (event.message.role === "user") {
+          if (state.knownEntryIds.has(event.message.id)) return;
+          const content = convertUserContent(event.message.content);
+          const entry = {
+            type: "message",
+            id: event.message.id,
+            parentId: state.lastEntryId,
+            timestamp: event.message.createdAt,
+            message: {
+              role: "user",
+              content,
+              timestamp: toEpochMs(event.message.createdAt)
+            }
+          };
+          writeSessionEntry(state, entry);
+        } else if (event.message.role === "assistant") {
+          if (state.knownEntryIds.has(event.message.id)) return;
+          const model = event.message.model;
+          const rawUsage = event.message.usage;
+          if (model) {
+            const isDifferentModel = !state.lastModel || state.lastModel.provider !== model.provider || state.lastModel.modelId !== model.id;
+            if (isDifferentModel) {
+              const modelChangeId = `${event.message.id}:model`;
+              if (!state.knownEntryIds.has(modelChangeId)) {
+                const modelChangeEntry = {
+                  type: "model_change",
+                  id: modelChangeId,
+                  parentId: state.lastEntryId,
+                  timestamp: event.message.createdAt,
+                  provider: model.provider,
+                  modelId: model.id
+                };
+                writeSessionEntry(state, modelChangeEntry);
+              }
+              state.lastModel = { provider: model.provider, modelId: model.id };
+            }
+          }
+          const { parts, hasToolCall } = convertAssistantContent(
+            event.message.content,
+            (id, name, internalId) => {
+              state.toolCallIdToName.set(id, name);
+              if (internalId) state.toolCallIdToName.set(internalId, name);
+            }
+          );
+          const assistantMessagePayload = {
+            role: "assistant",
+            content: parts,
+            stopReason: hasToolCall ? "toolUse" : "stop",
+            timestamp: toEpochMs(event.message.createdAt)
+          };
+          if (model || rawUsage) {
+            if (model) {
+              assistantMessagePayload.provider = model.provider;
+              assistantMessagePayload.model = model.id;
+            }
+            const input = rawUsage?.inputTokens ?? 0;
+            const output = rawUsage?.outputTokens ?? 0;
+            const cacheRead = rawUsage?.cacheReadTokens ?? 0;
+            const cacheWrite = rawUsage?.cacheWriteTokens ?? 0;
+            const totalTokens = rawUsage?.totalTokens ?? input + output + cacheRead + cacheWrite;
+            const cost = rawUsage?.cost ?? { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, total: 0 };
+            assistantMessagePayload.usage = {
+              input,
+              output,
+              cacheRead,
+              cacheWrite,
+              ...rawUsage?.cacheWrite1hTokens !== void 0 ? { cacheWrite1h: rawUsage.cacheWrite1hTokens } : {},
+              ...rawUsage?.reasoningTokens !== void 0 ? { reasoning: rawUsage.reasoningTokens } : {},
+              totalTokens,
+              cost
+            };
+          }
+          const entry = {
+            type: "message",
+            id: event.message.id,
+            parentId: state.lastEntryId,
+            timestamp: event.message.createdAt,
+            message: assistantMessagePayload
+          };
+          writeSessionEntry(state, entry);
+        } else if (event.message.role === "tool") {
+          for (let index = 0; index < event.message.content.length; index++) {
+            const part = event.message.content[index];
+            const entryId = `${event.message.id}:${index}`;
+            if (state.knownEntryIds.has(entryId)) continue;
+            const toolCallId = part.providerToolCallId ?? part.toolCallId;
+            const toolName = state.toolCallIdToName.get(toolCallId) ?? state.toolCallIdToName.get(part.toolCallId) ?? "unknown";
+            const isError = Boolean(
+              part.result.isError ?? (part.result.ok !== void 0 ? !part.result.ok : Boolean(part.result.error))
+            );
+            const content = convertToolResultContent(part.result.content);
+            const entry = {
+              type: "message",
+              id: entryId,
+              parentId: state.lastEntryId,
+              timestamp: event.message.createdAt,
+              message: {
+                role: "toolResult",
+                toolCallId,
+                toolName,
+                content,
+                isError,
+                timestamp: toEpochMs(event.message.createdAt)
+              }
+            };
+            writeSessionEntry(state, entry);
+          }
+        }
+      } else if (event.kind === "message_revised") {
+        const message = event.message;
+        const revision = message.messageRevision ?? 1;
+        const entryId = `${message.id}@${revision}`;
+        if (state.knownEntryIds.has(entryId)) return;
+        const parentId = state.entryIdToParentId.get(message.id) ?? null;
+        const timestampIso = message.createdAt ?? event.createdAt;
+        const content = convertUserContent(message.content);
+        const entry = {
+          type: "message",
+          id: entryId,
+          parentId,
+          timestamp: timestampIso,
+          message: {
+            role: "user",
+            content,
+            timestamp: toEpochMs(timestampIso)
+          }
+        };
+        writeSessionEntry(state, entry);
+      }
+    } catch (error) {
+      console.error("Failed to write session file entry:", error);
+    }
+  }
+  return runtime.consume({ consumerId: "rowan:session-files", signal: new AbortController().signal, onEvent });
+}
+
 // src/runtime/transient-run-events.ts
 var MAX_BUFFERED_EVENTS = 128;
 var MAX_BUFFERED_TEXT = 64 * 1024;
@@ -5607,7 +5958,7 @@ function scopeToKey(scope) {
 
 // src/extensions/runner.ts
 import { execFile } from "child_process";
-import { dirname as dirname5, resolve as resolve5 } from "path";
+import { dirname as dirname6, resolve as resolve5 } from "path";
 import {
   registerModel,
   unregisterProviderModels,
@@ -6436,7 +6787,7 @@ var ExtensionRunner = class {
     }
   }
   async loadRegisteredPhase(extension, registration) {
-    const extensionBase = extension.path.startsWith("<") ? this.cwd : dirname5(extension.path);
+    const extensionBase = extension.path.startsWith("<") ? this.cwd : dirname6(extension.path);
     const phase = await loadPhase(resolve5(extensionBase, registration));
     const name = phase.name;
     if (this.phases.has(name)) {
@@ -6512,10 +6863,10 @@ function createExtensionRunner(options) {
 }
 
 // src/extensions/loader.ts
-import { existsSync as existsSync3, readFileSync } from "fs";
+import { existsSync as existsSync4, readFileSync as readFileSync2 } from "fs";
 import { readdir as readdir3, readFile as readFile3, stat as stat2 } from "fs/promises";
 import { fileURLToPath } from "url";
-import { basename as basename3, dirname as dirname6, extname as extname2, join as join3, resolve as resolve6 } from "path";
+import { basename as basename3, dirname as dirname7, extname as extname2, join as join4, resolve as resolve6 } from "path";
 import { createJiti } from "jiti";
 function isExtensionFile(path) {
   const extension = extname2(path).toLowerCase();
@@ -6525,12 +6876,12 @@ function isSyntheticPath(path) {
   return path.startsWith("<") && path.endsWith(">");
 }
 function readManifestSync(dir) {
-  const manifestPath = join3(dir, "package.json");
-  if (!existsSync3(manifestPath)) {
+  const manifestPath = join4(dir, "package.json");
+  if (!existsSync4(manifestPath)) {
     return void 0;
   }
   try {
-    const content = readFileSync(manifestPath, "utf8");
+    const content = readFileSync2(manifestPath, "utf8");
     const pkg = JSON.parse(content);
     const rowan = pkg.rowan;
     if (!rowan) return void 0;
@@ -6549,7 +6900,7 @@ function jitiAliases() {
     return {};
   }
   const agentSourcePath = fileURLToPath(new URL("../index.ts", moduleUrl));
-  if (!existsSync3(agentSourcePath)) {
+  if (!existsSync4(agentSourcePath)) {
     return {};
   }
   return { "@rowan-agent/agent": agentSourcePath };
@@ -6573,21 +6924,21 @@ async function loadExtensionModule(extensionPath) {
   return typeof module === "function" ? module : void 0;
 }
 async function readPackageManifest(path) {
-  if (!existsSync3(path)) {
+  if (!existsSync4(path)) {
     return void 0;
   }
   const content = await readFile3(path, "utf8");
   return JSON.parse(content);
 }
 async function resolveExtensionEntries(dir) {
-  const manifest = await readPackageManifest(join3(dir, "package.json"));
+  const manifest = await readPackageManifest(join4(dir, "package.json"));
   const declared = manifest?.rowan?.extensions;
   if (declared && declared.length > 0) {
     return declared.map((entry) => resolve6(dir, entry));
   }
   for (const name of ["index.ts", "index.js"]) {
-    const entry = join3(dir, name);
-    if (existsSync3(entry)) {
+    const entry = join4(dir, name);
+    if (existsSync4(entry)) {
       return [entry];
     }
   }
@@ -6602,7 +6953,7 @@ async function discoverExtensionsInDir(dir) {
   });
   const paths = [];
   for (const entry of [...entries].sort((a, b) => a.name.localeCompare(b.name))) {
-    const entryPath = join3(dir, entry.name);
+    const entryPath = join4(dir, entry.name);
     if ((entry.isFile() || entry.isSymbolicLink()) && isExtensionFile(entry.name)) {
       paths.push(entryPath);
       continue;
@@ -6622,8 +6973,8 @@ async function discoverExtensionsInDir(dir) {
 function loadExtensionFromFactory(factory, cwd, extensionPath = "<inline>", options = {}) {
   const resolvedCwd = resolve6(cwd);
   const resolvedPath = isSyntheticPath(extensionPath) ? extensionPath : resolve6(resolvedCwd, extensionPath);
-  const name = options.name ?? (isSyntheticPath(extensionPath) ? extensionPath : basename3(dirname6(resolvedPath)) || "unknown");
-  const manifestDir = isSyntheticPath(extensionPath) ? resolvedCwd : dirname6(resolvedPath);
+  const name = options.name ?? (isSyntheticPath(extensionPath) ? extensionPath : basename3(dirname7(resolvedPath)) || "unknown");
+  const manifestDir = isSyntheticPath(extensionPath) ? resolvedCwd : dirname7(resolvedPath);
   const manifest = readManifestSync(manifestDir);
   const id = options.id ?? manifest?.id ?? name;
   return {
@@ -6663,7 +7014,7 @@ async function loadExtensionsFromPath(path) {
   const resolvedPath = resolve6(path);
   const info = await stat2(resolvedPath);
   if (!info.isDirectory()) {
-    return loadExtensions([resolvedPath], dirname6(resolvedPath));
+    return loadExtensions([resolvedPath], dirname7(resolvedPath));
   }
   const entries = await resolveExtensionEntries(resolvedPath) ?? await discoverExtensionsInDir(resolvedPath);
   return loadExtensions(entries, resolvedPath);
@@ -6671,7 +7022,7 @@ async function loadExtensionsFromPath(path) {
 
 // src/runtime/resource-registry.ts
 import { stat as stat3, readdir as readdir4 } from "fs/promises";
-import { join as join4, resolve as resolve7 } from "path";
+import { join as join5, resolve as resolve7 } from "path";
 var ResourceRegistryError = class extends Error {
   code;
   constructor(code, message) {
@@ -6989,7 +7340,7 @@ async function loadDirectoryValues(kind, directory, sourceId) {
   if (rootInfo.isFile()) {
     targets.push(root);
   } else if (rootInfo.isDirectory()) {
-    const markerAtRoot = join4(root, marker);
+    const markerAtRoot = join5(root, marker);
     try {
       const markerInfo = await stat3(markerAtRoot);
       if (markerInfo.isFile()) targets.push(markerAtRoot);
@@ -7011,7 +7362,7 @@ async function loadDirectoryValues(kind, directory, sourceId) {
       }
       for (const entry of entries.sort((left, right) => left.name.localeCompare(right.name))) {
         if (!entry.isDirectory()) continue;
-        const target = join4(root, entry.name, marker);
+        const target = join5(root, entry.name, marker);
         try {
           const targetInfo = await stat3(target);
           if (targetInfo.isFile()) targets.push(target);
@@ -7267,7 +7618,7 @@ async function spillLargeToolResult(result, archiveDir, toolName) {
   await mkdir2(toolDir, { recursive: true, mode: 448 });
   await chmod2(toolDir, 448).catch(() => void 0);
   const safeToolName = toolName.replace(/[^a-zA-Z0-9._-]+/g, "_");
-  const path = join5(toolDir, `rowan-${safeToolName}-${Date.now()}-${randomUUID()}.log`);
+  const path = join6(toolDir, `rowan-${safeToolName}-${Date.now()}-${randomUUID()}.log`);
   await writeFile2(path, serialized, { encoding: "utf8", mode: 384 });
   await chmod2(path, 384).catch(() => void 0);
   const preview = new TextDecoder().decode(bytes.subarray(0, MAX_INLINE_TOOL_RESULT_BYTES));
@@ -7364,6 +7715,9 @@ var AgentRuntime = class _AgentRuntime {
       await options.bootstrap?.(runtime.resources);
       runtime.startHeartbeat();
       void runtime.pump();
+      if (options.sessionFiles) {
+        await startSessionFilesConsumer(runtime, options.sessionFiles);
+      }
       return runtime;
     } catch (error) {
       await runtime.resources.closeExtensions().catch(() => void 0);
@@ -8108,7 +8462,7 @@ var AgentRuntime = class _AgentRuntime {
         onContext: assembly.setContext,
         runtime: {
           interact: (request) => this.liveInteract(run.id, request, controller.signal),
-          tools: ({ toolCall, contentBlocks, driver, options, providerInitiated }) => {
+          tools: ({ toolCall, contentBlocks, driver, options, providerInitiated, model: callModel, usage: callUsage }) => {
             const task = toolQueue.then(async () => {
               if (!providerInitiated) {
                 const execution = await this.executeToolBatch({
@@ -8122,6 +8476,8 @@ var AgentRuntime = class _AgentRuntime {
                   signal: controller.signal,
                   driver,
                   options,
+                  model: callModel ?? model,
+                  usage: callUsage,
                   onRevision: (rev) => {
                     executionRevision = rev;
                   }
@@ -8146,6 +8502,8 @@ var AgentRuntime = class _AgentRuntime {
                       options,
                       providerInitiated: true,
                       interactionIds,
+                      model: callModel ?? model,
+                      usage: callUsage,
                       onRevision: (rev) => {
                         executionRevision = rev;
                       }
@@ -8236,7 +8594,7 @@ var AgentRuntime = class _AgentRuntime {
             toolQueue = task.then(() => void 0, () => void 0);
             return task;
           },
-          toolsBatch: ({ toolCalls, contentBlocks, driver, options }) => {
+          toolsBatch: ({ toolCalls, contentBlocks, driver, options, model: batchModel, usage: batchUsage }) => {
             const task = toolQueue.then(async () => {
               const execution = await this.executeToolBatch({
                 run,
@@ -8249,6 +8607,8 @@ var AgentRuntime = class _AgentRuntime {
                 signal: controller.signal,
                 driver,
                 options,
+                model: batchModel ?? model,
+                usage: batchUsage,
                 onRevision: (rev) => {
                   executionRevision = rev;
                 }
@@ -8476,6 +8836,8 @@ var AgentRuntime = class _AgentRuntime {
           expectedRevision: revision,
           requestMessageId: createId("msg"),
           contentBlocks: input.contentBlocks,
+          ...input.model ? { model: input.model } : {},
+          ...input.usage ? { usage: input.usage } : {},
           calls: input.toolCalls.map((tc, i) => ({
             toolCallId: toolCallIds[i],
             providerToolCallId: tc.id,
@@ -8611,6 +8973,8 @@ var AgentRuntime = class _AgentRuntime {
             expectedRevision: revision,
             requestMessageId: createId("msg"),
             contentBlocks: input.contentBlocks,
+            ...input.model ? { model: input.model } : {},
+            ...input.usage ? { usage: input.usage } : {},
             calls: [{
               toolCallId,
               providerToolCallId,
@@ -8708,6 +9072,8 @@ var AgentRuntime = class _AgentRuntime {
                 expectedRevision: revision,
                 requestMessageId: createId("msg"),
                 contentBlocks: input.contentBlocks,
+                ...input.model ? { model: input.model } : {},
+                ...input.usage ? { usage: input.usage } : {},
                 calls: [{
                   toolCallId,
                   providerToolCallId,
@@ -8729,6 +9095,8 @@ var AgentRuntime = class _AgentRuntime {
                 expectedRevision: revision,
                 requestMessageId: createId("msg"),
                 contentBlocks: input.contentBlocks,
+                ...input.model ? { model: input.model } : {},
+                ...input.usage ? { usage: input.usage } : {},
                 calls: [{
                   toolCallId,
                   providerToolCallId,
@@ -8783,6 +9151,8 @@ var AgentRuntime = class _AgentRuntime {
             expectedRevision: revision,
             requestMessageId: createId("msg"),
             contentBlocks: input.contentBlocks,
+            ...input.model ? { model: input.model } : {},
+            ...input.usage ? { usage: input.usage } : {},
             calls: [{
               toolCallId,
               providerToolCallId,
@@ -8832,6 +9202,8 @@ var AgentRuntime = class _AgentRuntime {
             expectedRevision: revision,
             requestMessageId: createId("msg"),
             contentBlocks: input.contentBlocks,
+            ...input.model ? { model: input.model } : {},
+            ...input.usage ? { usage: input.usage } : {},
             calls: [{
               toolCallId,
               providerToolCallId,
@@ -9156,7 +9528,7 @@ ${content}`;
   archiveDirFor(agentId) {
     const store = this.owned;
     const archiveDir = store.contextArchiveDir?.(agentId);
-    return archiveDir ? join5(archiveDir, "tool-results") : void 0;
+    return archiveDir ? join6(archiveDir, "tool-results") : void 0;
   }
   async runConsumer(subscription) {
     const registration = await this.owned.openConsumer(subscription.consumerId);
@@ -10314,6 +10686,8 @@ var InMemoryStore = class _InMemoryStore {
       execution: input.execution,
       expectedRevision: input.expectedRevision,
       requestMessageId: input.requestMessageId,
+      ...input.model ? { model: input.model } : {},
+      ...input.usage ? { usage: input.usage } : {},
       calls: [{
         providerToolCallId,
         name: input.name,
@@ -10345,7 +10719,9 @@ var InMemoryStore = class _InMemoryStore {
       input.execution.executionId,
       input.requestMessageId,
       input.calls,
-      input.contentBlocks ?? null
+      input.contentBlocks ?? null,
+      input.model ?? null,
+      input.usage ?? null
     ]);
     const replay = this.replayOperation(operationKey, operationPayload);
     if (replay) return clone(replay);
@@ -10387,7 +10763,9 @@ var InMemoryStore = class _InMemoryStore {
       role: "assistant",
       content: requestMessageContent(toolCalls, input.contentBlocks),
       sequenceWithinRun: this.nextMessageSequence(run.id),
-      createdAt: timestamp
+      createdAt: timestamp,
+      ...input.model ? { model: input.model } : {},
+      ...input.usage ? { usage: input.usage } : {}
     };
     for (const toolCall of toolCalls) this.storeToolCall(toolCall);
     this.storeMessage(requestMessage);
@@ -11439,8 +11817,8 @@ function requestMessageContent(toolCalls, contentBlocks) {
 
 // src/runtime/sqlite-durable-store.ts
 import { Database } from "bun:sqlite";
-import { appendFileSync, chmodSync, mkdirSync, readFileSync as readFileSync2, rmSync } from "fs";
-import { dirname as dirname7, join as join6, resolve as resolve8 } from "path";
+import { appendFileSync as appendFileSync2, chmodSync as chmodSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync3, rmSync } from "fs";
+import { dirname as dirname8, join as join7, resolve as resolve8 } from "path";
 import { tmpdir as tmpdir2 } from "os";
 var SCHEMA_ID = "rowan.agent.runtime";
 var SCHEMA_VERSION = "2";
@@ -11661,7 +12039,7 @@ var SqliteStore = class {
   stmtUpdateState;
   constructor(filename = ":memory:") {
     this.database = new Database(filename, { create: true, readwrite: true, strict: true });
-    this.archiveRoot = filename === ":memory:" ? join6(tmpdir2(), `rowan-context-archives-${crypto.randomUUID()}`) : join6(dirname7(resolve8(filename)), "context-archives");
+    this.archiveRoot = filename === ":memory:" ? join7(tmpdir2(), `rowan-context-archives-${crypto.randomUUID()}`) : join7(dirname8(resolve8(filename)), "context-archives");
   }
   async openOwner(input) {
     this.assertOpen();
@@ -11755,7 +12133,7 @@ var SqliteStore = class {
   }
   /** Filesystem location owned by this Store for one Agent's readable archive. */
   contextArchiveDir(agentId) {
-    return join6(this.archiveRoot, String(agentId));
+    return join7(this.archiveRoot, String(agentId));
   }
   async reserveAgent(lease, input) {
     return this.invoke(lease, (store, current) => store.reserveAgent(current, input));
@@ -12351,7 +12729,7 @@ var SqliteStore = class {
   mirrorChanges(tracker) {
     for (const agentId of tracker.deletedAgentIds) {
       const idStr = String(agentId);
-      rmSync(join6(this.archiveRoot, idStr), { recursive: true, force: true });
+      rmSync(join7(this.archiveRoot, idStr), { recursive: true, force: true });
       this.mirroredEventIds.delete(idStr);
       this.mirroredCompactionIds.delete(idStr);
       this.mirroredAgents.delete(idStr);
@@ -12359,15 +12737,15 @@ var SqliteStore = class {
     for (const agent of tracker.upsertedAgents.values()) {
       const idStr = String(agent.id);
       this.mirroredAgents.add(idStr);
-      const archiveDir = join6(this.archiveRoot, idStr);
-      const toolDir = join6(archiveDir, "tool-results");
-      mkdirSync(toolDir, { recursive: true, mode: 448 });
-      chmodSync(archiveDir, 448);
-      chmodSync(toolDir, 448);
+      const archiveDir = join7(this.archiveRoot, idStr);
+      const toolDir = join7(archiveDir, "tool-results");
+      mkdirSync2(toolDir, { recursive: true, mode: 448 });
+      chmodSync2(archiveDir, 448);
+      chmodSync2(toolDir, 448);
     }
     if (tracker.appendedEvents.length > 0) {
-      mkdirSync(this.archiveRoot, { recursive: true, mode: 448 });
-      chmodSync(this.archiveRoot, 448);
+      mkdirSync2(this.archiveRoot, { recursive: true, mode: 448 });
+      chmodSync2(this.archiveRoot, 448);
       const eventsByAgent = /* @__PURE__ */ new Map();
       for (const event of tracker.appendedEvents) {
         const agentId = String(event.agentId);
@@ -12379,22 +12757,22 @@ var SqliteStore = class {
         list.push(event);
       }
       for (const [agentId, events] of eventsByAgent) {
-        const archiveDir = join6(this.archiveRoot, agentId);
-        const toolDir = join6(archiveDir, "tool-results");
-        mkdirSync(toolDir, { recursive: true, mode: 448 });
-        chmodSync(archiveDir, 448);
-        chmodSync(toolDir, 448);
-        const sessionPath = join6(archiveDir, "session.jsonl");
+        const archiveDir = join7(this.archiveRoot, agentId);
+        const toolDir = join7(archiveDir, "tool-results");
+        mkdirSync2(toolDir, { recursive: true, mode: 448 });
+        chmodSync2(archiveDir, 448);
+        chmodSync2(toolDir, 448);
+        const sessionPath = join7(archiveDir, "session.jsonl");
         try {
-          chmodSync(sessionPath, 384);
+          chmodSync2(sessionPath, 384);
         } catch {
         }
         const known = this.mirroredEventIds.get(agentId) ?? /* @__PURE__ */ new Set();
         const newEvents = events.filter((e) => !known.has(String(e.id)));
         if (newEvents.length > 0) {
           const lines = newEvents.map((e) => JSON.stringify({ schemaVersion: 1, kind: "rowan_event", event: e }) + "\n").join("");
-          appendFileSync(sessionPath, lines, { encoding: "utf8", mode: 384 });
-          chmodSync(sessionPath, 384);
+          appendFileSync2(sessionPath, lines, { encoding: "utf8", mode: 384 });
+          chmodSync2(sessionPath, 384);
           for (const e of newEvents) known.add(String(e.id));
           this.mirroredEventIds.set(agentId, known);
         }
@@ -12403,13 +12781,13 @@ var SqliteStore = class {
     if (tracker.upsertedContextCompactions.size > 0) {
       for (const [agentId, record] of tracker.upsertedContextCompactions) {
         const idStr = String(agentId);
-        const archiveDir = join6(this.archiveRoot, idStr);
-        const sessionPath = join6(archiveDir, "session.jsonl");
+        const archiveDir = join7(this.archiveRoot, idStr);
+        const sessionPath = join7(archiveDir, "session.jsonl");
         const knownCompactions = this.mirroredCompactionIds.get(idStr) ?? /* @__PURE__ */ new Set();
         if (!knownCompactions.has(record.id)) {
           const line = JSON.stringify({ schemaVersion: 1, kind: "context_compacted", record }) + "\n";
-          appendFileSync(sessionPath, line, { encoding: "utf8", mode: 384 });
-          chmodSync(sessionPath, 384);
+          appendFileSync2(sessionPath, line, { encoding: "utf8", mode: 384 });
+          chmodSync2(sessionPath, 384);
           knownCompactions.add(record.id);
           this.mirroredCompactionIds.set(idStr, knownCompactions);
         }
@@ -12418,32 +12796,32 @@ var SqliteStore = class {
   }
   /** Append the semantic durable event mirror and remove deleted Agent sidecars. */
   mirrorInitialState(state) {
-    mkdirSync(this.archiveRoot, { recursive: true, mode: 448 });
-    chmodSync(this.archiveRoot, 448);
+    mkdirSync2(this.archiveRoot, { recursive: true, mode: 448 });
+    chmodSync2(this.archiveRoot, 448);
     const currentAgents = new Set(state.agents.map((agent) => String(agent.id)));
     for (const agentId of this.mirroredAgents) {
       if (currentAgents.has(agentId)) continue;
-      rmSync(join6(this.archiveRoot, agentId), { recursive: true, force: true });
+      rmSync(join7(this.archiveRoot, agentId), { recursive: true, force: true });
       this.mirroredEventIds.delete(agentId);
       this.mirroredCompactionIds.delete(agentId);
     }
     for (const agent of state.agents) {
       const agentId = String(agent.id);
-      const archiveDir = join6(this.archiveRoot, agentId);
-      const toolDir = join6(archiveDir, "tool-results");
-      mkdirSync(toolDir, { recursive: true, mode: 448 });
-      chmodSync(archiveDir, 448);
-      chmodSync(toolDir, 448);
-      const sessionPath = join6(archiveDir, "session.jsonl");
+      const archiveDir = join7(this.archiveRoot, agentId);
+      const toolDir = join7(archiveDir, "tool-results");
+      mkdirSync2(toolDir, { recursive: true, mode: 448 });
+      chmodSync2(archiveDir, 448);
+      chmodSync2(toolDir, 448);
+      const sessionPath = join7(archiveDir, "session.jsonl");
       try {
-        chmodSync(sessionPath, 384);
+        chmodSync2(sessionPath, 384);
       } catch {
       }
       const known = this.mirroredEventIds.get(agentId) ?? /* @__PURE__ */ new Set();
       const knownCompactions = this.mirroredCompactionIds.get(agentId) ?? /* @__PURE__ */ new Set();
       if (known.size === 0 || knownCompactions.size === 0) {
         try {
-          for (const line of readFileSync2(sessionPath, "utf8").split("\n")) {
+          for (const line of readFileSync3(sessionPath, "utf8").split("\n")) {
             if (!line.trim()) continue;
             const parsed = JSON.parse(line);
             if (parsed.event?.id) known.add(parsed.event.id);
@@ -12454,16 +12832,16 @@ var SqliteStore = class {
       }
       const lines = state.events.filter((event) => String(event.agentId) === agentId && !known.has(String(event.id))).map((event) => JSON.stringify({ schemaVersion: 1, kind: "rowan_event", event }) + "\n");
       if (lines.length > 0) {
-        appendFileSync(sessionPath, lines.join(""), { encoding: "utf8", mode: 384 });
-        chmodSync(sessionPath, 384);
+        appendFileSync2(sessionPath, lines.join(""), { encoding: "utf8", mode: 384 });
+        chmodSync2(sessionPath, 384);
         for (const event of state.events) {
           if (String(event.agentId) === agentId) known.add(String(event.id));
         }
       }
       const compactionLines = (state.contextCompactions ?? []).filter(([candidateId, record]) => String(candidateId) === agentId && !knownCompactions.has(record.id)).map(([, record]) => JSON.stringify({ schemaVersion: 1, kind: "context_compacted", record }) + "\n");
       if (compactionLines.length > 0) {
-        appendFileSync(sessionPath, compactionLines.join(""), { encoding: "utf8", mode: 384 });
-        chmodSync(sessionPath, 384);
+        appendFileSync2(sessionPath, compactionLines.join(""), { encoding: "utf8", mode: 384 });
+        chmodSync2(sessionPath, 384);
         for (const [, record] of state.contextCompactions ?? []) {
           if (String(record.agentId) === agentId) knownCompactions.add(record.id);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rowan-agent/agent",
-  "version": "0.20.2",
+  "version": "0.21.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -23,7 +23,7 @@
     "build": "tsup && bun scripts/check-public-interface.ts"
   },
   "dependencies": {
-    "@rowan-agent/models": "0.9.0",
+    "@rowan-agent/models": "0.10.0",
     "jiti": "2.7.0",
     "typebox": "^1.0.0",
     "yaml": "^2.7.0"