@deepagents/context 7.0.2 → 7.1.0

package/dist/index.js

@@ -163,6 +163,23 @@ import { generateId } from "ai";
 function isFragment(data) {
   return typeof data === "object" && data !== null && "name" in data && ("data" in data || "codec" in data) && typeof data.name === "string";
 }
+function isFragmentData(value) {
+  return fitsFragmentData(value, /* @__PURE__ */ new WeakSet());
+}
+function fitsFragmentData(value, visited) {
+  if (typeof value !== "object") {
+    return typeof value !== "bigint" && typeof value !== "symbol";
+  }
+  if (value === null || visited.has(value)) return true;
+  visited.add(value);
+  if (Array.isArray(value)) {
+    return value.every((item) => fitsFragmentData(item, visited));
+  }
+  if (value instanceof Promise) return true;
+  if (Symbol.asyncIterator in value || Symbol.iterator in value) return true;
+  if (isFragment(value)) return fitsFragmentData(value.data, visited);
+  return Object.values(value).every((item) => fitsFragmentData(item, visited));
+}
 function isFragmentObject(data) {
   if (typeof data !== "object" || data === null) return false;
   if (Array.isArray(data)) return false;
@@ -176,7 +193,13 @@ function isMessageFragment(fragment2) {
 }
 function getFragmentData(fragment2) {
   if (fragment2.codec) {
-    return fragment2.codec.decode();
+    const decoded = fragment2.codec.decode();
+    if (!isFragmentData(decoded)) {
+      throw new Error(
+        `Fragment "${fragment2.name}" codec decoded a value that is not fragment data`
+      );
+    }
+    return decoded;
   }
   if ("data" in fragment2) {
     return fragment2.data;
@@ -407,9 +430,6 @@ var Agent = class _Agent {
    *
    * // With guardrails - use toUIMessageStream for protection
    * await printer.readableStream(stream.toUIMessageStream());
-   *
-   * // Or use printer.stdout which uses toUIMessageStream internally
-   * await printer.stdout(stream);
    * ```
    */
   async stream(...[options]) {
@@ -485,13 +505,11 @@ var Agent = class _Agent {
       }),
       repairToolCall: createRepairToolCall(model, config?.abortSignal),
       stopWhen: this.#options.stopWhen ?? DEFAULT_STOP_WHEN,
-      // Streaming erases the tool-set type; the callback still receives this.tools.
       prepareStep: prepareStep ?? context.createPrepareStep({
         sandbox: this.#options.sandbox
       }),
       experimental_transform: config?.transform ?? smoothStream(),
       tools: this.tools,
-      // Generic wrappers cannot reduce AI SDK's conditional context or caller maps.
       toolsContext,
       experimental_toolCallers: this.#options.experimental_toolCallers,
       toolChoice: this.#options.toolChoice
@@ -610,7 +628,7 @@ var Agent = class _Agent {
     return result;
   }
   asTool(props) {
-    const definition = {
+    return {
       description: props?.toolDescription || `Delegate to the ${this.#options.name} agent to handle the request.`,
       metadata: props?.metadata,
       toModelOutput: props?.toModelOutput,
@@ -660,7 +678,6 @@ ${details}
         }
       }
     };
-    return tool(definition);
   }
   asAdvisor(options) {
     const maxUses = options?.maxUses;
@@ -735,7 +752,7 @@ function agent(options) {
   return new Agent(options);
 }
 function structuredOutput(options) {
-  const tools = withHostOnlyToolMetadata({ ...options.tools });
+  const tools = options.tools === void 0 ? void 0 : withHostOnlyToolMetadata(options.tools);
   return {
     async generate(...[callOptions]) {
       if (!options.context) {
@@ -807,8 +824,7 @@ function chunkId(chunk) {
   if (typeof chunk !== "object" || chunk === null || !("id" in chunk)) {
     return void 0;
   }
-  const { id } = chunk;
-  return typeof id === "string" ? id : void 0;
+  return typeof chunk.id === "string" ? chunk.id : void 0;
 }
 function writeText(writer, text, openPartId) {
   const feedbackPartId = openPartId ?? generateId3();
@@ -839,18 +855,6 @@ import {
   isToolUIPart
 } from "ai";
 
-// packages/context/src/lib/title.ts
-import { z as z2 } from "zod";
-
-// packages/context/src/lib/engine.ts
-import { getErrorMessage } from "@ai-sdk/provider";
-import {
-  convertToModelMessages as convertToModelMessages2,
-  generateId as generateId5,
-  isStaticToolUIPart as isStaticToolUIPart2,
-  validateUIMessages
-} from "ai";
-
 // packages/context/src/lib/fragments/reminders/src/reminders.ts
 import { generateId as generateId4 } from "ai";
 
@@ -2250,8 +2254,7 @@ function toolCall(options) {
       }
       if (options.output) {
         if (part.state !== "output-available") return false;
-        if (!options.output(part.output))
-          return false;
+        if (!options.output(part.output)) return false;
       }
       if (options.errorText) {
         if (part.state !== "output-error") return false;
@@ -2633,6 +2636,18 @@ function temporalReminder(options) {
   ];
 }
 
+// packages/context/src/lib/title.ts
+import { z as z5 } from "zod";
+
+// packages/context/src/lib/engine.ts
+import { getErrorMessage } from "@ai-sdk/provider";
+import {
+  convertToModelMessages as convertToModelMessages2,
+  generateId as generateId5,
+  isStaticToolUIPart as isStaticToolUIPart2,
+  validateUIMessages
+} from "ai";
+
 // packages/context/src/lib/ui-message-guards.ts
 function isRecord2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
@@ -2714,7 +2729,7 @@ var ChainSummaryBuilder = class {
     this.#messageCount++;
     if (fragment2.name !== "user") return;
     const encoded = fragment2.codec?.encode();
-    if (encoded && isSyntheticReminderMessage(encoded)) return;
+    if (isUIMessage(encoded) && isSyntheticReminderMessage(encoded)) return;
     this.#turn++;
   }
   build() {
@@ -2733,6 +2748,7 @@ var ChainSummaryBuilder = class {
 
 // packages/context/src/lib/estimate.ts
 import { encode } from "gpt-tokenizer";
+import { z as z2 } from "zod";
 var defaultTokenizer = {
   encode(text) {
     return encode(text);
@@ -2741,6 +2757,36 @@ var defaultTokenizer = {
     return encode(text).length;
   }
 };
+var modelCostSchema = z2.object({
+  input: z2.number(),
+  output: z2.number(),
+  cache_read: z2.number().optional(),
+  cache_write: z2.number().optional(),
+  reasoning: z2.number().optional()
+});
+var modelsDevResponseSchema = z2.record(
+  z2.string(),
+  z2.object({
+    models: z2.record(
+      z2.string(),
+      z2.object({
+        id: z2.string(),
+        name: z2.string(),
+        family: z2.string().optional(),
+        cost: modelCostSchema.optional(),
+        limit: z2.object({ context: z2.number(), output: z2.number() })
+      })
+    )
+  })
+);
+function inputPricePerMillion(model) {
+  if (!model.cost) {
+    throw new Error(
+      `Model "${model.provider}:${model.id}" has no pricing data on models.dev`
+    );
+  }
+  return model.cost.input;
+}
 var ModelsRegistry = class {
   #cache = /* @__PURE__ */ new Map();
   #loaded = false;
@@ -2755,7 +2801,7 @@ var ModelsRegistry = class {
     if (!response.ok) {
       throw new Error(`Failed to fetch models: ${response.statusText}`);
     }
-    const data = await response.json();
+    const data = modelsDevResponseSchema.parse(await response.json());
     for (const [providerId, provider] of Object.entries(data)) {
       for (const [modelId, model] of Object.entries(provider.models)) {
         const info = {
@@ -2808,14 +2854,9 @@ var ModelsRegistry = class {
    * Get the appropriate tokenizer for a model
    */
   getTokenizer(modelId) {
-    const model = this.get(modelId);
-    if (model) {
-      const familyTokenizer = this.#tokenizers.get(model.family);
-      if (familyTokenizer) {
-        return familyTokenizer;
-      }
-    }
-    return this.#defaultTokenizer;
+    const family = this.get(modelId)?.family;
+    const familyTokenizer = family === void 0 ? void 0 : this.#tokenizers.get(family);
+    return familyTokenizer ?? this.#defaultTokenizer;
   }
   /**
    * Estimate token count and cost for given text and model
@@ -2829,9 +2870,10 @@ var ModelsRegistry = class {
         `Model "${modelId}" not found. Call load() first or check model ID.`
       );
     }
+    const inputPrice = inputPricePerMillion(model);
     const tokenizer = this.getTokenizer(modelId);
     const tokens = tokenizer.count(input);
-    const cost = tokens / 1e6 * model.cost.input;
+    const cost = tokens / 1e6 * inputPrice;
     return {
       model: model.id,
       provider: model.provider,
@@ -2846,12 +2888,9 @@ var ModelsRegistry = class {
     };
   }
 };
-var _registry = null;
+var sharedRegistry = new ModelsRegistry();
 function getModelsRegistry() {
-  if (!_registry) {
-    _registry = new ModelsRegistry();
-  }
-  return _registry;
+  return sharedRegistry;
 }
 async function estimate(modelId, renderer, ...fragments) {
   const registry = getModelsRegistry();
@@ -2863,13 +2902,14 @@ async function estimate(modelId, renderer, ...fragments) {
       `Model "${modelId}" not found. Call load() first or check model ID.`
     );
   }
+  const inputPrice = inputPricePerMillion(model);
   const tokenizer = registry.getTokenizer(modelId);
   const totalTokens = tokenizer.count(input);
-  const totalCost = totalTokens / 1e6 * model.cost.input;
+  const totalCost = totalTokens / 1e6 * inputPrice;
   const fragmentEstimates = fragments.map((fragment2) => {
     const rendered = renderer.render([fragment2]);
     const tokens = tokenizer.count(rendered);
-    const cost = tokens / 1e6 * model.cost.input;
+    const cost = tokens / 1e6 * inputPrice;
     return {
       id: fragment2.id,
       name: fragment2.name,
@@ -2898,7 +2938,10 @@ var AsyncResolver = class {
   canResolve(value) {
     return typeof value === "function" && value.constructor.name === "AsyncFunction";
   }
-  resolve(value, ctx) {
+  async resolve(value, ctx) {
+    if (!this.canResolve(value)) {
+      throw new TypeError(`${this.name} cannot resolve a ${typeof value}`);
+    }
     return value(ctx);
   }
 };
@@ -2911,8 +2954,10 @@ var FunctionResolver = class {
     return typeof value === "function";
   }
   async resolve(value, ctx) {
-    const loader = value;
-    return loader(ctx);
+    if (!this.canResolve(value)) {
+      throw new TypeError(`${this.name} cannot resolve a ${typeof value}`);
+    }
+    return value(ctx);
   }
 };
 
@@ -2933,6 +2978,9 @@ var GeneratorResolver = class {
     return typeof value === "function" && GENERATOR_CTOR_NAMES.has(value.constructor.name);
   }
   async resolve(value, ctx) {
+    if (!this.canResolve(value)) {
+      throw new TypeError(`${this.name} cannot resolve a ${typeof value}`);
+    }
     const iterable = value(ctx);
     const collected = [];
     if (isAsyncIterable(iterable)) {
@@ -2983,14 +3031,16 @@ var IterableResolver = class {
     return hasIterableProtocol(value);
   }
   async resolve(value, _ctx) {
-    const iterable = value;
+    if (!this.canResolve(value)) {
+      throw new TypeError(`${this.name} cannot resolve a ${typeof value}`);
+    }
     const collected = [];
-    if (isAsyncIterable2(iterable)) {
-      for await (const chunk of iterable) {
+    if (isAsyncIterable2(value)) {
+      for await (const chunk of value) {
         pushLimited2(collected, chunk, this.#maxItems, this.name);
       }
     } else {
-      for (const chunk of iterable) {
+      for (const chunk of value) {
         pushLimited2(collected, chunk, this.#maxItems, this.name);
       }
     }
@@ -3015,7 +3065,10 @@ var PromiseResolver = class {
   canResolve(value) {
     return value instanceof Promise;
   }
-  resolve(value, _ctx) {
+  async resolve(value, _ctx) {
+    if (!this.canResolve(value)) {
+      throw new TypeError(`${this.name} cannot resolve a ${typeof value}`);
+    }
     return value;
   }
 };
@@ -3035,13 +3088,19 @@ var FragmentLoaderResolver = class {
   }
   async #walkFragment(fragment2, ctx, depth, ancestors, path6) {
     if (!("data" in fragment2)) return;
-    fragment2.data = await this.#walkData(
+    const data = await this.#walkData(
       fragment2.data,
       ctx,
       depth,
       ancestors,
       path6
     );
+    if (!isFragmentData(data)) {
+      throw new Error(
+        `Fragment '${path6}' resolved to a value that is not fragment data`
+      );
+    }
+    fragment2.data = data;
   }
   async #walkData(value, ctx, depth, ancestors, path6) {
     if (ctx.signal?.aborted) {
@@ -3265,6 +3324,18 @@ var SavePipeline = class _SavePipeline {
 
 // packages/context/src/lib/store/sqlite.store.ts
 import { DatabaseSync } from "node:sqlite";
+import { z as z4 } from "zod";
+
+// packages/context/src/lib/store/columns.ts
+import { z as z3 } from "zod";
+var bigintColumn = z3.union([z3.number(), z3.string().regex(/^-?\d+$/)]).transform(Number);
+var jsonObject = z3.record(z3.string(), z3.unknown());
+function parseJson(text) {
+  return JSON.parse(text);
+}
+function parseJsonObject(text) {
+  return jsonObject.parse(parseJson(text));
+}
 
 // packages/context/src/lib/store/ddl.sqlite.sql
 var ddl_sqlite_default = "-- Context Store DDL for SQLite\n-- This schema implements a DAG-based message history with branching and checkpoints.\n\n-- Performance PRAGMAs (session-level, run on each connection)\nPRAGMA journal_mode = WAL;\nPRAGMA synchronous = NORMAL;\nPRAGMA cache_size = -64000;\nPRAGMA temp_store = MEMORY;\nPRAGMA mmap_size = 268435456;\nPRAGMA busy_timeout = 5000;\n\n-- Integrity\nPRAGMA foreign_keys = ON;\n\n-- Chats table\n-- createdAt/updatedAt: DEFAULT for insert, inline SET for updates\nCREATE TABLE IF NOT EXISTS chats (\n  id TEXT PRIMARY KEY,\n  userId TEXT NOT NULL,\n  title TEXT,\n  metadata TEXT,\n  createdAt INTEGER NOT NULL DEFAULT (strftime('%s', 'now') * 1000),\n  updatedAt INTEGER NOT NULL DEFAULT (strftime('%s', 'now') * 1000)\n);\n\nCREATE INDEX IF NOT EXISTS idx_chats_updatedAt ON chats(updatedAt);\nCREATE INDEX IF NOT EXISTS idx_chats_userId ON chats(userId);\n-- Composite index for listChats(): WHERE userId = ? ORDER BY updatedAt DESC\nCREATE INDEX IF NOT EXISTS idx_chats_userId_updatedAt ON chats(userId, updatedAt DESC);\n\n-- Messages table (nodes in the DAG)\nCREATE TABLE IF NOT EXISTS messages (\n  id TEXT PRIMARY KEY,\n  chatId TEXT NOT NULL,\n  parentId TEXT,\n  name TEXT NOT NULL,\n  type TEXT,\n  data TEXT NOT NULL,\n  createdAt INTEGER NOT NULL,\n  FOREIGN KEY (chatId) REFERENCES chats(id) ON DELETE CASCADE,\n  FOREIGN KEY (parentId) REFERENCES messages(id)\n);\n\nCREATE INDEX IF NOT EXISTS idx_messages_chatId ON messages(chatId);\nCREATE INDEX IF NOT EXISTS idx_messages_parentId ON messages(parentId);\n-- Composite index for recursive CTE parent traversal in getMessageChain()\nCREATE INDEX IF NOT EXISTS idx_messages_chatId_parentId ON messages(chatId, parentId);\n\n-- Branches table (pointers to head messages)\nCREATE TABLE IF NOT EXISTS branches (\n  id TEXT PRIMARY KEY,\n  chatId TEXT NOT NULL,\n  name TEXT NOT NULL,\n  headMessageId TEXT,\n  isActive INTEGER NOT NULL DEFAULT 0,\n  createdAt INTEGER NOT NULL,\n  FOREIGN KEY (chatId) REFERENCES chats(id) ON DELETE CASCADE,\n  FOREIGN KEY (headMessageId) REFERENCES messages(id),\n  UNIQUE(chatId, name)\n);\n\nCREATE INDEX IF NOT EXISTS idx_branches_chatId ON branches(chatId);\n-- Composite index for getActiveBranch(): WHERE chatId = ? AND isActive = 1\nCREATE INDEX IF NOT EXISTS idx_branches_chatId_isActive ON branches(chatId, isActive);\n\n-- Checkpoints table (pointers to message nodes)\nCREATE TABLE IF NOT EXISTS checkpoints (\n  id TEXT PRIMARY KEY,\n  chatId TEXT NOT NULL,\n  name TEXT NOT NULL,\n  messageId TEXT NOT NULL,\n  createdAt INTEGER NOT NULL,\n  FOREIGN KEY (chatId) REFERENCES chats(id) ON DELETE CASCADE,\n  FOREIGN KEY (messageId) REFERENCES messages(id),\n  UNIQUE(chatId, name)\n);\n\nCREATE INDEX IF NOT EXISTS idx_checkpoints_chatId ON checkpoints(chatId);\n\n-- FTS5 virtual table for full-text search\n-- messageId/chatId/name are UNINDEXED (stored but not searchable, used for filtering/joining)\n-- Only 'content' is indexed for full-text search\nCREATE VIRTUAL TABLE IF NOT EXISTS messages_fts USING fts5(\n  messageId UNINDEXED,\n  chatId UNINDEXED,\n  name UNINDEXED,\n  content,\n  tokenize='porter unicode61'\n);\n";
@@ -3286,6 +3357,121 @@ var ContextStore = class {
 };
 
 // packages/context/src/lib/store/sqlite.store.ts
+var chatColumns = z4.object({
+  id: z4.string(),
+  userId: z4.string(),
+  title: z4.string().nullable(),
+  metadata: z4.string().nullable(),
+  createdAt: z4.number(),
+  updatedAt: z4.number()
+});
+var storedChat = chatColumns.transform(toStoredChat);
+var chatInfo = chatColumns.extend({ messageCount: z4.number(), branchCount: z4.number() }).transform((row) => ({
+  ...toStoredChat(row),
+  messageCount: row.messageCount,
+  branchCount: row.branchCount
+}));
+var messageColumns = z4.object({
+  id: z4.string(),
+  chatId: z4.string(),
+  parentId: z4.string().nullable(),
+  name: z4.string(),
+  type: z4.string().nullable(),
+  data: z4.string(),
+  createdAt: z4.number()
+});
+var storedMessage = messageColumns.transform(toMessage);
+var searchResult = messageColumns.extend({ rank: z4.number(), snippet: z4.string() }).transform((row) => ({
+  message: toMessage(row),
+  rank: row.rank,
+  snippet: row.snippet
+}));
+var storedBranch = z4.object({
+  id: z4.string(),
+  chatId: z4.string(),
+  name: z4.string(),
+  headMessageId: z4.string().nullable(),
+  isActive: z4.number(),
+  createdAt: z4.number()
+}).transform((row) => ({
+  id: row.id,
+  chatId: row.chatId,
+  name: row.name,
+  headMessageId: row.headMessageId,
+  isActive: row.isActive === 1,
+  createdAt: row.createdAt
+}));
+var branchInfo = z4.object({
+  id: z4.string(),
+  name: z4.string(),
+  headMessageId: z4.string().nullable(),
+  isActive: z4.number(),
+  createdAt: z4.number(),
+  messageCount: z4.number()
+}).transform((row) => ({
+  id: row.id,
+  name: row.name,
+  headMessageId: row.headMessageId,
+  isActive: row.isActive === 1,
+  messageCount: row.messageCount,
+  createdAt: row.createdAt
+}));
+var storedCheckpoint = z4.object({
+  id: z4.string(),
+  chatId: z4.string(),
+  name: z4.string(),
+  messageId: z4.string(),
+  createdAt: z4.number()
+});
+var checkpointInfo = z4.object({
+  id: z4.string(),
+  name: z4.string(),
+  messageId: z4.string(),
+  createdAt: z4.number()
+});
+var idRow = z4.object({ id: z4.string() });
+var hasChildrenRow = z4.object({ hasChildren: z4.number() });
+var graphMessageRow = z4.object({
+  id: z4.string(),
+  parentId: z4.string().nullable(),
+  name: z4.string(),
+  data: z4.string(),
+  createdAt: z4.number()
+});
+var graphBranch = z4.object({
+  name: z4.string(),
+  headMessageId: z4.string().nullable(),
+  isActive: z4.number()
+}).transform((row) => ({
+  name: row.name,
+  headMessageId: row.headMessageId,
+  isActive: row.isActive === 1
+}));
+var graphCheckpoint = z4.object({
+  name: z4.string(),
+  messageId: z4.string()
+});
+function toStoredChat(row) {
+  return {
+    id: row.id,
+    userId: row.userId,
+    title: row.title ?? void 0,
+    metadata: row.metadata ? parseJsonObject(row.metadata) : void 0,
+    createdAt: row.createdAt,
+    updatedAt: row.updatedAt
+  };
+}
+function toMessage(row) {
+  return {
+    id: row.id,
+    chatId: row.chatId,
+    parentId: row.parentId,
+    name: row.name,
+    type: row.type ?? void 0,
+    data: parseJson(row.data),
+    createdAt: row.createdAt
+  };
+}
 var SqliteContextStore = class extends ContextStore {
   #db;
   #statements = /* @__PURE__ */ new Map();
@@ -3332,70 +3518,49 @@ var SqliteContextStore = class extends ContextStore {
   // ==========================================================================
   async createChat(chat2) {
     return this.#useTransaction(() => {
-      const row = this.#db.prepare(
-        `INSERT INTO chats (id, userId, title, metadata)
+      const created = storedChat.parse(
+        this.#db.prepare(
+          `INSERT INTO chats (id, userId, title, metadata)
            VALUES (?, ?, ?, ?)
            RETURNING *`
-      ).get(
-        chat2.id,
-        chat2.userId,
-        chat2.title ?? null,
-        chat2.metadata ? JSON.stringify(chat2.metadata) : null
+        ).get(
+          chat2.id,
+          chat2.userId,
+          chat2.title ?? null,
+          chat2.metadata ? JSON.stringify(chat2.metadata) : null
+        )
       );
       this.#db.prepare(
         `INSERT INTO branches (id, chatId, name, headMessageId, isActive, createdAt)
            VALUES (?, ?, 'main', NULL, 1, ?)`
       ).run(crypto.randomUUID(), chat2.id, Date.now());
-      return {
-        id: row.id,
-        userId: row.userId,
-        title: row.title ?? void 0,
-        metadata: row.metadata ? JSON.parse(row.metadata) : void 0,
-        createdAt: row.createdAt,
-        updatedAt: row.updatedAt
-      };
+      return created;
     });
   }
   async upsertChat(chat2) {
     return this.#useTransaction(() => {
-      const row = this.#db.prepare(
-        `INSERT INTO chats (id, userId, title, metadata)
+      const upserted = storedChat.parse(
+        this.#db.prepare(
+          `INSERT INTO chats (id, userId, title, metadata)
            VALUES (?, ?, ?, ?)
            ON CONFLICT(id) DO UPDATE SET id = excluded.id
            RETURNING *`
-      ).get(
-        chat2.id,
-        chat2.userId,
-        chat2.title ?? null,
-        chat2.metadata ? JSON.stringify(chat2.metadata) : null
+        ).get(
+          chat2.id,
+          chat2.userId,
+          chat2.title ?? null,
+          chat2.metadata ? JSON.stringify(chat2.metadata) : null
+        )
       );
       this.#db.prepare(
         `INSERT OR IGNORE INTO branches (id, chatId, name, headMessageId, isActive, createdAt)
            VALUES (?, ?, 'main', NULL, 1, ?)`
       ).run(crypto.randomUUID(), chat2.id, Date.now());
-      return {
-        id: row.id,
-        userId: row.userId,
-        title: row.title ?? void 0,
-        metadata: row.metadata ? JSON.parse(row.metadata) : void 0,
-        createdAt: row.createdAt,
-        updatedAt: row.updatedAt
-      };
+      return upserted;
     });
   }
   #getChat(chatId) {
-    const row = this.#db.prepare("SELECT * FROM chats WHERE id = ?").get(chatId);
-    if (!row) {
-      return void 0;
-    }
-    return {
-      id: row.id,
-      userId: row.userId,
-      title: row.title ?? void 0,
-      metadata: row.metadata ? JSON.parse(row.metadata) : void 0,
-      createdAt: row.createdAt,
-      updatedAt: row.updatedAt
-    };
+    return storedChat.optional().parse(this.#db.prepare("SELECT * FROM chats WHERE id = ?").get(chatId));
   }
   async getChat(chatId) {
     return this.#getChat(chatId);
@@ -3419,17 +3584,11 @@ var SqliteContextStore = class extends ContextStore {
         params.push(JSON.stringify(updates.metadata));
       }
       params.push(chatId);
-      const row = this.#db.prepare(
-        `UPDATE chats SET ${setClauses.join(", ")} WHERE id = ? RETURNING *`
-      ).get(...params);
-      return {
-        id: row.id,
-        userId: row.userId,
-        title: row.title ?? void 0,
-        metadata: row.metadata ? JSON.parse(row.metadata) : void 0,
-        createdAt: row.createdAt,
-        updatedAt: row.updatedAt
-      };
+      return storedChat.parse(
+        this.#db.prepare(
+          `UPDATE chats SET ${setClauses.join(", ")} WHERE id = ? RETURNING *`
+        ).get(...params)
+      );
     }, "immediate");
   }
   async listChats(options) {
@@ -3456,8 +3615,9 @@ var SqliteContextStore = class extends ContextStore {
         params.push(options.offset);
       }
     }
-    const rows = this.#db.prepare(
-      `SELECT
+    return z4.array(chatInfo).parse(
+      this.#db.prepare(
+        `SELECT
           c.id,
           c.userId,
           c.title,
@@ -3472,21 +3632,14 @@ var SqliteContextStore = class extends ContextStore {
         ${whereClause}
         GROUP BY c.id
         ORDER BY c.updatedAt DESC${limitClause}`
-    ).all(...params);
-    return rows.map((row) => ({
-      id: row.id,
-      userId: row.userId,
-      title: row.title ?? void 0,
-      metadata: row.metadata ? JSON.parse(row.metadata) : void 0,
-      messageCount: row.messageCount,
-      branchCount: row.branchCount,
-      createdAt: row.createdAt,
-      updatedAt: row.updatedAt
-    }));
+      ).all(...params)
+    );
   }
   async deleteChat(chatId, options) {
     return this.#useTransaction(() => {
-      const messageIds = this.#db.prepare("SELECT id FROM messages WHERE chatId = ?").all(chatId);
+      const messageIds = z4.array(idRow).parse(
+        this.#db.prepare("SELECT id FROM messages WHERE chatId = ?").all(chatId)
+      );
       let sql = "DELETE FROM chats WHERE id = ?";
       const params = [chatId];
       if (options?.userId !== void 0) {
@@ -3556,25 +3709,12 @@ var SqliteContextStore = class extends ContextStore {
     }
   }
   async getMessage(messageId) {
-    const row = this.#stmt("SELECT * FROM messages WHERE id = ?").get(
-      messageId
-    );
-    if (!row) {
-      return void 0;
-    }
-    return {
-      id: row.id,
-      chatId: row.chatId,
-      parentId: row.parentId,
-      name: row.name,
-      type: row.type ?? void 0,
-      data: JSON.parse(row.data),
-      createdAt: row.createdAt
-    };
+    return storedMessage.optional().parse(this.#stmt("SELECT * FROM messages WHERE id = ?").get(messageId));
   }
   async getMessageChain(headId) {
-    const rows = this.#stmt(
-      `WITH RECURSIVE chain AS (
+    return z4.array(storedMessage).parse(
+      this.#stmt(
+        `WITH RECURSIVE chain AS (
         SELECT *, 0 as depth FROM messages WHERE id = ?
         UNION ALL
         SELECT m.*, c.depth + 1 FROM messages m
@@ -3583,21 +3723,15 @@ var SqliteContextStore = class extends ContextStore {
       )
       SELECT * FROM chain
       ORDER BY depth DESC`
-    ).all(headId);
-    return rows.map((row) => ({
-      id: row.id,
-      chatId: row.chatId,
-      parentId: row.parentId,
-      name: row.name,
-      type: row.type ?? void 0,
-      data: JSON.parse(row.data),
-      createdAt: row.createdAt
-    }));
+      ).all(headId)
+    );
   }
   async hasChildren(messageId) {
-    const row = this.#stmt(
-      "SELECT EXISTS(SELECT 1 FROM messages WHERE parentId = ?) as hasChildren"
-    ).get(messageId);
+    const row = hasChildrenRow.parse(
+      this.#stmt(
+        "SELECT EXISTS(SELECT 1 FROM messages WHERE parentId = ?) as hasChildren"
+      ).get(messageId)
+    );
     return row.hasChildren === 1;
   }
   async getMessages(chatId) {
@@ -3628,34 +3762,16 @@ var SqliteContextStore = class extends ContextStore {
     );
   }
   async getBranch(chatId, name) {
-    const row = this.#db.prepare("SELECT * FROM branches WHERE chatId = ? AND name = ?").get(chatId, name);
-    if (!row) {
-      return void 0;
-    }
-    return {
-      id: row.id,
-      chatId: row.chatId,
-      name: row.name,
-      headMessageId: row.headMessageId,
-      isActive: row.isActive === 1,
-      createdAt: row.createdAt
-    };
+    return storedBranch.optional().parse(
+      this.#db.prepare("SELECT * FROM branches WHERE chatId = ? AND name = ?").get(chatId, name)
+    );
   }
   async getActiveBranch(chatId) {
-    const row = this.#stmt(
-      "SELECT * FROM branches WHERE chatId = ? AND isActive = 1"
-    ).get(chatId);
-    if (!row) {
-      return void 0;
-    }
-    return {
-      id: row.id,
-      chatId: row.chatId,
-      name: row.name,
-      headMessageId: row.headMessageId,
-      isActive: true,
-      createdAt: row.createdAt
-    };
+    return storedBranch.optional().parse(
+      this.#stmt(
+        "SELECT * FROM branches WHERE chatId = ? AND isActive = 1"
+      ).get(chatId)
+    );
   }
   async setActiveBranch(chatId, branchId) {
     this.#db.prepare("UPDATE branches SET isActive = 0 WHERE chatId = ?").run(chatId);
@@ -3668,8 +3784,9 @@ var SqliteContextStore = class extends ContextStore {
     return result.changes > 0;
   }
   async listBranches(chatId) {
-    const rows = this.#db.prepare(
-      `SELECT
+    return z4.array(branchInfo).parse(
+      this.#db.prepare(
+        `SELECT
           b.id,
           b.name,
           b.headMessageId,
@@ -3690,15 +3807,8 @@ var SqliteContextStore = class extends ContextStore {
         FROM branches b
         WHERE b.chatId = ?
         ORDER BY b.createdAt ASC`
-    ).all(chatId);
-    return rows.map((row) => ({
-      id: row.id,
-      name: row.name,
-      headMessageId: row.headMessageId,
-      isActive: row.isActive === 1,
-      messageCount: row.messageCount,
-      createdAt: row.createdAt
-    }));
+      ).all(chatId)
+    );
   }
   // ==========================================================================
   // Checkpoint Operations
@@ -3719,31 +3829,19 @@ var SqliteContextStore = class extends ContextStore {
     );
   }
   async getCheckpoint(chatId, name) {
-    const row = this.#db.prepare("SELECT * FROM checkpoints WHERE chatId = ? AND name = ?").get(chatId, name);
-    if (!row) {
-      return void 0;
-    }
-    return {
-      id: row.id,
-      chatId: row.chatId,
-      name: row.name,
-      messageId: row.messageId,
-      createdAt: row.createdAt
-    };
+    return storedCheckpoint.optional().parse(
+      this.#db.prepare("SELECT * FROM checkpoints WHERE chatId = ? AND name = ?").get(chatId, name)
+    );
   }
   async listCheckpoints(chatId) {
-    const rows = this.#db.prepare(
-      `SELECT id, name, messageId, createdAt
+    return z4.array(checkpointInfo).parse(
+      this.#db.prepare(
+        `SELECT id, name, messageId, createdAt
          FROM checkpoints
          WHERE chatId = ?
          ORDER BY createdAt DESC`
-    ).all(chatId);
-    return rows.map((row) => ({
-      id: row.id,
-      name: row.name,
-      messageId: row.messageId,
-      createdAt: row.createdAt
-    }));
+      ).all(chatId)
+    );
   }
   async deleteCheckpoint(chatId, name) {
     this.#db.prepare("DELETE FROM checkpoints WHERE chatId = ? AND name = ?").run(chatId, name);
@@ -3778,31 +3876,20 @@ var SqliteContextStore = class extends ContextStore {
     }
     sql += " ORDER BY fts.rank LIMIT ?";
     params.push(limit);
-    const rows = this.#db.prepare(sql).all(...params);
-    return rows.map((row) => ({
-      message: {
-        id: row.id,
-        chatId: row.chatId,
-        parentId: row.parentId,
-        name: row.name,
-        type: row.type ?? void 0,
-        data: JSON.parse(row.data),
-        createdAt: row.createdAt
-      },
-      rank: row.rank,
-      snippet: row.snippet
-    }));
+    return z4.array(searchResult).parse(this.#db.prepare(sql).all(...params));
   }
   // ==========================================================================
   // Visualization Operations
   // ==========================================================================
   async getGraph(chatId) {
-    const messageRows = this.#db.prepare(
-      `SELECT id, parentId, name, data, createdAt
+    const messageRows = z4.array(graphMessageRow).parse(
+      this.#db.prepare(
+        `SELECT id, parentId, name, data, createdAt
          FROM messages
          WHERE chatId = ?
          ORDER BY createdAt ASC`
-    ).all(chatId);
+      ).all(chatId)
+    );
     const nodes = messageRows.map((row) => {
       const data = JSON.parse(row.data);
       const content = typeof data === "string" ? data : Array.isArray(data.parts) ? data.parts.filter((p) => p.type === "text").map((p) => p.text).join(" ") : JSON.stringify(data);
@@ -3814,27 +3901,22 @@ var SqliteContextStore = class extends ContextStore {
         createdAt: row.createdAt
       };
     });
-    const branchRows = this.#db.prepare(
-      `SELECT name, headMessageId, isActive
+    const branches = z4.array(graphBranch).parse(
+      this.#db.prepare(
+        `SELECT name, headMessageId, isActive
          FROM branches
          WHERE chatId = ?
          ORDER BY createdAt ASC`
-    ).all(chatId);
-    const branches = branchRows.map((row) => ({
-      name: row.name,
-      headMessageId: row.headMessageId,
-      isActive: row.isActive === 1
-    }));
-    const checkpointRows = this.#db.prepare(
-      `SELECT name, messageId
+      ).all(chatId)
+    );
+    const checkpoints = z4.array(graphCheckpoint).parse(
+      this.#db.prepare(
+        `SELECT name, messageId
          FROM checkpoints
          WHERE chatId = ?
          ORDER BY createdAt ASC`
-    ).all(chatId);
-    const checkpoints = checkpointRows.map((row) => ({
-      name: row.name,
-      messageId: row.messageId
-    }));
+      ).all(chatId)
+    );
     return {
       chatId,
       nodes,
@@ -3933,7 +4015,7 @@ function mergeLanguageModelUsage(current, next) {
   };
 }
 function isAvailableSkill(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) && typeof value.name === "string" && typeof value.description === "string" && typeof value.path === "string";
+  return isRecord(value) && typeof value.name === "string" && typeof value.description === "string" && typeof value.path === "string";
 }
 function isEmptyAssistantPlaceholder(message2) {
   return message2.role === "assistant" && message2.parts.length === 0;
@@ -4682,7 +4764,7 @@ var ContextEngine = class _ContextEngine {
     const fragmentIndex = pending.findLastIndex((fragment3) => {
       if (fragment3.name !== "user") return false;
       const encoded = fragment3.codec?.encode();
-      return !encoded || !isSyntheticReminderMessage(encoded);
+      return !isUIMessage(encoded) || !isSyntheticReminderMessage(encoded);
     });
     if (fragmentIndex < 0) return;
     const fragment2 = pending[fragmentIndex];
@@ -4710,7 +4792,7 @@ var ContextEngine = class _ContextEngine {
     };
     if (onceIds.length > 0) {
       carrier.metadata = {
-        ...carrier.metadata,
+        ...isRecord(carrier.metadata) ? carrier.metadata : {},
         onceIds
       };
     }
@@ -4842,12 +4924,13 @@ var ContextEngine = class _ContextEngine {
         `Model "${modelId}" not found. Call load() first or check model ID.`
       );
     }
+    const inputPrice = inputPricePerMillion(model);
     const tokenizer = registry.getTokenizer(modelId);
     const fragmentEstimates = [];
     for (const fragment2 of this.#renderableFragments) {
       const rendered = renderer.render([fragment2]);
       const tokens = tokenizer.count(rendered);
-      const cost = tokens / 1e6 * model.cost.input;
+      const cost = tokens / 1e6 * inputPrice;
       fragmentEstimates.push({
         id: fragment2.id,
         name: fragment2.name,
@@ -4862,7 +4945,7 @@ var ContextEngine = class _ContextEngine {
       for (const msg of chain) {
         const content = estimateMessageContent(msg.data);
         const tokens = tokenizer.count(content);
-        const cost = tokens / 1e6 * model.cost.input;
+        const cost = tokens / 1e6 * inputPrice;
         fragmentEstimates.push({
           name: msg.name,
           id: msg.id,
@@ -4876,7 +4959,7 @@ var ContextEngine = class _ContextEngine {
         fragment2.codec ? fragment2.codec.encode() : getFragmentData(fragment2)
       );
       const tokens = tokenizer.count(content);
-      const cost = tokens / 1e6 * model.cost.input;
+      const cost = tokens / 1e6 * inputPrice;
       fragmentEstimates.push({
         name: fragment2.name,
         id: fragment2.id,
@@ -5600,7 +5683,7 @@ Examples:
 - "help me write an essay about space" -> Space Essay Help
 - "hi" -> New Conversation
 - "debug my python code" -> Python Debugging`;
-var titleSchema = z2.object({ title: z2.string() });
+var titleSchema = z5.object({ title: z5.string() });
 var TitleGenerator = class {
   #context;
   constructor(options) {
@@ -5706,18 +5789,16 @@ async function chat(agent2, ...args) {
       await context.writeAssistantSegment(responseMessage);
     },
     onEnd: async ({ responseMessage, isAborted }) => {
-      let message2 = responseMessage;
-      if (isAborted) {
-        message2 = { ...message2, parts: sanitizeAbortedParts(message2.parts) };
-      }
-      const finalMetadata = await options?.finalAssistantMetadata?.(message2);
+      const settled = isAborted ? {
+        ...responseMessage,
+        parts: sanitizeAbortedParts(responseMessage.parts)
+      } : responseMessage;
+      const finalMetadata = await options?.finalAssistantMetadata?.(settled);
       const mergedMetadata = {
-        ...message2.metadata ?? {},
+        ...isRecord(settled.metadata) ? settled.metadata : {},
         ...finalMetadata ?? {}
       };
-      if (Object.keys(mergedMetadata).length > 0) {
-        message2 = { ...message2, metadata: mergedMetadata };
-      }
+      const message2 = Object.keys(mergedMetadata).length > 0 ? { ...settled, metadata: mergedMetadata } : settled;
       await context.writeAssistantSegment(message2);
       const usage = await result?.usage;
       if (usage !== void 0) {
@@ -5754,11 +5835,6 @@ async function chat(agent2, ...args) {
     }
   });
 }
-var TERMINAL_TOOL_STATES = /* @__PURE__ */ new Set([
-  "output-available",
-  "output-error",
-  "output-denied"
-]);
 function sanitizeAbortedParts(parts) {
   const sanitized = [];
   for (const part of parts) {
@@ -5766,16 +5842,24 @@ function sanitizeAbortedParts(parts) {
       sanitized.push(part);
       continue;
     }
-    if (TERMINAL_TOOL_STATES.has(part.state)) {
-      sanitized.push(part);
-      continue;
+    switch (part.state) {
+      case "output-available":
+      case "output-error":
+      case "output-denied":
+        sanitized.push(part);
+        break;
+      case "input-streaming":
+        break;
+      default: {
+        const { approval, ...pending } = part;
+        sanitized.push({
+          ...pending,
+          state: "output-error",
+          errorText: "Cancelled by user",
+          ...approval?.approved === true ? { approval: { ...approval, approved: true } } : {}
+        });
+      }
     }
-    if (part.state === "input-streaming") continue;
-    sanitized.push({
-      ...part,
-      state: "output-error",
-      errorText: "Cancelled by user"
-    });
   }
   return sanitized;
 }
@@ -5809,6 +5893,9 @@ async function makeTitle(options) {
   return result?.title ?? null;
 }
 
+// packages/context/src/lib/codec/serialized-fragments.ts
+import { z as z6 } from "zod";
+
 // packages/context/src/lib/fragments/user.ts
 function identity(input) {
   return {
@@ -5926,118 +6013,198 @@ function toFragmentData(value, options) {
       ])
     );
   }
+  if (!isFragmentData(value)) {
+    throw new Error(`Unsupported serialized value of type ${typeof value}`);
+  }
   return value;
 }
+function builtInEntry(schema, build) {
+  return {
+    toFragment: (input, options) => {
+      const parsed = schema.safeParse(input);
+      if (!parsed.success) {
+        throw new Error(
+          `Invalid serialized ${input.type} fragment: ${z6.prettifyError(parsed.error)}`
+        );
+      }
+      return build(parsed.data, options);
+    }
+  };
+}
+var nestedPolicies = z6.array(z6.unknown()).optional();
 var builtInSerializedRegistry = {
-  term: {
-    toFragment: (input) => term(input.name, input.definition)
-  },
-  hint: {
-    toFragment: (input) => hint(input.text)
-  },
-  guardrail: {
-    toFragment: (input) => guardrail({
+  term: builtInEntry(
+    z6.object({ name: z6.string(), definition: z6.string() }),
+    (input) => term(input.name, input.definition)
+  ),
+  hint: builtInEntry(
+    z6.object({ text: z6.string() }),
+    (input) => hint(input.text)
+  ),
+  guardrail: builtInEntry(
+    z6.object({
+      rule: z6.string(),
+      reason: z6.string().optional(),
+      action: z6.string().optional()
+    }),
+    (input) => guardrail({
       rule: input.rule,
       reason: input.reason,
       action: input.action
     })
-  },
-  explain: {
-    toFragment: (input) => explain({
+  ),
+  explain: builtInEntry(
+    z6.object({
+      concept: z6.string(),
+      explanation: z6.string(),
+      therefore: z6.string().optional()
+    }),
+    (input) => explain({
       concept: input.concept,
       explanation: input.explanation,
       therefore: input.therefore
     })
-  },
-  example: {
-    toFragment: (input) => example({
+  ),
+  example: builtInEntry(
+    z6.object({
+      question: z6.string(),
+      answer: z6.string(),
+      note: z6.string().optional()
+    }),
+    (input) => example({
       question: input.question,
       answer: input.answer,
       note: input.note
     })
-  },
-  clarification: {
-    toFragment: (input) => clarification({
+  ),
+  clarification: builtInEntry(
+    z6.object({ when: z6.string(), ask: z6.string(), reason: z6.string() }),
+    (input) => clarification({
       when: input.when,
       ask: input.ask,
       reason: input.reason
     })
-  },
-  workflow: {
-    toFragment: (input) => workflow({
+  ),
+  workflow: builtInEntry(
+    z6.object({
+      task: z6.string(),
+      steps: z6.array(z6.string()),
+      triggers: z6.array(z6.string()).optional(),
+      notes: z6.string().optional()
+    }),
+    (input) => workflow({
       task: input.task,
       steps: input.steps,
       triggers: input.triggers,
       notes: input.notes
     })
-  },
-  quirk: {
-    toFragment: (input) => quirk({
+  ),
+  quirk: builtInEntry(
+    z6.object({ issue: z6.string(), workaround: z6.string() }),
+    (input) => quirk({
       issue: input.issue,
       workaround: input.workaround
     })
-  },
-  styleGuide: {
-    toFragment: (input) => styleGuide({
+  ),
+  styleGuide: builtInEntry(
+    z6.object({
+      prefer: z6.string(),
+      never: z6.string().optional(),
+      always: z6.string().optional()
+    }),
+    (input) => styleGuide({
       prefer: input.prefer,
       never: input.never,
       always: input.always
     })
-  },
-  analogy: {
-    toFragment: (input) => analogy({
+  ),
+  analogy: builtInEntry(
+    z6.object({
+      concepts: z6.array(z6.string()),
+      relationship: z6.string(),
+      insight: z6.string().optional(),
+      therefore: z6.string().optional(),
+      pitfall: z6.string().optional()
+    }),
+    (input) => analogy({
       concepts: input.concepts,
       relationship: input.relationship,
       insight: input.insight,
       therefore: input.therefore,
       pitfall: input.pitfall
     })
-  },
-  glossary: {
-    toFragment: (input) => glossary(input.entries)
-  },
-  role: {
-    toFragment: (input) => role(input.content)
-  },
-  principle: {
-    toFragment: (input, options) => principle({
+  ),
+  glossary: builtInEntry(
+    z6.object({ entries: z6.record(z6.string(), z6.string()) }),
+    (input) => glossary(input.entries)
+  ),
+  role: builtInEntry(
+    z6.object({ content: z6.string() }),
+    (input) => role(input.content)
+  ),
+  principle: builtInEntry(
+    z6.object({
+      title: z6.string(),
+      description: z6.string(),
+      policies: nestedPolicies
+    }),
+    (input, options) => principle({
       title: input.title,
       description: input.description,
       policies: input.policies?.map((item) => toFragmentData(item, options))
     })
-  },
-  policy: {
-    toFragment: (input, options) => policy({
+  ),
+  policy: builtInEntry(
+    z6.object({
+      rule: z6.string(),
+      before: z6.string().optional(),
+      reason: z6.string().optional(),
+      policies: nestedPolicies
+    }),
+    (input, options) => policy({
       rule: input.rule,
       before: input.before,
       reason: input.reason,
       policies: input.policies?.map((item) => toFragmentData(item, options))
     })
-  },
-  identity: {
-    toFragment: (input) => identity({
+  ),
+  identity: builtInEntry(
+    z6.object({ name: z6.string().optional(), role: z6.string().optional() }),
+    (input) => identity({
       name: input.name,
       role: input.role
     })
-  },
-  persona: {
-    toFragment: (input) => persona({
+  ),
+  persona: builtInEntry(
+    z6.object({
+      name: z6.string(),
+      role: z6.string().optional(),
+      objective: z6.string().optional(),
+      tone: z6.string().optional()
+    }),
+    (input) => persona({
       name: input.name,
       role: input.role,
       objective: input.objective,
       tone: input.tone
     })
-  },
-  alias: {
-    toFragment: (input) => alias(input.term, input.meaning)
-  },
-  preference: {
-    toFragment: (input) => preference(input.aspect, input.value)
-  },
-  correction: {
-    toFragment: (input) => correction(input.subject, input.clarification)
-  }
+  ),
+  alias: builtInEntry(
+    z6.object({ term: z6.string(), meaning: z6.string() }),
+    (input) => alias(input.term, input.meaning)
+  ),
+  preference: builtInEntry(
+    z6.object({ aspect: z6.string(), value: z6.string() }),
+    (input) => preference(input.aspect, input.value)
+  ),
+  correction: builtInEntry(
+    z6.object({ subject: z6.string(), clarification: z6.string() }),
+    (input) => correction(input.subject, input.clarification)
+  )
 };
+function isBuiltInSerializedType(type) {
+  return Object.hasOwn(builtInSerializedRegistry, type);
+}
 var messageLikeTypes = /* @__PURE__ */ new Set(["user", "assistant", "message"]);
 function findCustomSerializedFragment(fragment2, options) {
   if (!options?.registry) {
@@ -6057,7 +6224,7 @@ function toFragment(input, options) {
       "Message fragments are not supported by serialized fragment conversion"
     );
   }
-  const entry = options?.registry?.[input.type] ?? builtInSerializedRegistry[input.type];
+  const entry = options?.registry?.[input.type] ?? (isBuiltInSerializedType(input.type) ? builtInSerializedRegistry[input.type] : void 0);
   if (!entry) {
     throw new Error(`Unsupported serialized fragment type: ${input.type}`);
   }
@@ -6082,7 +6249,7 @@ function fromFragment(fragment2, options) {
     }
     return encoded;
   }
-  if (!builtInSerializedRegistry[fragment2.name]) {
+  if (!isBuiltInSerializedType(fragment2.name)) {
     throw new Error(`Unsupported fragment name: ${fragment2.name}`);
   }
   throw new Error(`Fragment "${fragment2.name}" is missing codec`);
@@ -6090,11 +6257,11 @@ function fromFragment(fragment2, options) {
 
 // packages/context/src/lib/fragments/plan.ts
 import dedent2 from "dedent";
-import z4 from "zod";
+import z8 from "zod";
 
 // packages/context/src/lib/fragments/plan-shared.ts
 import dedent from "dedent";
-import z3 from "zod";
+import z7 from "zod";
 var PLAN_FILE_PATH = "/workspace/.deepagents/plan.json";
 var PLAN_FOUNDATION_INSTRUCTIONS = dedent`
   You own the plan. The user is not required to provide a structured objective, success criteria, constraints, or task breakdown.
@@ -6125,20 +6292,20 @@ var PLAN_FOUNDATION_INSTRUCTIONS = dedent`
 var PLAN_REVIEW_INSTRUCTIONS = dedent`
   Whenever plan review fires, record lastReview before continuing. Its revision is the plan revision that was evaluated. If the decision is revise or replace, increment the plan revision when applying the resulting changes while preserving the evaluated revision in lastReview.
 `;
-var nonEmptyString = z3.string().trim().min(1);
-var statementBasis = z3.enum([
+var nonEmptyString = z7.string().trim().min(1);
+var statementBasis = z7.enum([
   "explicit_requirement",
   "discovered_constraint",
   "inference",
   "assumption"
 ]);
-var evidence = z3.strictObject({
+var evidence = z7.strictObject({
   summary: nonEmptyString,
   source: nonEmptyString
 });
-var lastReview = z3.strictObject({
-  revision: z3.number().int().positive(),
-  decision: z3.enum(["continue", "revise", "replace", "complete", "blocked"]),
+var lastReview = z7.strictObject({
+  revision: z7.number().int().positive(),
+  decision: z7.enum(["continue", "revise", "replace", "complete", "blocked"]),
   summary: nonEmptyString
 });
 function parsePlanSchema(schema, value) {
@@ -6272,29 +6439,29 @@ var EXECUTION_REVIEW_REMINDER = [
   "If yes, continue. If not, revise it before taking another action.",
   "Before claiming completion, verify the success criteria against evidence."
 ].join("\n");
-var statement = z4.strictObject({
+var statement = z8.strictObject({
   text: nonEmptyString,
   basis: statementBasis,
   source: nonEmptyString
 });
 var successCriterion = statement.extend({
   id: nonEmptyString,
-  evidence: z4.array(evidence)
+  evidence: z8.array(evidence)
 });
-var task = z4.strictObject({
+var task = z8.strictObject({
   id: nonEmptyString,
   title: nonEmptyString,
-  status: z4.enum(["pending", "in_progress", "completed"]),
-  blockedBy: z4.array(nonEmptyString),
-  evidence: z4.array(evidence)
+  status: z8.enum(["pending", "in_progress", "completed"]),
+  blockedBy: z8.array(nonEmptyString),
+  evidence: z8.array(evidence)
 });
-var executionPlanState = z4.strictObject({
-  revision: z4.number().int().positive(),
+var executionPlanState = z8.strictObject({
+  revision: z8.number().int().positive(),
   objective: statement,
-  successCriteria: z4.array(successCriterion).min(1),
-  constraints: z4.array(statement),
-  assumptions: z4.array(statement),
-  tasks: z4.array(task),
+  successCriteria: z8.array(successCriterion).min(1),
+  constraints: z8.array(statement),
+  assumptions: z8.array(statement),
+  tasks: z8.array(task),
   lastReview: lastReview.optional()
 });
 function validateExecutionPlan(state) {
@@ -6601,7 +6768,7 @@ function socraticPrompting() {
 
 // packages/context/src/lib/fragments/socratic-plan.ts
 import dedent3 from "dedent";
-import z5 from "zod";
+import z9 from "zod";
 var SOCRATIC_PLAN_INSTRUCTIONS = dedent3`
   Use a Socratic plan as an evolving question-and-answer inquiry, not an execution task list whose titles merely end in question marks. It has this shape:
   The only top-level keys are revision, objective, successCriteria, constraints, assumptions, inquiries, and lastReview.
@@ -6634,13 +6801,13 @@ var SOCRATIC_REVIEW_REMINDER = [
 var questionText = nonEmptyString.refine((text) => text.endsWith("?"), {
   message: "must end with a question mark"
 });
-var answer = z5.strictObject({
+var answer = z9.strictObject({
   text: nonEmptyString,
   basis: statementBasis,
   source: nonEmptyString,
-  evidence: z5.array(evidence).min(1)
+  evidence: z9.array(evidence).min(1)
 });
-var question = z5.strictObject({
+var question = z9.strictObject({
   question: questionText,
   basis: statementBasis,
   source: nonEmptyString,
@@ -6649,20 +6816,20 @@ var question = z5.strictObject({
 var successQuestion = question.extend({ id: nonEmptyString });
 var inquiry = question.extend({
   id: nonEmptyString,
-  phase: z5.enum(["domain", "case", "bridge"]),
-  status: z5.enum(["open", "answering", "answered"]),
-  blockedBy: z5.array(nonEmptyString)
+  phase: z9.enum(["domain", "case", "bridge"]),
+  status: z9.enum(["open", "answering", "answered"]),
+  blockedBy: z9.array(nonEmptyString)
 });
 var socraticLastReview = lastReview.extend({
   nextQuestionId: nonEmptyString.nullable()
 });
-var socraticPlanState = z5.strictObject({
-  revision: z5.number().int().positive(),
+var socraticPlanState = z9.strictObject({
+  revision: z9.number().int().positive(),
   objective: question,
-  successCriteria: z5.array(successQuestion).min(1),
-  constraints: z5.array(question),
-  assumptions: z5.array(question),
-  inquiries: z5.array(inquiry).min(1),
+  successCriteria: z9.array(successQuestion).min(1),
+  constraints: z9.array(question),
+  assumptions: z9.array(question),
+  inquiries: z9.array(inquiry).min(1),
   lastReview: socraticLastReview.nullable().optional()
 });
 function validateSocraticPlan(state) {
@@ -6943,268 +7110,46 @@ function render(tag, ...fragments) {
   return renderer.render([wrapped]);
 }
 
-// packages/context/src/lib/sandbox/agent-os-sandbox.ts
-import { PassThrough, Readable } from "node:stream";
-
-// packages/context/src/lib/sandbox/read-file.ts
-var decoder = new TextDecoder();
-function readFileContent(bytes, options) {
-  const content = options?.encoding === "binary" ? bytes : decoder.decode(bytes);
-  return content;
-}
+// packages/context/src/lib/sandbox/apple-container-sandbox.ts
+import spawn3, { SubprocessError as SubprocessError3 } from "nano-spawn";
+import { spawn as childSpawn2 } from "node:child_process";
+import { mkdtemp, rm, writeFile } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import z10 from "zod";
 
-// packages/context/src/lib/sandbox/agent-os-sandbox.ts
-var AgentOsSandboxError = class extends Error {
-  constructor(message2) {
+// packages/context/src/lib/sandbox/container-sandbox-errors.ts
+var ContainerSandboxError = class extends Error {
+  containerId;
+  constructor(message2, containerId) {
     super(message2);
-    this.name = "AgentOsSandboxError";
+    this.name = "ContainerSandboxError";
+    this.containerId = containerId;
   }
 };
-var AgentOsNotAvailableError = class extends AgentOsSandboxError {
-  constructor(cause) {
+
+// packages/context/src/lib/sandbox/apple-container-sandbox-errors.ts
+var AppleContainerSandboxError = class extends ContainerSandboxError {
+  constructor(message2, containerId) {
+    super(message2, containerId);
+    this.name = "AppleContainerSandboxError";
+  }
+};
+var ContainerServiceNotRunningError = class extends AppleContainerSandboxError {
+  constructor() {
     super(
-      "@rivet-dev/agent-os-core is not installed. Install it with: npm install @rivet-dev/agent-os-core @rivet-dev/agent-os-common"
+      "Apple container service is not running. Start it with `container system start` (first run also needs `container system kernel set --recommended`)."
     );
-    this.name = "AgentOsNotAvailableError";
-    this.cause = cause;
+    this.name = "ContainerServiceNotRunningError";
   }
 };
-var AgentOsCreationError = class extends AgentOsSandboxError {
-  constructor(message2, cause) {
-    super(`Failed to create Agent OS instance: ${message2}`);
-    this.name = "AgentOsCreationError";
-    this.cause = cause;
-  }
-};
-async function importAgentOs() {
-  try {
-    return await import("@rivet-dev/agent-os-core");
-  } catch (error) {
-    throw new AgentOsNotAvailableError(
-      error instanceof Error ? error : void 0
-    );
-  }
-}
-var SIGKILL_EXIT_CODE = 9;
-function startKernelProcess(os, command, options) {
-  const stdout = new PassThrough();
-  const stderr = new PassThrough();
-  const onStdout = (chunk) => stdout.write(chunk);
-  const onStderr = (chunk) => stderr.write(chunk);
-  const { pid } = os.spawn("bash", ["-lc", command], {
-    ...options,
-    onStdout,
-    onStderr
-  });
-  const unsubOut = os.onProcessStdout(pid, onStdout);
-  const unsubErr = os.onProcessStderr(pid, onStderr);
-  let killSignalled = false;
-  const exit = os.waitProcess(pid).finally(() => {
-    unsubOut();
-    unsubErr();
-    stdout.end();
-    stderr.end();
-  });
-  return {
-    pid,
-    stdout,
-    stderr,
-    exit,
-    kill: () => {
-      if (killSignalled) return;
-      killSignalled = true;
-      os.killProcess(pid);
-    },
-    wasKilled: (exitCode) => killSignalled && exitCode === SIGKILL_EXIT_CODE
-  };
-}
-async function readAll(stream) {
-  const chunks = [];
-  for await (const chunk of stream) chunks.push(chunk);
-  return Buffer.concat(chunks).toString("utf8");
-}
-function bindAbort(signal, onAbort) {
-  if (!signal) return () => {
-  };
-  if (signal.aborted) {
-    onAbort();
-    return () => {
-    };
-  }
-  signal.addEventListener("abort", onAbort, { once: true });
-  return () => signal.removeEventListener("abort", onAbort);
-}
-async function createAgentOsSandbox(options = {}) {
-  const { AgentOs } = await importAgentOs();
-  const { readiness, ...kernelOptions } = options;
-  let os;
-  try {
-    os = await AgentOs.create(kernelOptions);
-  } catch (error) {
-    const err = error instanceof Error ? error : new Error(String(error));
-    throw new AgentOsCreationError(err.message, err);
-  }
-  try {
-    const probe = startKernelProcess(os, ":", {});
-    const [, stderr, exitCode] = await Promise.all([
-      readAll(probe.stdout),
-      readAll(probe.stderr),
-      probe.exit
-    ]);
-    if (exitCode !== 0) {
-      throw new Error(stderr.trim() || `exit code ${exitCode}`);
-    }
-  } catch (error) {
-    await os.dispose().catch(() => {
-    });
-    const err = error instanceof Error ? error : new Error(String(error));
-    throw new AgentOsCreationError(
-      `Bash is required to execute sandbox commands but could not be started: ${err.message}`,
-      err
-    );
-  }
-  const sandbox = {
-    async executeCommand(command, { signal } = {}) {
-      if (signal?.aborted) {
-        return { stdout: "", stderr: "", exitCode: SIGKILL_EXIT_CODE };
-      }
-      const proc = startKernelProcess(os, command, {});
-      const unbind = bindAbort(signal, proc.kill);
-      try {
-        const [stdout, stderr, exitCode] = await Promise.all([
-          readAll(proc.stdout),
-          readAll(proc.stderr),
-          proc.exit
-        ]);
-        return { stdout, stderr, exitCode };
-      } finally {
-        unbind();
-      }
-    },
-    spawn(command, { signal, env, cwd } = {}) {
-      if (signal?.aborted) {
-        const empty = () => new ReadableStream({ start: (c) => c.close() });
-        return {
-          stdout: empty(),
-          stderr: empty(),
-          exit: Promise.resolve({
-            code: null,
-            signal: "SIGKILL",
-            success: false
-          })
-        };
-      }
-      const proc = startKernelProcess(os, command, { env, cwd });
-      const unbind = bindAbort(signal, proc.kill);
-      const exit = proc.exit.then((code) => {
-        const killed = proc.wasKilled(code);
-        return {
-          code: killed ? null : code,
-          signal: killed ? "SIGKILL" : null,
-          success: !killed && code === 0
-        };
-      }).finally(unbind);
-      return {
-        stdout: Readable.toWeb(proc.stdout),
-        stderr: Readable.toWeb(proc.stderr),
-        exit
-      };
-    },
-    async readFile(path6, options2) {
-      try {
-        const bytes = await os.readFile(path6);
-        return readFileContent(bytes, options2);
-      } catch (error) {
-        throw new Error(
-          `Failed to read file "${path6}": ${error instanceof Error ? error.message : String(error)}`
-        );
-      }
-    },
-    async exists(path6) {
-      return os.exists(path6);
-    },
-    async writeFiles(files) {
-      const results = await os.writeFiles(
-        files.map((f) => ({
-          path: f.path,
-          content: typeof f.content === "string" ? f.content : new Uint8Array(f.content)
-        }))
-      );
-      const failures = results.filter((r) => !r.success);
-      if (failures.length > 0) {
-        const details = failures.map((f) => `${f.path}: ${f.error}`).join(", ");
-        throw new Error(`Failed to write files: ${details}`);
-      }
-    },
-    async dispose() {
-      try {
-        await os.dispose();
-      } catch {
-      }
-    },
-    [Symbol.asyncDispose]() {
-      return this.dispose();
-    }
-  };
-  if (readiness) {
-    try {
-      await readiness(sandbox);
-    } catch (error) {
-      await sandbox.dispose().catch(() => {
-      });
-      throw error;
-    }
-  }
-  return sandbox;
-}
-async function useAgentOsSandbox(options, fn) {
-  const sandbox = await createAgentOsSandbox(options);
-  try {
-    return await fn(sandbox);
-  } finally {
-    await sandbox.dispose();
-  }
-}
-
-// packages/context/src/lib/sandbox/apple-container-sandbox.ts
-import spawn3 from "nano-spawn";
-import { spawn as childSpawn2 } from "node:child_process";
-import { mkdtemp, rm, writeFile } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-
-// packages/context/src/lib/sandbox/container-sandbox-errors.ts
-var ContainerSandboxError = class extends Error {
-  containerId;
-  constructor(message2, containerId) {
-    super(message2);
-    this.name = "ContainerSandboxError";
-    this.containerId = containerId;
-  }
-};
-
-// packages/context/src/lib/sandbox/apple-container-sandbox-errors.ts
-var AppleContainerSandboxError = class extends ContainerSandboxError {
-  constructor(message2, containerId) {
-    super(message2, containerId);
-    this.name = "AppleContainerSandboxError";
-  }
-};
-var ContainerServiceNotRunningError = class extends AppleContainerSandboxError {
-  constructor() {
-    super(
-      "Apple container service is not running. Start it with `container system start` (first run also needs `container system kernel set --recommended`)."
-    );
-    this.name = "ContainerServiceNotRunningError";
-  }
-};
-var AppleContainerCreationError = class extends AppleContainerSandboxError {
-  image;
-  cause;
-  constructor(message2, image, cause) {
-    super(`Failed to create container from image "${image}": ${message2}`);
-    this.name = "AppleContainerCreationError";
-    this.image = image;
+var AppleContainerCreationError = class extends AppleContainerSandboxError {
+  image;
+  cause;
+  constructor(message2, image, cause) {
+    super(`Failed to create container from image "${image}": ${message2}`);
+    this.name = "AppleContainerCreationError";
+    this.image = image;
     this.cause = cause;
   }
 };
@@ -7268,7 +7213,8 @@ import { createHash } from "node:crypto";
 import { existsSync, readFileSync } from "node:fs";
 
 // packages/context/src/lib/sandbox/cli-process.ts
-import { Readable as Readable2 } from "node:stream";
+import { SubprocessError } from "nano-spawn";
+import { Readable } from "node:stream";
 
 // packages/context/src/lib/sandbox/shell-quote.ts
 function shellQuote(s) {
@@ -7276,6 +7222,20 @@ function shellQuote(s) {
 }
 
 // packages/context/src/lib/sandbox/cli-process.ts
+function commandResultFrom(error) {
+  if (error instanceof SubprocessError) {
+    return {
+      stdout: error.stdout,
+      stderr: error.stderr || error.message,
+      exitCode: error.exitCode ?? 1
+    };
+  }
+  return {
+    stdout: "",
+    stderr: error instanceof Error ? error.message : "",
+    exitCode: 1
+  };
+}
 function toSandboxProcess(child, abortSignal) {
   if (!child.stdout || !child.stderr) {
     child.kill("SIGKILL");
@@ -7287,8 +7247,8 @@ function toSandboxProcess(child, abortSignal) {
     else abortSignal.addEventListener("abort", onAbort, { once: true });
   }
   return {
-    stdout: Readable2.toWeb(child.stdout),
-    stderr: Readable2.toWeb(child.stderr),
+    stdout: Readable.toWeb(child.stdout),
+    stderr: Readable.toWeb(child.stderr),
     exit: new Promise((resolve3, reject) => {
       const settle = () => {
         child.removeListener("exit", onExitEvent);
@@ -7333,7 +7293,7 @@ function existsCommand(path6) {
 }
 
 // packages/context/src/lib/sandbox/installers/installer.ts
-import spawn from "nano-spawn";
+import spawn, { SubprocessError as SubprocessError2 } from "nano-spawn";
 
 // packages/context/src/lib/sandbox/docker-sandbox-errors.ts
 var DockerSandboxError = class extends ContainerSandboxError {
@@ -7476,14 +7436,14 @@ function isDebianBased(image) {
   const debianPatterns = ["debian", "ubuntu", "node", "python"];
   return debianPatterns.some((pattern) => lower.includes(pattern));
 }
-function createInstallerContext(containerId, image) {
+function createInstallerContext(cli, containerId, image) {
   const packageManager = isDebianBased(image) ? "apt-get" : "apk";
   let archPromise = null;
   const ensuredTools = /* @__PURE__ */ new Set();
   let aptUpdated = false;
   const exec = async (command) => {
     try {
-      const result = await spawn("docker", [
+      const result = await spawn(cli.binary, [
         "exec",
         containerId,
         "sh",
@@ -7492,11 +7452,17 @@ function createInstallerContext(containerId, image) {
       ]);
       return { stdout: result.stdout, stderr: result.stderr, exitCode: 0 };
     } catch (error) {
-      const err = error;
+      if (error instanceof SubprocessError2) {
+        return {
+          stdout: error.stdout,
+          stderr: error.stderr,
+          exitCode: error.exitCode ?? 1
+        };
+      }
       return {
-        stdout: err.stdout ?? "",
-        stderr: err.stderr ?? err.message ?? "",
-        exitCode: err.exitCode ?? 1
+        stdout: "",
+        stderr: error instanceof Error ? error.message : "",
+        exitCode: 1
       };
     }
   };
@@ -7505,7 +7471,7 @@ function createInstallerContext(containerId, image) {
       const attempt = (async () => {
         const result = await exec("uname -m");
         if (result.exitCode !== 0) {
-          throw new DockerSandboxError(
+          throw new cli.SandboxError(
             `Failed to detect container architecture: ${result.stderr}`,
             containerId
           );
@@ -7562,6 +7528,12 @@ function createInstallerContext(containerId, image) {
   };
 }
 
+// packages/context/src/lib/sandbox/read-file.ts
+var decoder = new TextDecoder();
+function readFileContent(bytes, options) {
+  return options?.encoding === "binary" ? bytes : decoder.decode(bytes);
+}
+
 // packages/context/src/lib/sandbox/container-sandbox.ts
 var CONTAINER_NAME_PATTERN = /^[A-Za-z0-9_.-]+$/;
 var ContainerSandboxStrategy = class {
@@ -7684,7 +7656,11 @@ var ContainerSandboxStrategy = class {
       if (this.isServiceDown(message2)) {
         throw this.engine.errors.serviceNotAvailable();
       }
-      throw this.engine.errors.creation(message2, image, error);
+      throw this.engine.errors.creation(
+        message2,
+        image,
+        error instanceof Error ? error : void 0
+      );
     }
   }
   async inspectContainer(containerId) {
@@ -7753,7 +7729,7 @@ var ContainerSandboxStrategy = class {
       containerPaths.add(volume.containerPath);
       if (volume.type === "bind") {
         this.validateMountValue("hostPath", volume.hostPath, volume);
-        if (!existsSync(volume.hostPath)) {
+        if (this.engine.bindMountsOnClient && !existsSync(volume.hostPath)) {
           throw this.engine.errors.volumePath(
             volume.hostPath,
             volume.containerPath,
@@ -7820,7 +7796,7 @@ var ContainerSandboxStrategy = class {
     }
   }
   async createVolume(volume) {
-    const args = this.engine.volumeCreateArgs(volume);
+    const args = this.engine.volumeCreateArgs(volume, this.opts);
     try {
       await spawn2(this.engine.cli, args);
     } catch (error) {
@@ -7851,8 +7827,10 @@ var ContainerSandboxStrategy = class {
       await this.cleanupCreatedVolumes();
     } catch (cleanupError) {
       if (originalError instanceof Error) {
-        const original = originalError;
-        original.suppressed = [...original.suppressed ?? [], cleanupError];
+        const suppressed = "suppressed" in originalError && Array.isArray(originalError.suppressed) ? originalError.suppressed : [];
+        Object.assign(originalError, {
+          suppressed: [...suppressed, cleanupError]
+        });
       }
     }
   }
@@ -7871,7 +7849,20 @@ var ContainerSandboxStrategy = class {
       if (this.isServiceDown(message2)) {
         throw this.engine.errors.serviceNotAvailable();
       }
-      throw this.engine.errors.creation(message2, image, error);
+      for (const volume of this.volumes) {
+        if (volume.type === "bind" && this.engine.isMissingBindSource?.(message2, volume.hostPath)) {
+          throw this.engine.errors.volumePath(
+            volume.hostPath,
+            volume.containerPath,
+            "hostPath does not exist on host"
+          );
+        }
+      }
+      throw this.engine.errors.creation(
+        message2,
+        image,
+        error instanceof Error ? error : void 0
+      );
     }
   }
   async stopContainer(containerId) {
@@ -7893,12 +7884,7 @@ var ContainerSandboxStrategy = class {
         exitCode: 0
       };
     } catch (error) {
-      const err = error;
-      return {
-        stdout: err.stdout || "",
-        stderr: err.stderr || err.message || "",
-        exitCode: err.exitCode ?? 1
-      };
+      return commandResultFrom(error);
     }
   }
   async assertBashAvailable() {
@@ -8035,8 +8021,10 @@ function buildMountArg(volume) {
   return parts.join(",");
 }
 function getCliErrorMessage(error) {
-  const err = error;
-  return err.stderr?.trim() || err.stdout?.trim() || err.message || String(error);
+  if (error instanceof SubprocessError3) {
+    return error.stderr.trim() || error.stdout.trim() || error.message;
+  }
+  return error instanceof Error && error.message || String(error);
 }
 function safeParseArray(stdout) {
   try {
@@ -8046,11 +8034,15 @@ function safeParseArray(stdout) {
     return [];
   }
 }
+var containerInspectEntry = z10.object({
+  status: z10.union([
+    z10.string(),
+    z10.object({ state: z10.string() }).transform(({ state }) => state)
+  ])
+});
 function readContainerStatus(entry) {
-  const raw = entry?.status;
-  const status = String(
-    (typeof raw === "object" && raw !== null ? raw.state : raw) ?? ""
-  ).toLowerCase();
+  const parsed = containerInspectEntry.safeParse(entry);
+  const status = parsed.success ? parsed.data.status.toLowerCase() : "";
   if (status === "running" || status === "booted") return "running";
   if (status === "stopped") return "stopped";
   throw new AppleContainerSandboxError(
@@ -8059,6 +8051,7 @@ function readContainerStatus(entry) {
 }
 var appleEngine = {
   cli: CLI,
+  bindMountsOnClient: true,
   runArgs(image, containerId, opts) {
     const { memory = "1024M", cpus = 2 } = opts.resources ?? {};
     const args = [
@@ -8148,7 +8141,12 @@ var appleEngine = {
     ]);
   },
   defaultImage: "docker.io/library/bash:5.3-alpine3.24",
-  createInstallerContext: createAppleInstallerContext,
+  // The Docker installer suite, driven through `container exec`.
+  createInstallerContext: (containerId, image) => createInstallerContext(
+    { binary: CLI, SandboxError: AppleContainerSandboxError },
+    containerId,
+    image
+  ),
   async imageExists(tag) {
     try {
       await spawn3(CLI, ["image", "inspect", tag]);
@@ -8196,91 +8194,6 @@ var appleEngine = {
     volumeRemove: (name, reason) => new AppleContainerVolumeRemoveError(name, reason)
   }
 };
-function createAppleInstallerContext(containerId, image) {
-  const packageManager = isDebianBased(image) ? "apt-get" : "apk";
-  let archPromise = null;
-  const ensuredTools = /* @__PURE__ */ new Set();
-  let aptUpdated = false;
-  const exec = async (command) => {
-    try {
-      const result = await spawn3(CLI, [
-        "exec",
-        containerId,
-        "sh",
-        "-c",
-        command
-      ]);
-      return { stdout: result.stdout, stderr: result.stderr, exitCode: 0 };
-    } catch (error) {
-      const err = error;
-      return {
-        stdout: err.stdout ?? "",
-        stderr: err.stderr ?? err.message ?? "",
-        exitCode: err.exitCode ?? 1
-      };
-    }
-  };
-  const arch = async () => {
-    if (!archPromise) {
-      const attempt = (async () => {
-        const result = await exec("uname -m");
-        if (result.exitCode !== 0) {
-          throw new AppleContainerSandboxError(
-            `Failed to detect container architecture: ${result.stderr}`,
-            containerId
-          );
-        }
-        return result.stdout.trim();
-      })();
-      archPromise = attempt.catch((err) => {
-        archPromise = null;
-        throw err;
-      });
-    }
-    return archPromise;
-  };
-  const installPackages = async (packages) => {
-    if (packages.length === 0) return;
-    const quoted = packages.map(shellQuote).join(" ");
-    let cmd;
-    if (packageManager === "apt-get") {
-      cmd = aptUpdated ? `apt-get install -y ${quoted}` : `apt-get update && apt-get install -y ${quoted}`;
-    } else {
-      cmd = `apk add --no-cache ${quoted}`;
-    }
-    const result = await exec(cmd);
-    if (result.exitCode !== 0) {
-      throw new PackageInstallError(
-        packages,
-        image,
-        packageManager,
-        result.stderr,
-        containerId
-      );
-    }
-    if (packageManager === "apt-get") aptUpdated = true;
-  };
-  const ensureTool = async (checkName, installName) => {
-    const cacheKey = installName ?? checkName;
-    if (ensuredTools.has(cacheKey)) return;
-    const check = await exec(`which ${shellQuote(checkName)}`);
-    if (check.exitCode === 0) {
-      ensuredTools.add(cacheKey);
-      return;
-    }
-    await installPackages([installName ?? checkName]);
-    ensuredTools.add(cacheKey);
-  };
-  return {
-    containerId,
-    image,
-    packageManager,
-    arch,
-    exec,
-    installPackages,
-    ensureTool
-  };
-}
 async function runAppleBuild(args, showBuildLogs) {
   try {
     if (showBuildLogs) {
@@ -8339,13 +8252,13 @@ import fg from "fast-glob";
 import { BashTransformPipeline, TeePlugin } from "just-bash";
 import { readFile } from "node:fs/promises";
 import * as path4 from "node:path";
-import z7 from "zod";
+import z12 from "zod";
 import { withHostOnlyToolMetadata as withHostOnlyToolMetadata2 } from "@deepagents/agent";
 
 // packages/context/src/lib/sandbox/read-file-tool/index.ts
 import { tool as tool2 } from "ai";
 import path3 from "node:path";
-import z6 from "zod";
+import z11 from "zod";
 
 // packages/context/src/lib/sandbox/read-file-tool/binary.ts
 import { detectMediaType } from "@ai-sdk/provider-utils";
@@ -8494,10 +8407,10 @@ var formats = [
   binaryFileFormat,
   textFileFormat
 ];
-var inputSchema = z6.strictObject({
-  path: z6.string().min(1).describe("The path to the file to read"),
-  offset: z6.number().int().min(1).optional().describe("1-based line number to start at for text files"),
-  limit: z6.number().int().min(1).optional().describe("Number of text lines to return from offset")
+var inputSchema = z11.strictObject({
+  path: z11.string().min(1).describe("The path to the file to read"),
+  offset: z11.number().int().min(1).optional().describe("1-based line number to start at for text files"),
+  limit: z11.number().int().min(1).optional().describe("Number of text lines to return from offset")
 });
 function createReadFileTool({
   sandbox,
@@ -8773,9 +8686,9 @@ async function createBashTool(options) {
       extraInstructions,
       experimentalTeeTransform
     }),
-    inputSchema: z7.object({
-      command: z7.string().describe("The bash command to execute"),
-      reasoning: z7.string().trim().min(1).describe("Brief reason for executing this command")
+    inputSchema: z12.object({
+      command: z12.string().describe("The bash command to execute"),
+      reasoning: z12.string().trim().min(1).describe("Brief reason for executing this command")
     }),
     execute: async ({ command: originalCommand }, executionOptions) => {
       let command = originalCommand;
@@ -8818,9 +8731,9 @@ async function createBashTool(options) {
   const readFile2 = createReadFileTool({ sandbox, destination });
   const writeFile2 = tool3({
     description: "Write content to a file in the sandbox. Creates parent directories if needed.",
-    inputSchema: z7.object({
-      path: z7.string().describe("The path where the file should be written"),
-      content: z7.string().describe("The content to write to the file")
+    inputSchema: z12.object({
+      path: z12.string().describe("The path where the file should be written"),
+      content: z12.string().describe("The content to write to the file")
     }),
     execute: async ({ path: filePath, content }) => {
       try {
@@ -8844,7 +8757,7 @@ async function createBashTool(options) {
 // packages/context/src/lib/sandbox/binary-bridges.ts
 import { existsSync as existsSync2 } from "fs";
 import { defineCommand } from "just-bash";
-import spawn4 from "nano-spawn";
+import spawn4, { SubprocessError as SubprocessError4 } from "nano-spawn";
 import * as path5 from "path";
 function createBinaryBridges(...binaries) {
   return binaries.map((input) => {
@@ -8892,24 +8805,21 @@ function createBinaryBridges(...binaries) {
           exitCode: 0
         };
       } catch (error) {
-        if (error && typeof error === "object") {
-          const err = error;
-          const cause = err.cause;
-          if (cause?.code === "ENOENT") {
+        if (error instanceof SubprocessError4) {
+          if (hasErrorCode(error.cause, "ENOENT")) {
             return {
               stdout: "",
               stderr: `${name}: ${binaryPath} not found`,
               exitCode: 127
             };
           }
-        }
-        if (error && typeof error === "object" && "exitCode" in error) {
-          const subprocessError = error;
-          return {
-            stdout: subprocessError.stdout ?? "",
-            stderr: subprocessError.stderr ?? "",
-            exitCode: subprocessError.exitCode ?? 1
-          };
+          if ("exitCode" in error) {
+            return {
+              stdout: error.stdout,
+              stderr: error.stderr,
+              exitCode: error.exitCode ?? 1
+            };
+          }
         }
         return {
           stdout: "",
@@ -8920,21 +8830,25 @@ function createBinaryBridges(...binaries) {
     });
   });
 }
+function hasErrorCode(value, code) {
+  return typeof value === "object" && value !== null && "code" in value && value.code === code;
+}
 function resolveRealCwd(ctx) {
-  const fs = ctx.fs;
-  let realCwd;
-  if (fs.root) {
-    realCwd = path5.join(fs.root, ctx.cwd);
-  } else if (typeof fs.getMountPoint === "function" && typeof fs.toRealPath === "function") {
-    const real = fs.toRealPath(ctx.cwd);
-    realCwd = real ?? process.cwd();
-  } else {
-    realCwd = process.cwd();
+  const realCwd = mapToRealPath(ctx.fs, ctx.cwd) ?? process.cwd();
+  return existsSync2(realCwd) ? realCwd : process.cwd();
+}
+function mapToRealPath(fs, cwd) {
+  if (typeof fs !== "object" || fs === null) {
+    return null;
   }
-  if (!existsSync2(realCwd)) {
-    realCwd = process.cwd();
+  if ("root" in fs && typeof fs.root === "string" && fs.root) {
+    return path5.join(fs.root, cwd);
   }
-  return realCwd;
+  if ("getMountPoint" in fs && typeof fs.getMountPoint === "function" && "toRealPath" in fs && typeof fs.toRealPath === "function") {
+    const real = fs.toRealPath(cwd);
+    return typeof real === "string" ? real : null;
+  }
+  return null;
 }
 
 // packages/context/src/lib/sandbox/daytona-sandbox.ts
@@ -8962,15 +8876,15 @@ var DaytonaCommandError = class extends DaytonaSandboxError {
   }
 };
 async function createDaytonaSandbox(client, options = {}) {
-  validateDaytonaOptions(options);
+  const target = validateDaytonaOptions(options);
   const sdk = await import("@daytona/sdk");
   let sandbox;
   try {
-    if (options.sandboxId !== void 0) {
-      sandbox = await client.get(options.sandboxId);
+    if ("sandboxId" in target) {
+      sandbox = await client.get(target.sandboxId);
       await startIfStopped(sandbox, options);
     } else {
-      sandbox = await acquireReusedSandbox(client, options, sdk);
+      sandbox = await acquireReusedSandbox(client, target.name, options, sdk);
     }
   } catch (error) {
     throw normalizeDaytonaError(error, sdk);
@@ -9015,10 +8929,10 @@ var UNRECOVERABLE_SANDBOX_STATES = /* @__PURE__ */ new Set([
   "build_failed",
   "destroyed"
 ]);
-async function acquireReusedSandbox(client, options, sdk) {
+async function acquireReusedSandbox(client, name, options, sdk) {
   let existing;
   try {
-    existing = await client.get(options.name);
+    existing = await client.get(name);
   } catch (error) {
     if (error instanceof sdk.DaytonaNotFoundError) {
       return createSandbox(client, options);
@@ -9094,13 +9008,16 @@ function validateDaytonaOptions(options) {
       'Daytona sandbox options can only include "resources" when creating from "image". The Daytona SDK does not apply resources during default or snapshot creation.'
     );
   }
-  if (options.sandboxId === void 0 && options.name === void 0) {
-    throw new DaytonaSandboxError(
-      'Daytona sandbox options require "name" (get-or-create) or "sandboxId" (attach). An unnamed sandbox cannot be reclaimed, since dispose() does not delete it.'
-    );
+  if (options.sandboxId === void 0) {
+    if (options.name === void 0) {
+      throw new DaytonaSandboxError(
+        'Daytona sandbox options require "name" (get-or-create) or "sandboxId" (attach). An unnamed sandbox cannot be reclaimed, since dispose() does not delete it.'
+      );
+    }
+    return { name: options.name };
   }
   if (!options.sandboxId) {
-    return;
+    return { sandboxId: options.sandboxId };
   }
   const creationOnlyFields = [
     "name",
@@ -9129,6 +9046,7 @@ function validateDaytonaOptions(options) {
       `Daytona sandbox options cannot combine "sandboxId" with creation options: ${present.join(", ")}`
     );
   }
+  return { sandboxId: options.sandboxId };
 }
 function createDaytonaSandboxMethods(args) {
   const { sdk, sandbox, commandTimeout } = args;
@@ -9159,12 +9077,7 @@ function createDaytonaSandboxMethods(args) {
       };
     } catch (error) {
       if (aborted) return abortedCommandResult();
-      const err = error;
-      return {
-        stdout: err.stdout ?? "",
-        stderr: err.stderr ?? err.message ?? String(error),
-        exitCode: err.exitCode ?? 1
-      };
+      return { stdout: "", stderr: toError(error).message, exitCode: 1 };
     } finally {
       options?.signal?.removeEventListener("abort", abort);
     }
@@ -9443,10 +9356,10 @@ function uniqueParentDirectories(paths) {
   return [...dirs];
 }
 function compactObject(input) {
-  const output = {};
-  for (const [key, value] of Object.entries(input)) {
-    if (value !== void 0) {
-      output[key] = value;
+  const output = { ...input };
+  for (const [key, value] of Object.entries(output)) {
+    if (value === void 0) {
+      Reflect.deleteProperty(output, key);
     }
   }
   return output;
@@ -9456,7 +9369,7 @@ function toError(error) {
 }
 
 // packages/context/src/lib/sandbox/docker-sandbox.ts
-import spawn5 from "nano-spawn";
+import spawn5, { SubprocessError as SubprocessError5 } from "nano-spawn";
 import { spawn as childSpawn3 } from "node:child_process";
 import { createHash as createHash2, randomUUID as randomUUID2 } from "node:crypto";
 import { readFileSync as readFileSync2 } from "node:fs";
@@ -9517,6 +9430,14 @@ function runDockerBuild(args, stdin, showBuildLogs) {
 }
 var dockerEngine = {
   cli: "docker",
+  bindMountsOnClient: false,
+  isMissingBindSource(message2, source) {
+    const marker = `bind source path does not exist: ${source}`;
+    const index = message2.indexOf(marker);
+    if (index < 0) return false;
+    const remainder = message2.slice(index + marker.length);
+    return remainder === "" || remainder.startsWith("\n") || remainder.startsWith("\r\n");
+  },
   runArgs(image, containerId, opts, workdir) {
     const {
       memory = "1g",
@@ -9661,8 +9582,10 @@ var dockerEngine = {
   parseStatus(status) {
     return status === "running" ? "running" : "stopped";
   },
-  volumeCreateArgs(volume) {
+  volumeCreateArgs(volume, opts) {
     const args = ["volume", "create"];
+    for (const [key, value] of Object.entries(opts.labels ?? {}))
+      args.push("--label", `${key}=${value}`);
     if (volume.driver) {
       args.push("--driver", volume.driver);
     }
@@ -9673,8 +9596,10 @@ var dockerEngine = {
     return args;
   },
   errorMessage(error) {
-    const err = error;
-    return err.stderr || err.stdout || err.message || String(error);
+    if (error instanceof SubprocessError5) {
+      return error.stderr || error.stdout || error.message;
+    }
+    return error instanceof Error && error.message || String(error);
   },
   async removeVolume(name) {
     const deadline = performance.now() + 3e4;
@@ -9697,7 +9622,7 @@ var dockerEngine = {
     return message2.toLowerCase().includes("no such container");
   },
   isMissingVolume(message2) {
-    return message2.toLowerCase().includes("no such volume");
+    return /no such volume|volume \S+ not found/i.test(message2);
   },
   isNameConflict(message2) {
     return message2.toLowerCase().includes("is already in use by container");
@@ -9705,7 +9630,11 @@ var dockerEngine = {
   async ensureWorkdir() {
   },
   defaultImage: "bash:5.3-alpine3.24",
-  createInstallerContext,
+  createInstallerContext: (containerId, image) => createInstallerContext(
+    { binary: "docker", SandboxError: DockerSandboxError },
+    containerId,
+    image
+  ),
   async imageExists(tag) {
     try {
       await spawn5("docker", ["image", "inspect", tag]);
@@ -9759,17 +9688,32 @@ function buildDockerExecFlags(options) {
   }
   return flags;
 }
-function managedDockerCommand(command, controlPath) {
+function managedDockerCommand(command, controlPath, commandTimeout) {
   return [
     "set -m",
     `control=${shellQuote(controlPath)}`,
     ': > "$control" || exit 1',
-    `trap 'rm -f "$control"' EXIT`,
+    "timer=",
+    `trap 'if [ -n "$timer" ]; then kill -TERM "$timer" 2>/dev/null || :; wait "$timer" 2>/dev/null || :; fi; rm -f "$control" "$control.timeout"' EXIT`,
     `bash -lc ${shellQuote(command)} &`,
     "pid=$!",
     `printf '%s\\n' "$pid" > "$control"`,
+    ...commandTimeout ? [
+      // Keep the deadline on the engine host: SSH setup/round trips must not
+      // let the command run past its execution budget.
+      "(",
+      `sleep ${commandTimeout / 1e3} &`,
+      "alarm=$!",
+      `trap 'kill "$alarm" 2>/dev/null || :; wait "$alarm" 2>/dev/null || :; exit 0' TERM`,
+      'wait "$alarm" || exit',
+      'if kill -0 -- "-$pid" 2>/dev/null; then : > "$control.timeout"; kill -KILL -- "-$pid" 2>/dev/null || :; fi',
+      ") &",
+      "timer=$!"
+    ] : [],
     'wait "$pid"',
-    'exit "$?"'
+    "status=$?",
+    '[ ! -e "$control.timeout" ] || exit 124',
+    'exit "$status"'
   ].join("\n");
 }
 async function waitForDockerExecPid(execArgs, controlPath, localExit) {
@@ -9825,36 +9769,35 @@ function spawnDockerProcess(execArgs, command, options = {}, commandTimeout) {
   const localProcess = toSandboxProcess(
     childSpawn3(
       "docker",
-      execArgs(managedDockerCommand(command, controlPath), options)
+      execArgs(
+        managedDockerCommand(command, controlPath, commandTimeout),
+        options
+      )
     ),
     void 0
   );
   let termination;
-  const terminate = (reason) => {
-    termination ??= {
-      reason,
-      confirmed: terminateDockerExec(execArgs, controlPath, localProcess.exit)
-    };
+  const onAbort = () => {
+    termination ??= terminateDockerExec(
+      execArgs,
+      controlPath,
+      localProcess.exit
+    );
+    void termination.catch(() => {
+    });
   };
-  const onAbort = () => terminate("abort");
   if (options.signal?.aborted) onAbort();
   else options.signal?.addEventListener("abort", onAbort, { once: true });
-  let timeout;
-  if (commandTimeout) {
-    timeout = setTimeout(() => terminate("timeout"), commandTimeout);
-    timeout.unref();
-  }
   return {
     stdout: localProcess.stdout,
     stderr: localProcess.stderr,
     exit: localProcess.exit.then(async (info) => {
       const activeTermination = termination;
-      if (!activeTermination || !await activeTermination.confirmed) {
+      if (!activeTermination || !await activeTermination) {
         return info;
       }
-      return activeTermination.reason === "timeout" ? { code: 124, signal: null, success: false } : { code: null, signal: "SIGKILL", success: false };
+      return { code: null, signal: "SIGKILL", success: false };
     }).finally(() => {
-      clearTimeout(timeout);
       options.signal?.removeEventListener("abort", onAbort);
     })
   };
@@ -9865,12 +9808,7 @@ async function executeDockerCommand(execArgs, command, options = {}, commandTime
       const result2 = await spawn5("docker", execArgs(command));
       return { stdout: result2.stdout, stderr: result2.stderr, exitCode: 0 };
     } catch (error) {
-      const err = error;
-      return {
-        stdout: err.stdout || "",
-        stderr: err.stderr || err.message || "",
-        exitCode: err.exitCode ?? 1
-      };
+      return commandResultFrom(error);
     }
   }
   const process2 = spawnDockerProcess(
@@ -9965,11 +9903,14 @@ var ComposeStrategy = class extends ContainerSandboxStrategy {
         "-d"
       ]);
     } catch (error) {
-      const err = error;
-      if (err.stderr?.includes("Cannot connect")) {
+      const stderr = error instanceof SubprocessError5 ? error.stderr : "";
+      if (stderr.includes("Cannot connect")) {
         throw this.engine.errors.serviceNotAvailable();
       }
-      throw new ComposeStartError(this.composeFile, err.stderr || err.message);
+      throw new ComposeStartError(
+        this.composeFile,
+        stderr || (error instanceof Error ? error.message : String(error))
+      );
     }
   }
   defaultContainerId() {
@@ -10059,7 +10000,7 @@ import { randomUUID as randomUUID3 } from "node:crypto";
 import { posix as posix3 } from "node:path";
 
 // packages/context/src/lib/sandbox/strace/index.ts
-import spawn6 from "nano-spawn";
+import spawn6, { SubprocessError as SubprocessError6 } from "nano-spawn";
 import { posix as posix2 } from "node:path";
 var STRACE_FLAGS = "-f -y -qq -e trace=%file,write,pwrite64,writev";
 function buildStraceCommand(command, traceFile, traceDir) {
@@ -10463,6 +10404,14 @@ function resolveName(binary, options) {
 }
 
 // packages/context/src/lib/sandbox/installers/url-binary.ts
+var ARCHITECTURES = [
+  "x86_64",
+  "aarch64",
+  "armv7l"
+];
+function isArchitecture(value) {
+  return ARCHITECTURES.some((architecture) => architecture === value);
+}
 var UrlBinaryInstaller = class extends Installer {
   kind;
   options;
@@ -10487,7 +10436,7 @@ function urlBinary(options) {
 async function resolveUrl(ctx, options) {
   if (typeof options.url === "string") return options.url;
   const arch = await ctx.arch();
-  const archUrl = options.url[arch];
+  const archUrl = isArchitecture(arch) ? options.url[arch] : void 0;
   if (!archUrl) {
     throw new InstallError({
       target: options.name,
@@ -11239,6 +11188,16 @@ var SKILLS_INSTRUCTIONS = dedent4`A skill is a set of local instructions to foll
 
 // packages/context/src/lib/skills/frontmatter.ts
 import YAML from "yaml";
+import { z as z13 } from "zod";
+var MISSING_NAME = 'Invalid SKILL.md: frontmatter must have a "name" field';
+var MISSING_DESCRIPTION = 'Invalid SKILL.md: frontmatter must have a "description" field';
+var frontmatterSchema = z13.looseObject(
+  {
+    name: z13.string({ error: MISSING_NAME }).min(1, { error: MISSING_NAME }),
+    description: z13.string({ error: MISSING_DESCRIPTION }).min(1, { error: MISSING_DESCRIPTION })
+  },
+  { error: MISSING_NAME }
+);
 function parseFrontmatter(content) {
   const frontmatterRegex = /^---\s*\n([\s\S]*?)\n---\s*\n?([\s\S]*)$/;
   const match = content.match(frontmatterRegex);
@@ -11246,17 +11205,12 @@ function parseFrontmatter(content) {
     throw new Error("Invalid SKILL.md: missing or malformed frontmatter");
   }
   const [, yamlContent, body] = match;
-  const frontmatter = YAML.parse(yamlContent);
-  if (!frontmatter.name || typeof frontmatter.name !== "string") {
-    throw new Error('Invalid SKILL.md: frontmatter must have a "name" field');
-  }
-  if (!frontmatter.description || typeof frontmatter.description !== "string") {
-    throw new Error(
-      'Invalid SKILL.md: frontmatter must have a "description" field'
-    );
+  const parsed = frontmatterSchema.safeParse(YAML.parse(yamlContent));
+  if (!parsed.success) {
+    throw new Error(parsed.error.issues[0].message);
   }
   return {
-    frontmatter,
+    frontmatter: parsed.data,
     body: body.trim()
   };
 }
@@ -11292,6 +11246,7 @@ function soul() {
 
 // packages/context/src/lib/store/postgres.store.ts
 import { createRequire } from "node:module";
+import { z as z14 } from "zod";
 
 // packages/context/src/lib/store/ddl.postgres.ts
 function storeDDL(schema) {
@@ -11380,6 +11335,125 @@ CREATE TRIGGER "${schema}_messages_fts_vector_update"
 }
 
 // packages/context/src/lib/store/postgres.store.ts
+var chatColumns2 = z14.object({
+  id: z14.string(),
+  userid: z14.string(),
+  title: z14.string().nullable(),
+  metadata: jsonObject.nullable(),
+  createdat: bigintColumn,
+  updatedat: bigintColumn
+});
+var storedChat2 = chatColumns2.transform(toStoredChat2);
+var chatInfo2 = chatColumns2.extend({ messagecount: bigintColumn, branchcount: bigintColumn }).transform((row) => ({
+  ...toStoredChat2(row),
+  messageCount: row.messagecount,
+  branchCount: row.branchcount
+}));
+var messageColumns2 = z14.object({
+  id: z14.string(),
+  chatid: z14.string(),
+  parentid: z14.string().nullable(),
+  name: z14.string(),
+  type: z14.string().nullable(),
+  data: z14.unknown(),
+  createdat: bigintColumn
+});
+var storedMessage2 = messageColumns2.transform(toMessage2);
+var searchResult2 = messageColumns2.extend({ rank: z14.number(), snippet: z14.string() }).transform((row) => ({
+  message: toMessage2(row),
+  rank: row.rank,
+  snippet: row.snippet
+}));
+var storedBranch2 = z14.object({
+  id: z14.string(),
+  chatid: z14.string(),
+  name: z14.string(),
+  headmessageid: z14.string().nullable(),
+  isactive: z14.boolean(),
+  createdat: bigintColumn
+}).transform((row) => ({
+  id: row.id,
+  chatId: row.chatid,
+  name: row.name,
+  headMessageId: row.headmessageid,
+  isActive: row.isactive,
+  createdAt: row.createdat
+}));
+var branchRow = z14.object({
+  id: z14.string(),
+  name: z14.string(),
+  headmessageid: z14.string().nullable(),
+  isactive: z14.boolean(),
+  createdat: bigintColumn
+});
+var storedCheckpoint2 = z14.object({
+  id: z14.string(),
+  chatid: z14.string(),
+  name: z14.string(),
+  messageid: z14.string(),
+  createdat: bigintColumn
+}).transform((row) => ({
+  id: row.id,
+  chatId: row.chatid,
+  name: row.name,
+  messageId: row.messageid,
+  createdAt: row.createdat
+}));
+var checkpointInfo2 = z14.object({
+  id: z14.string(),
+  name: z14.string(),
+  messageid: z14.string(),
+  createdat: bigintColumn
+}).transform((row) => ({
+  id: row.id,
+  name: row.name,
+  messageId: row.messageid,
+  createdAt: row.createdat
+}));
+var idRow2 = z14.object({ id: z14.string() });
+var existsRow = z14.object({ exists: z14.boolean() });
+var countRow = z14.object({ count: bigintColumn });
+var graphMessageRow2 = z14.object({
+  id: z14.string(),
+  parentid: z14.string().nullable(),
+  name: z14.string(),
+  data: z14.unknown(),
+  createdat: bigintColumn
+});
+var graphBranch2 = z14.object({
+  name: z14.string(),
+  headmessageid: z14.string().nullable(),
+  isactive: z14.boolean()
+}).transform((row) => ({
+  name: row.name,
+  headMessageId: row.headmessageid,
+  isActive: row.isactive
+}));
+var graphCheckpoint2 = z14.object({ name: z14.string(), messageid: z14.string() }).transform((row) => ({
+  name: row.name,
+  messageId: row.messageid
+}));
+function toStoredChat2(row) {
+  return {
+    id: row.id,
+    userId: row.userid,
+    title: row.title ?? void 0,
+    metadata: row.metadata ?? void 0,
+    createdAt: row.createdat,
+    updatedAt: row.updatedat
+  };
+}
+function toMessage2(row) {
+  return {
+    id: row.id,
+    chatId: row.chatid,
+    parentId: row.parentid,
+    name: row.name,
+    type: row.type ?? void 0,
+    data: row.data,
+    createdAt: row.createdat
+  };
+}
 var PostgresContextStore = class _PostgresContextStore extends ContextStore {
   #pool;
   #schema;
@@ -11453,6 +11527,12 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
     const result = await this.#pool.query(sql, params);
     return result.rows;
   }
+  /**
+   * Execute a query using the pool and parse every returned row.
+   */
+  async #rows(row, sql, params) {
+    return z14.array(row).parse(await this.#query(sql, params));
+  }
   /**
    * Close the pool connection.
    * Call this when done with the store.
@@ -11478,20 +11558,13 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
           chat2.metadata ? JSON.stringify(chat2.metadata) : null
         ]
       );
-      const row = result.rows[0];
+      const created = storedChat2.parse(result.rows[0]);
       await client.query(
         `INSERT INTO ${this.#t("branches")} (id, chatId, name, headMessageId, isActive, createdAt)
          VALUES ($1, $2, 'main', NULL, TRUE, $3)`,
         [crypto.randomUUID(), chat2.id, Date.now()]
       );
-      return {
-        id: row.id,
-        userId: row.userid,
-        title: row.title ?? void 0,
-        metadata: row.metadata ?? void 0,
-        createdAt: Number(row.createdat),
-        updatedAt: Number(row.updatedat)
-      };
+      return created;
     });
   }
   async upsertChat(chat2) {
@@ -11508,37 +11581,23 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
           chat2.metadata ? JSON.stringify(chat2.metadata) : null
         ]
       );
-      const row = result.rows[0];
+      const upserted = storedChat2.parse(result.rows[0]);
       await client.query(
         `INSERT INTO ${this.#t("branches")} (id, chatId, name, headMessageId, isActive, createdAt)
          VALUES ($1, $2, 'main', NULL, TRUE, $3)
          ON CONFLICT(chatId, name) DO NOTHING`,
         [crypto.randomUUID(), chat2.id, Date.now()]
       );
-      return {
-        id: row.id,
-        userId: row.userid,
-        title: row.title ?? void 0,
-        metadata: row.metadata ?? void 0,
-        createdAt: Number(row.createdat),
-        updatedAt: Number(row.updatedat)
-      };
+      return upserted;
     });
   }
   async getChat(chatId) {
-    const rows = await this.#query(`SELECT * FROM ${this.#t("chats")} WHERE id = $1`, [chatId]);
-    if (rows.length === 0) {
-      return void 0;
-    }
-    const row = rows[0];
-    return {
-      id: row.id,
-      userId: row.userid,
-      title: row.title ?? void 0,
-      metadata: row.metadata ?? void 0,
-      createdAt: Number(row.createdat),
-      updatedAt: Number(row.updatedat)
-    };
+    const [chat2] = await this.#rows(
+      storedChat2,
+      `SELECT * FROM ${this.#t("chats")} WHERE id = $1`,
+      [chatId]
+    );
+    return chat2;
   }
   async updateChat(chatId, update) {
     return this.#useTransaction(async (client) => {
@@ -11546,18 +11605,10 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
         `SELECT * FROM ${this.#t("chats")} WHERE id = $1 FOR UPDATE`,
         [chatId]
       );
-      const row = result.rows[0];
-      if (!row) {
+      const current = storedChat2.optional().parse(result.rows[0]);
+      if (!current) {
         throw new Error(`updateChat: chat "${chatId}" not found`);
       }
-      const current = {
-        id: row.id,
-        userId: row.userid,
-        title: row.title ?? void 0,
-        metadata: row.metadata ?? void 0,
-        createdAt: Number(row.createdat),
-        updatedAt: Number(row.updatedat)
-      };
       const updates = update(current);
       if (updates === void 0) return current;
       const setClauses = [
@@ -11578,15 +11629,7 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
         `UPDATE ${this.#t("chats")} SET ${setClauses.join(", ")} WHERE id = $${paramIndex} RETURNING *`,
         params
       );
-      const next = updated.rows[0];
-      return {
-        id: next.id,
-        userId: next.userid,
-        title: next.title ?? void 0,
-        metadata: next.metadata ?? void 0,
-        createdAt: Number(next.createdat),
-        updatedAt: Number(next.updatedat)
-      };
+      return storedChat2.parse(updated.rows[0]);
     });
   }
   async listChats(options) {
@@ -11614,7 +11657,8 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
         params.push(options.offset);
       }
     }
-    const rows = await this.#query(
+    return this.#rows(
+      chatInfo2,
       `SELECT
         c.id,
         c.userId,
@@ -11632,16 +11676,6 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
       ORDER BY c.updatedAt DESC${limitClause}`,
       params
     );
-    return rows.map((row) => ({
-      id: row.id,
-      userId: row.userid,
-      title: row.title ?? void 0,
-      metadata: row.metadata ?? void 0,
-      messageCount: Number(row.messagecount),
-      branchCount: Number(row.branchcount),
-      createdAt: Number(row.createdat),
-      updatedAt: Number(row.updatedat)
-    }));
   }
   async deleteChat(chatId, options) {
     return this.#useTransaction(async (client) => {
@@ -11696,7 +11730,8 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
     if (parentId === messageId) {
       throw new Error(`Message ${messageId} cannot be its own parent`);
     }
-    const rows = await this.#query(
+    const rows = await this.#rows(
+      idRow2,
       `UPDATE ${this.#t("messages")} SET parentId = $1 WHERE id = $2 RETURNING id`,
       [parentId, messageId]
     );
@@ -11705,23 +11740,16 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
     }
   }
   async getMessage(messageId) {
-    const rows = await this.#query(`SELECT * FROM ${this.#t("messages")} WHERE id = $1`, [messageId]);
-    if (rows.length === 0) {
-      return void 0;
-    }
-    const row = rows[0];
-    return {
-      id: row.id,
-      chatId: row.chatid,
-      parentId: row.parentid,
-      name: row.name,
-      type: row.type ?? void 0,
-      data: row.data,
-      createdAt: Number(row.createdat)
-    };
+    const [message2] = await this.#rows(
+      storedMessage2,
+      `SELECT * FROM ${this.#t("messages")} WHERE id = $1`,
+      [messageId]
+    );
+    return message2;
   }
   async getMessageChain(headId) {
-    const rows = await this.#query(
+    return this.#rows(
+      storedMessage2,
       `WITH RECURSIVE chain AS (
         SELECT *, 0 as depth FROM ${this.#t("messages")} WHERE id = $1
         UNION ALL
@@ -11733,22 +11761,14 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
       ORDER BY depth DESC`,
       [headId]
     );
-    return rows.map((row) => ({
-      id: row.id,
-      chatId: row.chatid,
-      parentId: row.parentid,
-      name: row.name,
-      type: row.type ?? void 0,
-      data: row.data,
-      createdAt: Number(row.createdat)
-    }));
   }
   async hasChildren(messageId) {
-    const rows = await this.#query(
+    const [row] = await this.#rows(
+      existsRow,
       `SELECT EXISTS(SELECT 1 FROM ${this.#t("messages")} WHERE parentId = $1) as exists`,
       [messageId]
     );
-    return rows[0].exists;
+    return row.exists;
   }
   async getMessages(chatId) {
     const chat2 = await this.getChat(chatId);
@@ -11779,40 +11799,20 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
     );
   }
   async getBranch(chatId, name) {
-    const rows = await this.#query(`SELECT * FROM ${this.#t("branches")} WHERE chatId = $1 AND name = $2`, [
-      chatId,
-      name
-    ]);
-    if (rows.length === 0) {
-      return void 0;
-    }
-    const row = rows[0];
-    return {
-      id: row.id,
-      chatId: row.chatid,
-      name: row.name,
-      headMessageId: row.headmessageid,
-      isActive: row.isactive,
-      createdAt: Number(row.createdat)
-    };
+    const [branch] = await this.#rows(
+      storedBranch2,
+      `SELECT * FROM ${this.#t("branches")} WHERE chatId = $1 AND name = $2`,
+      [chatId, name]
+    );
+    return branch;
   }
   async getActiveBranch(chatId) {
-    const rows = await this.#query(
+    const [branch] = await this.#rows(
+      storedBranch2,
       `SELECT * FROM ${this.#t("branches")} WHERE chatId = $1 AND isActive = TRUE`,
       [chatId]
     );
-    if (rows.length === 0) {
-      return void 0;
-    }
-    const row = rows[0];
-    return {
-      id: row.id,
-      chatId: row.chatid,
-      name: row.name,
-      headMessageId: row.headmessageid,
-      isActive: true,
-      createdAt: Number(row.createdat)
-    };
+    return branch;
   }
   async setActiveBranch(chatId, branchId) {
     await this.#useTransaction(async (client) => {
@@ -11827,7 +11827,8 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
     });
   }
   async updateBranchHead(branchId, messageId, expectedHeadMessageId) {
-    const rows = await this.#query(
+    const rows = await this.#rows(
+      idRow2,
       `UPDATE ${this.#t("branches")} SET headMessageId = $1
        WHERE id = $2 AND headMessageId IS NOT DISTINCT FROM $3
        RETURNING id`,
@@ -11836,7 +11837,8 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
     return rows.length > 0;
   }
   async listBranches(chatId) {
-    const branches = await this.#query(
+    const branches = await this.#rows(
+      branchRow,
       `SELECT
         id,
         name,
@@ -11850,31 +11852,31 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
     );
     const result = [];
     for (const branch of branches) {
-      let messageCount = 0;
-      if (branch.headmessageid) {
-        const countRows = await this.#query(
-          `WITH RECURSIVE chain AS (
-            SELECT id, parentId FROM ${this.#t("messages")} WHERE id = $1
-            UNION ALL
-            SELECT m.id, m.parentId FROM ${this.#t("messages")} m
-            INNER JOIN chain c ON m.id = c.parentId
-          )
-          SELECT COUNT(*) as count FROM chain`,
-          [branch.headmessageid]
-        );
-        messageCount = Number(countRows[0].count);
-      }
       result.push({
         id: branch.id,
         name: branch.name,
         headMessageId: branch.headmessageid,
         isActive: branch.isactive,
-        messageCount,
-        createdAt: Number(branch.createdat)
+        messageCount: branch.headmessageid ? await this.#countChain(branch.headmessageid) : 0,
+        createdAt: branch.createdat
       });
     }
     return result;
   }
+  async #countChain(headMessageId) {
+    const [row] = await this.#rows(
+      countRow,
+      `WITH RECURSIVE chain AS (
+        SELECT id, parentId FROM ${this.#t("messages")} WHERE id = $1
+        UNION ALL
+        SELECT m.id, m.parentId FROM ${this.#t("messages")} m
+        INNER JOIN chain c ON m.id = c.parentId
+      )
+      SELECT COUNT(*) as count FROM chain`,
+      [headMessageId]
+    );
+    return row.count;
+  }
   // ==========================================================================
   // Checkpoint Operations
   // ==========================================================================
@@ -11895,36 +11897,22 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
     );
   }
   async getCheckpoint(chatId, name) {
-    const rows = await this.#query(
+    const [checkpoint] = await this.#rows(
+      storedCheckpoint2,
       `SELECT * FROM ${this.#t("checkpoints")} WHERE chatId = $1 AND name = $2`,
       [chatId, name]
     );
-    if (rows.length === 0) {
-      return void 0;
-    }
-    const row = rows[0];
-    return {
-      id: row.id,
-      chatId: row.chatid,
-      name: row.name,
-      messageId: row.messageid,
-      createdAt: Number(row.createdat)
-    };
+    return checkpoint;
   }
   async listCheckpoints(chatId) {
-    const rows = await this.#query(
+    return this.#rows(
+      checkpointInfo2,
       `SELECT id, name, messageId, createdAt
        FROM ${this.#t("checkpoints")}
        WHERE chatId = $1
        ORDER BY createdAt DESC`,
       [chatId]
     );
-    return rows.map((row) => ({
-      id: row.id,
-      name: row.name,
-      messageId: row.messageid,
-      createdAt: Number(row.createdat)
-    }));
   }
   async deleteCheckpoint(chatId, name) {
     await this.#query(
@@ -11964,26 +11952,14 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
     }
     sql += ` ORDER BY rank DESC LIMIT $${paramIndex}`;
     params.push(limit);
-    const rows = await this.#query(sql, params);
-    return rows.map((row) => ({
-      message: {
-        id: row.id,
-        chatId: row.chatid,
-        parentId: row.parentid,
-        name: row.name,
-        type: row.type ?? void 0,
-        data: row.data,
-        createdAt: Number(row.createdat)
-      },
-      rank: row.rank,
-      snippet: row.snippet
-    }));
+    return this.#rows(searchResult2, sql, params);
   }
   // ==========================================================================
   // Visualization Operations
   // ==========================================================================
   async getGraph(chatId) {
-    const messageRows = await this.#query(
+    const messageRows = await this.#rows(
+      graphMessageRow2,
       `SELECT id, parentId, name, data, createdAt
        FROM ${this.#t("messages")}
        WHERE chatId = $1
@@ -11998,32 +11974,25 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
         parentId: row.parentid,
         role: row.name,
         content: content.length > 50 ? content.slice(0, 50) + "..." : content,
-        createdAt: Number(row.createdat)
+        createdAt: row.createdat
       };
     });
-    const branchRows = await this.#query(
+    const branches = await this.#rows(
+      graphBranch2,
       `SELECT name, headMessageId, isActive
        FROM ${this.#t("branches")}
        WHERE chatId = $1
        ORDER BY createdAt ASC`,
       [chatId]
     );
-    const branches = branchRows.map((row) => ({
-      name: row.name,
-      headMessageId: row.headmessageid,
-      isActive: row.isactive
-    }));
-    const checkpointRows = await this.#query(
+    const checkpoints = await this.#rows(
+      graphCheckpoint2,
       `SELECT name, messageId
        FROM ${this.#t("checkpoints")}
        WHERE chatId = $1
        ORDER BY createdAt ASC`,
       [chatId]
     );
-    const checkpoints = checkpointRows.map((row) => ({
-      name: row.name,
-      messageId: row.messageid
-    }));
     return {
       chatId,
       nodes,
@@ -12035,6 +12004,7 @@ var PostgresContextStore = class _PostgresContextStore extends ContextStore {
 
 // packages/context/src/lib/store/sqlserver.store.ts
 import { createRequire as createRequire2 } from "node:module";
+import { z as z15 } from "zod";
 
 // packages/context/src/lib/store/ddl.sqlserver.ts
 function storeDDL2(schema) {
@@ -12153,6 +12123,104 @@ END;
 }
 
 // packages/context/src/lib/store/sqlserver.store.ts
+var chatColumns3 = z15.object({
+  id: z15.string(),
+  userId: z15.string(),
+  title: z15.string().nullable(),
+  metadata: z15.string().nullable(),
+  createdAt: bigintColumn,
+  updatedAt: bigintColumn
+});
+var storedChat3 = chatColumns3.transform(toStoredChat3);
+var chatInfo3 = chatColumns3.extend({ messageCount: z15.number(), branchCount: z15.number() }).transform((row) => ({
+  ...toStoredChat3(row),
+  messageCount: row.messageCount,
+  branchCount: row.branchCount
+}));
+var messageColumns3 = z15.object({
+  id: z15.string(),
+  chatId: z15.string(),
+  parentId: z15.string().nullable(),
+  name: z15.string(),
+  type: z15.string().nullable(),
+  data: z15.string(),
+  createdAt: bigintColumn
+});
+var storedMessage3 = messageColumns3.transform(toMessage3);
+var searchResult3 = messageColumns3.extend({ rank: z15.number(), snippet: z15.string() }).transform((row) => ({
+  message: toMessage3(row),
+  rank: row.rank,
+  snippet: row.snippet
+}));
+var storedBranch3 = z15.object({
+  id: z15.string(),
+  chatId: z15.string(),
+  name: z15.string(),
+  headMessageId: z15.string().nullable(),
+  isActive: z15.boolean(),
+  createdAt: bigintColumn
+});
+var branchRow2 = z15.object({
+  id: z15.string(),
+  name: z15.string(),
+  headMessageId: z15.string().nullable(),
+  isActive: z15.boolean(),
+  createdAt: bigintColumn
+});
+var storedCheckpoint3 = z15.object({
+  id: z15.string(),
+  chatId: z15.string(),
+  name: z15.string(),
+  messageId: z15.string(),
+  createdAt: bigintColumn
+});
+var checkpointInfo3 = z15.object({
+  id: z15.string(),
+  name: z15.string(),
+  messageId: z15.string(),
+  createdAt: bigintColumn
+});
+var idRow3 = z15.object({ id: z15.string() });
+var hasChildrenRow2 = z15.object({ hasChildren: z15.number() });
+var countRow2 = z15.object({ count: z15.number() });
+var ftsInstalledRow = z15.object({ ftsInstalled: z15.number().nullable() });
+var graphMessageRow3 = z15.object({
+  id: z15.string(),
+  parentId: z15.string().nullable(),
+  name: z15.string(),
+  data: z15.string(),
+  createdAt: bigintColumn
+});
+var graphBranch3 = z15.object({
+  name: z15.string(),
+  headMessageId: z15.string().nullable(),
+  isActive: z15.boolean()
+});
+var graphCheckpoint3 = z15.object({
+  name: z15.string(),
+  messageId: z15.string()
+});
+function toStoredChat3(row) {
+  return {
+    id: row.id,
+    userId: row.userId,
+    title: row.title ?? void 0,
+    metadata: row.metadata ? parseJsonObject(row.metadata) : void 0,
+    createdAt: row.createdAt,
+    updatedAt: row.updatedAt
+  };
+}
+function toMessage3(row) {
+  return {
+    id: row.id,
+    chatId: row.chatId,
+    parentId: row.parentId,
+    name: row.name,
+    type: row.type ?? void 0,
+    data: parseJson(row.data),
+    createdAt: row.createdAt
+  };
+}
 var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
   #pool;
   #schema;
@@ -12247,6 +12315,12 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
     const result = await request.query(sql);
     return result.recordset;
   }
+  /**
+   * Execute a query using the pool and parse every returned row.
+   */
+  async #rows(row, sql, params) {
+    return z15.array(row).parse(await this.#query(sql, params));
+  }
   /**
    * Close the pool connection.
    * Call this when done with the store.
@@ -12276,7 +12350,7 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
         OUTPUT INSERTED.*
         VALUES (@p0, @p1, @p2, @p3)
       `);
-      const row = result.recordset[0];
+      const created = storedChat3.parse(result.recordset[0]);
       const branchRequest = transaction.request();
       branchRequest.input("p0", mssql.NVarChar, crypto.randomUUID());
       branchRequest.input("p1", mssql.NVarChar, chat2.id);
@@ -12285,14 +12359,7 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
         INSERT INTO ${this.#t("branches")} (id, chatId, name, headMessageId, isActive, createdAt)
         VALUES (@p0, @p1, 'main', NULL, 1, @p2)
       `);
-      return {
-        id: row.id,
-        userId: row.userId,
-        title: row.title ?? void 0,
-        metadata: row.metadata ? JSON.parse(row.metadata) : void 0,
-        createdAt: Number(row.createdAt),
-        updatedAt: Number(row.updatedAt)
-      };
+      return created;
     });
   }
   async upsertChat(chat2) {
@@ -12319,7 +12386,7 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
           VALUES (source.id, source.userId, source.title, source.metadata, @p4, @p4)
         OUTPUT INSERTED.*;
       `);
-      const row = result.recordset[0];
+      const upserted = storedChat3.parse(result.recordset[0]);
       const branchRequest = transaction.request();
       branchRequest.input("p0", mssql.NVarChar, crypto.randomUUID());
       branchRequest.input("p1", mssql.NVarChar, chat2.id);
@@ -12331,30 +12398,16 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
           VALUES (@p0, @p1, 'main', NULL, 1, @p2)
         END
       `);
-      return {
-        id: row.id,
-        userId: row.userId,
-        title: row.title ?? void 0,
-        metadata: row.metadata ? JSON.parse(row.metadata) : void 0,
-        createdAt: Number(row.createdAt),
-        updatedAt: Number(row.updatedAt)
-      };
+      return upserted;
     });
   }
   async getChat(chatId) {
-    const rows = await this.#query(`SELECT * FROM ${this.#t("chats")} WHERE id = @p0`, [chatId]);
-    if (rows.length === 0) {
-      return void 0;
-    }
-    const row = rows[0];
-    return {
-      id: row.id,
-      userId: row.userId,
-      title: row.title ?? void 0,
-      metadata: row.metadata ? JSON.parse(row.metadata) : void 0,
-      createdAt: Number(row.createdAt),
-      updatedAt: Number(row.updatedAt)
-    };
+    const [chat2] = await this.#rows(
+      storedChat3,
+      `SELECT * FROM ${this.#t("chats")} WHERE id = @p0`,
+      [chatId]
+    );
+    return chat2;
   }
   async updateChat(chatId, update) {
     return this.#useTransaction(async (transaction) => {
@@ -12366,18 +12419,10 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
         FROM ${this.#t("chats")} WITH (UPDLOCK, HOLDLOCK)
         WHERE id = @chatId;
       `);
-      const row = result.recordset[0];
-      if (!row) {
+      const current = storedChat3.optional().parse(result.recordset[0]);
+      if (!current) {
         throw new Error(`updateChat: chat "${chatId}" not found`);
       }
-      const current = {
-        id: row.id,
-        userId: row.userId,
-        title: row.title ?? void 0,
-        metadata: row.metadata ? JSON.parse(row.metadata) : void 0,
-        createdAt: Number(row.createdAt),
-        updatedAt: Number(row.updatedAt)
-      };
       const updates = update(current);
       if (updates === void 0) return current;
       const setClauses = [
@@ -12402,15 +12447,7 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
         OUTPUT INSERTED.*
         WHERE id = @chatId;
       `);
-      const next = updated.recordset[0];
-      return {
-        id: next.id,
-        userId: next.userId,
-        title: next.title ?? void 0,
-        metadata: next.metadata ? JSON.parse(next.metadata) : void 0,
-        createdAt: Number(next.createdAt),
-        updatedAt: Number(next.updatedAt)
-      };
+      return storedChat3.parse(updated.recordset[0]);
     });
   }
   async listChats(options) {
@@ -12436,7 +12473,8 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
       params.push(options.offset ?? 0);
       params.push(options.limit);
     }
-    const rows = await this.#query(
+    return this.#rows(
+      chatInfo3,
       `SELECT
         c.id,
         c.userId,
@@ -12454,16 +12492,6 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
       ORDER BY c.updatedAt DESC${paginationClause}`,
       params
     );
-    return rows.map((row) => ({
-      id: row.id,
-      userId: row.userId,
-      title: row.title ?? void 0,
-      metadata: row.metadata ? JSON.parse(row.metadata) : void 0,
-      messageCount: Number(row.messageCount),
-      branchCount: Number(row.branchCount),
-      createdAt: Number(row.createdAt),
-      updatedAt: Number(row.updatedAt)
-    }));
   }
   async deleteChat(chatId, options) {
     return this.#useTransaction(async (transaction) => {
@@ -12528,7 +12556,8 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
     if (parentId === messageId) {
       throw new Error(`Message ${messageId} cannot be its own parent`);
     }
-    const rows = await this.#query(
+    const rows = await this.#rows(
+      idRow3,
       `UPDATE ${this.#t("messages")} SET parentId = @p0
        OUTPUT INSERTED.id
        WHERE id = @p1`,
@@ -12539,23 +12568,16 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
     }
   }
   async getMessage(messageId) {
-    const rows = await this.#query(`SELECT * FROM ${this.#t("messages")} WHERE id = @p0`, [messageId]);
-    if (rows.length === 0) {
-      return void 0;
-    }
-    const row = rows[0];
-    return {
-      id: row.id,
-      chatId: row.chatId,
-      parentId: row.parentId,
-      name: row.name,
-      type: row.type ?? void 0,
-      data: JSON.parse(row.data),
-      createdAt: Number(row.createdAt)
-    };
+    const [message2] = await this.#rows(
+      storedMessage3,
+      `SELECT * FROM ${this.#t("messages")} WHERE id = @p0`,
+      [messageId]
+    );
+    return message2;
   }
   async getMessageChain(headId) {
-    const rows = await this.#query(
+    return this.#rows(
+      storedMessage3,
       `WITH chain AS (
         SELECT *, 0 as depth FROM ${this.#t("messages")} WHERE id = @p0
         UNION ALL
@@ -12567,22 +12589,14 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
       ORDER BY depth DESC`,
       [headId]
     );
-    return rows.map((row) => ({
-      id: row.id,
-      chatId: row.chatId,
-      parentId: row.parentId,
-      name: row.name,
-      type: row.type ?? void 0,
-      data: JSON.parse(row.data),
-      createdAt: Number(row.createdAt)
-    }));
   }
   async hasChildren(messageId) {
-    const rows = await this.#query(
+    const [row] = await this.#rows(
+      hasChildrenRow2,
       `SELECT CASE WHEN EXISTS(SELECT 1 FROM ${this.#t("messages")} WHERE parentId = @p0) THEN 1 ELSE 0 END as hasChildren`,
       [messageId]
     );
-    return rows[0].hasChildren === 1;
+    return row.hasChildren === 1;
   }
   async getMessages(chatId) {
     const chat2 = await this.getChat(chatId);
@@ -12613,40 +12627,20 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
     );
   }
   async getBranch(chatId, name) {
-    const rows = await this.#query(
+    const [branch] = await this.#rows(
+      storedBranch3,
       `SELECT * FROM ${this.#t("branches")} WHERE chatId = @p0 AND name = @p1`,
       [chatId, name]
     );
-    if (rows.length === 0) {
-      return void 0;
-    }
-    const row = rows[0];
-    return {
-      id: row.id,
-      chatId: row.chatId,
-      name: row.name,
-      headMessageId: row.headMessageId,
-      isActive: row.isActive === true || row.isActive === 1,
-      createdAt: Number(row.createdAt)
-    };
+    return branch;
   }
   async getActiveBranch(chatId) {
-    const rows = await this.#query(
+    const [branch] = await this.#rows(
+      storedBranch3,
       `SELECT * FROM ${this.#t("branches")} WHERE chatId = @p0 AND isActive = 1`,
       [chatId]
     );
-    if (rows.length === 0) {
-      return void 0;
-    }
-    const row = rows[0];
-    return {
-      id: row.id,
-      chatId: row.chatId,
-      name: row.name,
-      headMessageId: row.headMessageId,
-      isActive: true,
-      createdAt: Number(row.createdAt)
-    };
+    return branch;
   }
   async setActiveBranch(chatId, branchId) {
     await this.#useTransaction(async (transaction) => {
@@ -12664,7 +12658,8 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
     });
   }
   async updateBranchHead(branchId, messageId, expectedHeadMessageId) {
-    const rows = await this.#query(
+    const rows = await this.#rows(
+      idRow3,
       `UPDATE ${this.#t("branches")} SET headMessageId = @p0
        OUTPUT INSERTED.id
        WHERE id = @p1
@@ -12674,7 +12669,8 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
     return rows.length > 0;
   }
   async listBranches(chatId) {
-    const branches = await this.#query(
+    const branches = await this.#rows(
+      branchRow2,
       `SELECT
         id,
         name,
@@ -12688,31 +12684,31 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
     );
     const result = [];
     for (const branch of branches) {
-      let messageCount = 0;
-      if (branch.headMessageId) {
-        const countRows = await this.#query(
-          `WITH chain AS (
-            SELECT id, parentId FROM ${this.#t("messages")} WHERE id = @p0
-            UNION ALL
-            SELECT m.id, m.parentId FROM ${this.#t("messages")} m
-            INNER JOIN chain c ON m.id = c.parentId
-          )
-          SELECT COUNT(*) as count FROM chain`,
-          [branch.headMessageId]
-        );
-        messageCount = Number(countRows[0].count);
-      }
       result.push({
         id: branch.id,
         name: branch.name,
         headMessageId: branch.headMessageId,
-        isActive: branch.isActive === true || branch.isActive === 1,
-        messageCount,
-        createdAt: Number(branch.createdAt)
+        isActive: branch.isActive,
+        messageCount: branch.headMessageId ? await this.#countChain(branch.headMessageId) : 0,
+        createdAt: branch.createdAt
       });
     }
     return result;
   }
+  async #countChain(headMessageId) {
+    const [row] = await this.#rows(
+      countRow2,
+      `WITH chain AS (
+        SELECT id, parentId FROM ${this.#t("messages")} WHERE id = @p0
+        UNION ALL
+        SELECT m.id, m.parentId FROM ${this.#t("messages")} m
+        INNER JOIN chain c ON m.id = c.parentId
+      )
+      SELECT COUNT(*) as count FROM chain`,
+      [headMessageId]
+    );
+    return row.count;
+  }
   // ==========================================================================
   // Checkpoint Operations
   // ==========================================================================
@@ -12738,36 +12734,22 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
     });
   }
   async getCheckpoint(chatId, name) {
-    const rows = await this.#query(
+    const [checkpoint] = await this.#rows(
+      storedCheckpoint3,
       `SELECT * FROM ${this.#t("checkpoints")} WHERE chatId = @p0 AND name = @p1`,
       [chatId, name]
     );
-    if (rows.length === 0) {
-      return void 0;
-    }
-    const row = rows[0];
-    return {
-      id: row.id,
-      chatId: row.chatId,
-      name: row.name,
-      messageId: row.messageId,
-      createdAt: Number(row.createdAt)
-    };
+    return checkpoint;
   }
   async listCheckpoints(chatId) {
-    const rows = await this.#query(
+    return this.#rows(
+      checkpointInfo3,
       `SELECT id, name, messageId, createdAt
        FROM ${this.#t("checkpoints")}
        WHERE chatId = @p0
        ORDER BY createdAt DESC`,
       [chatId]
     );
-    return rows.map((row) => ({
-      id: row.id,
-      name: row.name,
-      messageId: row.messageId,
-      createdAt: Number(row.createdAt)
-    }));
   }
   async deleteCheckpoint(chatId, name) {
     await this.#query(
@@ -12781,7 +12763,8 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
   async searchMessages(chatId, query, options) {
     const limit = options?.limit ?? 20;
     const roles = options?.roles;
-    const ftsCheck = await this.#query(
+    const ftsCheck = await this.#rows(
+      ftsInstalledRow,
       `SELECT CAST(SERVERPROPERTY('IsFullTextInstalled') AS INT) as ftsInstalled`
     );
     const ftsAvailable = ftsCheck[0]?.ftsInstalled === 1;
@@ -12812,20 +12795,7 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
       }
       sql += ` ORDER BY ct.RANK DESC OFFSET 0 ROWS FETCH NEXT @p${paramIndex} ROWS ONLY`;
       params.push(limit);
-      const rows = await this.#query(sql, params);
-      return rows.map((row) => ({
-        message: {
-          id: row.id,
-          chatId: row.chatId,
-          parentId: row.parentId,
-          name: row.name,
-          type: row.type ?? void 0,
-          data: JSON.parse(row.data),
-          createdAt: Number(row.createdAt)
-        },
-        rank: row.rank,
-        snippet: row.snippet
-      }));
+      return this.#rows(searchResult3, sql, params);
     } else {
       let sql = `
         SELECT
@@ -12851,27 +12821,15 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
       }
       sql += ` ORDER BY m.createdAt DESC OFFSET 0 ROWS FETCH NEXT @p${paramIndex} ROWS ONLY`;
       params.push(limit);
-      const rows = await this.#query(sql, params);
-      return rows.map((row) => ({
-        message: {
-          id: row.id,
-          chatId: row.chatId,
-          parentId: row.parentId,
-          name: row.name,
-          type: row.type ?? void 0,
-          data: JSON.parse(row.data),
-          createdAt: Number(row.createdAt)
-        },
-        rank: row.rank,
-        snippet: row.snippet
-      }));
+      return this.#rows(searchResult3, sql, params);
     }
   }
   // ==========================================================================
   // Visualization Operations
   // ==========================================================================
   async getGraph(chatId) {
-    const messageRows = await this.#query(
+    const messageRows = await this.#rows(
+      graphMessageRow3,
       `SELECT id, parentId, name, data, createdAt
        FROM ${this.#t("messages")}
        WHERE chatId = @p0
@@ -12879,39 +12837,32 @@ var SqlServerContextStore = class _SqlServerContextStore extends ContextStore {
       [chatId]
     );
     const nodes = messageRows.map((row) => {
-      const data = JSON.parse(row.data);
+      const data = parseJson(row.data);
       const content = typeof data === "string" ? data : JSON.stringify(data);
       return {
         id: row.id,
         parentId: row.parentId,
         role: row.name,
         content: content.length > 50 ? content.slice(0, 50) + "..." : content,
-        createdAt: Number(row.createdAt)
+        createdAt: row.createdAt
       };
     });
-    const branchRows = await this.#query(
+    const branches = await this.#rows(
+      graphBranch3,
       `SELECT name, headMessageId, isActive
        FROM ${this.#t("branches")}
        WHERE chatId = @p0
        ORDER BY createdAt ASC`,
       [chatId]
     );
-    const branches = branchRows.map((row) => ({
-      name: row.name,
-      headMessageId: row.headMessageId,
-      isActive: row.isActive === true || row.isActive === 1
-    }));
-    const checkpointRows = await this.#query(
+    const checkpoints = await this.#rows(
+      graphCheckpoint3,
       `SELECT name, messageId
        FROM ${this.#t("checkpoints")}
        WHERE chatId = @p0
        ORDER BY createdAt ASC`,
       [chatId]
     );
-    const checkpoints = checkpointRows.map((row) => ({
-      name: row.name,
-      messageId: row.messageId
-    }));
     return {
       chatId,
       nodes,
@@ -13179,47 +13130,37 @@ function asStaticWordText(word, options = {}) {
   if (!word) {
     return null;
   }
-  return asStaticWordPartText(
-    word.parts,
-    options
-  );
+  return asStaticWordPartText(word.parts, options);
 }
 function asStaticWordPartText(parts, options = {}) {
-  let text = "";
+  const texts = [];
   for (const part of parts) {
-    const type = part.type;
-    if (type === "Literal" || type === "SingleQuoted" || type === "Escaped") {
-      if (typeof part.value !== "string") {
-        return null;
-      }
-      text += part.value;
-      continue;
-    }
-    if (type === "DoubleQuoted") {
-      if (!Array.isArray(part.parts)) {
-        return null;
-      }
-      const inner = asStaticWordPartText(
-        part.parts,
-        options
-      );
-      if (inner == null) {
-        return null;
-      }
-      text += inner;
-      continue;
-    }
-    if (options.preserveLegacyBackticks && type === "CommandSubstitution" && part.legacy === true) {
-      text += "`" + serialize(part.body).trim() + "`";
-      continue;
+    const text = staticPartText(part, options);
+    if (text == null) {
+      return null;
     }
-    return null;
+    texts.push(text);
+  }
+  return texts.join("");
+}
+function staticPartText(part, options) {
+  switch (part.type) {
+    case "Literal":
+    case "SingleQuoted":
+    case "Escaped":
+      return part.value;
+    case "DoubleQuoted":
+      return asStaticWordPartText(part.parts, options);
+    case "CommandSubstitution":
+      return options.preserveLegacyBackticks && part.legacy ? "`" + serialize(part.body).trim() + "`" : null;
+    default:
+      return null;
   }
-  return text;
 }
 
 // packages/context/src/lib/stream/postgres-notify-change-source.ts
 import { createRequire as createRequire3 } from "node:module";
+import { z as z16 } from "zod";
 
 // packages/context/src/lib/stream/ddl.stream.postgres-notify.ts
 var DEFAULT_POSTGRES_STREAM_CHANGES_CHANNEL = "deepagents_stream_changes";
@@ -13549,19 +13490,15 @@ var ChangeQueue = class {
     });
   }
 };
+var notificationPayload = z16.object({
+  schema: z16.string(),
+  streamId: z16.string(),
+  kind: z16.string()
+});
 function parsePayload(payload) {
   try {
-    const parsed = JSON.parse(payload);
-    if (!parsed || typeof parsed !== "object") return void 0;
-    const candidate = parsed;
-    if (typeof candidate.schema !== "string" || typeof candidate.streamId !== "string" || typeof candidate.kind !== "string") {
-      return void 0;
-    }
-    return {
-      schema: candidate.schema,
-      streamId: candidate.streamId,
-      kind: candidate.kind
-    };
+    const parsed = notificationPayload.safeParse(parseJson(payload));
+    return parsed.success ? parsed.data : void 0;
   } catch {
     return void 0;
   }
@@ -13577,6 +13514,7 @@ function assertIdentifier(value, label) {
 
 // packages/context/src/lib/stream/postgres.stream-store.ts
 import { createRequire as createRequire4 } from "node:module";
+import { z as z18 } from "zod";
 
 // packages/context/src/lib/stream/ddl.stream.postgres.ts
 function postgresStreamDDL(schema) {
@@ -13611,6 +13549,21 @@ CREATE INDEX IF NOT EXISTS "idx_${schema}_streams_status_created_at_id"
 `;
 }
 
+// packages/context/src/lib/stream/rows.ts
+import { validateTypes } from "@ai-sdk/provider-utils";
+import { uiMessageChunkSchema } from "ai";
+import { z as z17 } from "zod";
+var streamStatus = z17.enum([
+  "queued",
+  "running",
+  "completed",
+  "failed",
+  "cancelled"
+]);
+function toStreamPart(value) {
+  return validateTypes({ value, schema: uiMessageChunkSchema });
+}
+
 // packages/context/src/lib/stream/stream-store.ts
 function collectStreamFailures(chunks) {
   const failures = /* @__PURE__ */ new Map();
@@ -13628,6 +13581,31 @@ var StreamStore = class {
 };
 
 // packages/context/src/lib/stream/postgres.stream-store.ts
+var storedStream = z18.object({
+  id: z18.string(),
+  status: streamStatus,
+  created_at: bigintColumn,
+  started_at: bigintColumn.nullable(),
+  finished_at: bigintColumn.nullable(),
+  cancel_requested_at: bigintColumn.nullable(),
+  error: z18.string().nullable()
+}).transform((row) => ({
+  id: row.id,
+  status: row.status,
+  createdAt: row.created_at,
+  startedAt: row.started_at,
+  finishedAt: row.finished_at,
+  cancelRequestedAt: row.cancel_requested_at,
+  error: row.error
+}));
+var statusRow = z18.object({ status: streamStatus });
+var idRow4 = z18.object({ id: z18.string() });
+var chunkRow = z18.object({
+  stream_id: z18.string(),
+  seq: z18.number(),
+  data: z18.unknown(),
+  created_at: bigintColumn
+});
 var PostgresStreamStore = class _PostgresStreamStore extends StreamStore {
   #pool;
   #schema;
@@ -13684,6 +13662,9 @@ var PostgresStreamStore = class _PostgresStreamStore extends StreamStore {
     const result = await this.#pool.query(sql, params);
     return result.rows;
   }
+  async #rows(row, sql, params) {
+    return z18.array(row).parse(await this.#query(sql, params));
+  }
   async #useTransaction(fn) {
     this.#ensureInitialized();
     const client = await this.#pool.connect();
@@ -13708,7 +13689,8 @@ var PostgresStreamStore = class _PostgresStreamStore extends StreamStore {
     );
   }
   async upsertStream(stream) {
-    const rows = await this.#query(
+    const [created] = await this.#rows(
+      storedStream,
       `INSERT INTO ${this.#t("streams")}
        (id, status, created_at, started_at, finished_at, cancel_requested_at, error)
        VALUES ($1, $2, $3, $4, $5, $6, $7)
@@ -13716,8 +13698,8 @@ var PostgresStreamStore = class _PostgresStreamStore extends StreamStore {
        RETURNING *`,
       streamParams(stream)
     );
-    if (rows[0]) {
-      return { stream: rowToStream(rows[0]), created: true };
+    if (created) {
+      return { stream: created, created: true };
     }
     const existing = await this.getStream(stream.id);
     if (!existing) {
@@ -13728,14 +13710,16 @@ var PostgresStreamStore = class _PostgresStreamStore extends StreamStore {
     return { stream: existing, created: false };
   }
   async getStream(streamId) {
-    const rows = await this.#query(
+    const [found] = await this.#rows(
+      storedStream,
       `SELECT * FROM ${this.#t("streams")} WHERE id = $1`,
       [streamId]
     );
-    return rows[0] ? rowToStream(rows[0]) : void 0;
+    return found;
   }
   async getStreamStatus(streamId) {
-    const rows = await this.#query(
+    const rows = await this.#rows(
+      statusRow,
       `SELECT status FROM ${this.#t("streams")} WHERE id = $1`,
       [streamId]
     );
@@ -13749,7 +13733,7 @@ var PostgresStreamStore = class _PostgresStreamStore extends StreamStore {
       sql += ` WHERE status = $${params.length}`;
     }
     sql += " ORDER BY created_at ASC, id ASC";
-    const rows = await this.#query(sql, params);
+    const rows = await this.#rows(idRow4, sql, params);
     return rows.map((row) => row.id);
   }
   async updateStream(streamId, update) {
@@ -13758,11 +13742,10 @@ var PostgresStreamStore = class _PostgresStreamStore extends StreamStore {
         `SELECT * FROM ${this.#t("streams")} WHERE id = $1 FOR UPDATE`,
         [streamId]
       );
-      const row = selected.rows[0];
-      if (!row) {
+      const stream = storedStream.optional().parse(selected.rows[0]);
+      if (!stream) {
         throw new Error(`updateStream: stream "${streamId}" not found`);
       }
-      const stream = rowToStream(row);
       const updates = update(stream);
       if (updates === void 0) return { stream, updated: false };
       const setClauses = [];
@@ -13789,7 +13772,7 @@ var PostgresStreamStore = class _PostgresStreamStore extends StreamStore {
           RETURNING *`,
         params
       );
-      return { stream: rowToStream(updated.rows[0]), updated: true };
+      return { stream: storedStream.parse(updated.rows[0]), updated: true };
     });
   }
   async updateStreamStatus(streamId, status, options) {
@@ -13888,13 +13871,15 @@ var PostgresStreamStore = class _PostgresStreamStore extends StreamStore {
       params.push(limit);
       sql += ` LIMIT $${params.length}`;
     }
-    const rows = await this.#query(sql, params);
-    return rows.map((row) => ({
-      streamId: row.stream_id,
-      seq: row.seq,
-      data: row.data,
-      createdAt: toNumber(row.created_at)
-    }));
+    const rows = await this.#rows(chunkRow, sql, params);
+    return Promise.all(
+      rows.map(async (row) => ({
+        streamId: row.stream_id,
+        seq: row.seq,
+        data: await toStreamPart(row.data),
+        createdAt: row.created_at
+      }))
+    );
   }
   async deleteStream(streamId) {
     await this.#query(`DELETE FROM ${this.#t("streams")} WHERE id = $1`, [
@@ -13907,7 +13892,7 @@ var PostgresStreamStore = class _PostgresStreamStore extends StreamStore {
         `SELECT * FROM ${this.#t("streams")} WHERE id = $1 FOR UPDATE`,
         [streamId]
       );
-      const row = result.rows[0];
+      const row = statusRow.optional().parse(result.rows[0]);
       if (!row) {
         throw new Error(`Stream "${streamId}" not found`);
       }
@@ -13950,23 +13935,6 @@ function streamParams(stream) {
     stream.error
   ];
 }
-function rowToStream(row) {
-  return {
-    id: row.id,
-    status: row.status,
-    createdAt: toNumber(row.created_at),
-    startedAt: toNullableNumber(row.started_at),
-    finishedAt: toNullableNumber(row.finished_at),
-    cancelRequestedAt: toNullableNumber(row.cancel_requested_at),
-    error: row.error
-  };
-}
-function toNumber(value) {
-  return typeof value === "number" ? value : Number(value);
-}
-function toNullableNumber(value) {
-  return value == null ? null : toNumber(value);
-}
 function isTerminal2(status) {
   return status !== "queued" && status !== "running";
 }
@@ -13978,11 +13946,29 @@ function assertIdentifier2(value, label) {
 
 // packages/context/src/lib/stream/sqlite.stream-store.ts
 import { DatabaseSync as DatabaseSync2 } from "node:sqlite";
+import { z as z19 } from "zod";
 
 // packages/context/src/lib/stream/ddl.stream.sqlite.sql
 var ddl_stream_sqlite_default = "PRAGMA journal_mode = WAL;\nPRAGMA synchronous = NORMAL;\nPRAGMA foreign_keys = ON;\n\nCREATE TABLE IF NOT EXISTS streams (\n  id TEXT PRIMARY KEY,\n  status TEXT NOT NULL DEFAULT 'queued'\n    CHECK(status IN ('queued','running','completed','failed','cancelled')),\n  createdAt INTEGER NOT NULL,\n  startedAt INTEGER,\n  finishedAt INTEGER,\n  cancelRequestedAt INTEGER,\n  error TEXT\n);\n\nCREATE TABLE IF NOT EXISTS stream_chunks (\n  streamId TEXT NOT NULL,\n  seq INTEGER NOT NULL,\n  data TEXT NOT NULL,\n  createdAt INTEGER NOT NULL,\n  PRIMARY KEY (streamId, seq),\n  FOREIGN KEY (streamId) REFERENCES streams(id) ON DELETE CASCADE\n);\n\n-- Supports ordered listing across all streams.\nCREATE INDEX IF NOT EXISTS idx_streams_created_at_id\n  ON streams(createdAt, id);\n\n-- Supports status-filtered ordered listing (e.g. running streams).\nCREATE INDEX IF NOT EXISTS idx_streams_status_created_at_id\n  ON streams(status, createdAt, id);\n";
 
 // packages/context/src/lib/stream/sqlite.stream-store.ts
+var streamRow = z19.object({
+  id: z19.string(),
+  status: streamStatus,
+  createdAt: z19.number(),
+  startedAt: z19.number().nullable(),
+  finishedAt: z19.number().nullable(),
+  cancelRequestedAt: z19.number().nullable(),
+  error: z19.string().nullable()
+});
+var statusRow2 = z19.object({ status: streamStatus });
+var idRow5 = z19.object({ id: z19.string() });
+var chunkRow2 = z19.object({
+  streamId: z19.string(),
+  seq: z19.number(),
+  data: z19.string(),
+  createdAt: z19.number()
+});
 var SqliteStreamStore = class extends StreamStore {
   #db;
   #statements = /* @__PURE__ */ new Map();
@@ -14021,33 +14007,24 @@ var SqliteStreamStore = class extends StreamStore {
     );
   }
   async upsertStream(stream) {
-    const row = this.#stmt(
-      `INSERT INTO streams (id, status, createdAt, startedAt, finishedAt, cancelRequestedAt, error)
+    const created = streamRow.optional().parse(
+      this.#stmt(
+        `INSERT INTO streams (id, status, createdAt, startedAt, finishedAt, cancelRequestedAt, error)
        VALUES (?, ?, ?, ?, ?, ?, ?)
        ON CONFLICT(id) DO NOTHING
        RETURNING *`
-    ).get(
-      stream.id,
-      stream.status,
-      stream.createdAt,
-      stream.startedAt,
-      stream.finishedAt,
-      stream.cancelRequestedAt,
-      stream.error
+      ).get(
+        stream.id,
+        stream.status,
+        stream.createdAt,
+        stream.startedAt,
+        stream.finishedAt,
+        stream.cancelRequestedAt,
+        stream.error
+      )
     );
-    if (row) {
-      return {
-        stream: {
-          id: row.id,
-          status: row.status,
-          createdAt: row.createdAt,
-          startedAt: row.startedAt,
-          finishedAt: row.finishedAt,
-          cancelRequestedAt: row.cancelRequestedAt,
-          error: row.error
-        },
-        created: true
-      };
+    if (created) {
+      return { stream: created, created: true };
     }
     const existing = await this.getStream(stream.id);
     if (!existing) {
@@ -14058,23 +14035,11 @@ var SqliteStreamStore = class extends StreamStore {
     return { stream: existing, created: false };
   }
   async getStream(streamId) {
-    const row = this.#stmt("SELECT * FROM streams WHERE id = ?").get(
-      streamId
-    );
-    if (!row) return void 0;
-    return {
-      id: row.id,
-      status: row.status,
-      createdAt: row.createdAt,
-      startedAt: row.startedAt,
-      finishedAt: row.finishedAt,
-      cancelRequestedAt: row.cancelRequestedAt,
-      error: row.error
-    };
+    return streamRow.optional().parse(this.#stmt("SELECT * FROM streams WHERE id = ?").get(streamId));
   }
   async getStreamStatus(streamId) {
-    const row = this.#stmt("SELECT status FROM streams WHERE id = ?").get(
-      streamId
+    const row = statusRow2.optional().parse(
+      this.#stmt("SELECT status FROM streams WHERE id = ?").get(streamId)
     );
     return row?.status;
   }
@@ -14086,18 +14051,15 @@ var SqliteStreamStore = class extends StreamStore {
       params.push(options.status);
     }
     sql += " ORDER BY createdAt ASC, id ASC";
-    const rows = this.#stmt(sql).all(...params);
+    const rows = z19.array(idRow5).parse(this.#stmt(sql).all(...params));
     return rows.map((row) => row.id);
   }
   async updateStream(streamId, update) {
     return this.#transaction(() => {
-      const current = this.#stmt("SELECT * FROM streams WHERE id = ?").get(
-        streamId
-      );
-      if (!current) {
+      const stream = streamRow.optional().parse(this.#stmt("SELECT * FROM streams WHERE id = ?").get(streamId));
+      if (!stream) {
         throw new Error(`updateStream: stream "${streamId}" not found`);
       }
-      const stream = { ...current };
       const updates = update(stream);
       if (updates === void 0) return { stream, updated: false };
       const setClauses = [];
@@ -14117,10 +14079,12 @@ var SqliteStreamStore = class extends StreamStore {
       if (updates.error !== void 0) set("error", updates.error);
       if (setClauses.length === 0) return { stream, updated: false };
       params.push(streamId);
-      const next = this.#stmt(
-        `UPDATE streams SET ${setClauses.join(", ")} WHERE id = ? RETURNING *`
-      ).get(...params);
-      return { stream: { ...next }, updated: true };
+      const next = streamRow.parse(
+        this.#stmt(
+          `UPDATE streams SET ${setClauses.join(", ")} WHERE id = ? RETURNING *`
+        ).get(...params)
+      );
+      return { stream: next, updated: true };
     });
   }
   async updateStreamStatus(streamId, status, options) {
@@ -14206,22 +14170,22 @@ var SqliteStreamStore = class extends StreamStore {
       sql += " LIMIT ?";
       params.push(limit);
     }
-    const rows = this.#stmt(sql).all(...params);
-    return rows.map((row) => ({
-      streamId: row.streamId,
-      seq: row.seq,
-      data: JSON.parse(row.data),
-      createdAt: row.createdAt
-    }));
+    const rows = z19.array(chunkRow2).parse(this.#stmt(sql).all(...params));
+    return Promise.all(
+      rows.map(async (row) => ({
+        streamId: row.streamId,
+        seq: row.seq,
+        data: await toStreamPart(parseJson(row.data)),
+        createdAt: row.createdAt
+      }))
+    );
   }
   async deleteStream(streamId) {
     this.#stmt("DELETE FROM streams WHERE id = ?").run(streamId);
   }
   async reopenStream(streamId) {
     return this.#transaction(() => {
-      const row = this.#stmt("SELECT * FROM streams WHERE id = ?").get(
-        streamId
-      );
+      const row = statusRow2.optional().parse(this.#stmt("SELECT * FROM streams WHERE id = ?").get(streamId));
       if (!row) {
         throw new Error(`Stream "${streamId}" not found`);
       }
@@ -14605,20 +14569,7 @@ function isAbortError(error) {
   return error instanceof Error && (error.name === "AbortError" || /aborted/i.test(error.message));
 }
 async function drain(stream, signal) {
-  const reader = stream.getReader();
-  const onAbort = () => reader.cancel();
-  if (signal) {
-    signal.addEventListener("abort", onAbort, { once: true });
-  }
-  try {
-    while (true) {
-      const { done } = await reader.read();
-      if (done) break;
-    }
-  } finally {
-    signal?.removeEventListener("abort", onAbort);
-    reader.releaseLock();
-  }
+  await stream.pipeTo(new WritableStream(), { signal });
 }
 
 // packages/context/src/lib/visualize.ts
@@ -14677,9 +14628,6 @@ function visualizeGraph(data) {
   return lines.join("\n");
 }
 export {
-  AgentOsCreationError,
-  AgentOsNotAvailableError,
-  AgentOsSandboxError,
   AppleContainerCreationError,
   AppleContainerImageBuildError,
   AppleContainerSandboxError,
@@ -14786,7 +14734,6 @@ export {
   contentPattern,
   correction,
   createAdaptivePollingState,
-  createAgentOsSandbox,
   createAppleContainerSandbox,
   createBashTool,
   createBinaryBridges,
@@ -14833,12 +14780,14 @@ export {
   hint,
   hourChanged,
   identity,
+  inputPricePerMillion,
   isAppleContainerfileOptions,
   isComposeOptions,
   isConditionalReminder,
   isDebianBased,
   isDockerfileOptions,
   isFragment,
+  isFragmentData,
   isFragmentObject,
   isMessageFragment,
   isRecord,
@@ -14911,7 +14860,6 @@ export {
   toolOutput,
   urlBinary,
   usageExceeds,
-  useAgentOsSandbox,
   useAppleContainerSandbox,
   useSandbox,
   user,