@opencode-ai/core 0.0.0-beta-18387 → 0.0.0-beta-18593

package/dist/chunks/{project-r1c3r2q5.js → persistent-pty-h40g2pf4.js}

@@ -1,18 +1,18 @@
 import {
   exports_mcp as exports_mcp2
-} from "./project-4ngx5mmk.js";
+} from "./persistent-pty-f74fncf5.js";
 import {
   exports_mcp
-} from "./project-752n680m.js";
+} from "./persistent-pty-vyrk4dbp.js";
 import {
   exports_permission
-} from "./project-rzd353vk.js";
+} from "./persistent-pty-ckw7ggwg.js";
 import {
   exports_instructions
-} from "./project-ec8vrfw5.js";
+} from "./persistent-pty-ec8vrfw5.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./persistent-pty-rvfvac9x.js";
 
 // src/mcp/instructions.ts
 var exports_instructions2 = {};

package/dist/chunks/{project-mqnm4bmb.js → persistent-pty-h7dqnnw7.js}

@@ -1,18 +1,18 @@
 import {
-  webSearchPreviewArgsSchema
-} from "./project-7n9qwqk4.js";
+  codeInterpreterArgsSchema
+} from "./persistent-pty-5a5ch9ts.js";
+import {
+  webSearchArgsSchema
+} from "./persistent-pty-gy500k2r.js";
 import {
   fileSearchArgsSchema
-} from "./project-wj4sxzqa.js";
+} from "./persistent-pty-wj4sxzqa.js";
 import {
-  codeInterpreterArgsSchema
-} from "./project-5a5ch9ts.js";
+  webSearchPreviewArgsSchema
+} from "./persistent-pty-7n9qwqk4.js";
 import {
   imageGenerationArgsSchema
-} from "./project-4b2tz2m9.js";
-import {
-  webSearchArgsSchema
-} from "./project-gy500k2r.js";
+} from "./persistent-pty-4b2tz2m9.js";
 
 // src/github-copilot/responses/openai-responses-prepare-tools.ts
 import { UnsupportedFunctionalityError } from "@ai-sdk/provider";
@@ -35,7 +35,7 @@ function prepareResponsesTools({
           name: tool.name,
           description: tool.description,
           parameters: tool.inputSchema,
-          strict: strictJsonSchema
+          strict: tool.strict ?? strictJsonSchema
         });
         break;
       case "provider": {

package/dist/chunks/{project-h94zdhz8.js → persistent-pty-h94zdhz8.js}

@@ -1,9 +1,9 @@
 import {
   AbsolutePath
-} from "./project-j07kk359.js";
+} from "./persistent-pty-j07kk359.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./persistent-pty-rvfvac9x.js";
 
 // src/project/schema.ts
 var exports_schema = {};

package/dist/chunks/{project-sq000y3g.js → persistent-pty-hg1dj728.js}

@@ -1,12 +1,12 @@
 import {
   exports_permission
-} from "./project-rzd353vk.js";
+} from "./persistent-pty-ckw7ggwg.js";
 import {
   exports_agent
-} from "./project-ehktr312.js";
+} from "./persistent-pty-513bkrxw.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./persistent-pty-rvfvac9x.js";
 
 // src/plugin/agent.ts
 var exports_agent2 = {};

package/dist/chunks/{project-8m11m4e9.js → persistent-pty-hggmzd1z.js}

@@ -1,32 +1,32 @@
 import {
   fileDiff
-} from "./project-c77ad0vh.js";
-import {
-  exports_formatter
-} from "./project-vcx09kjb.js";
-import {
-  exports_file_mutation
-} from "./project-nvbw3dns.js";
+} from "./persistent-pty-c77ad0vh.js";
 import {
   exports_location_mutation
-} from "./project-fzp6ntht.js";
+} from "./persistent-pty-j8t12rx3.js";
+import {
+  exports_formatter
+} from "./persistent-pty-02s8hgfb.js";
 import {
   exports_permission
-} from "./project-rzd353vk.js";
+} from "./persistent-pty-ckw7ggwg.js";
+import {
+  exports_file_mutation
+} from "./persistent-pty-0tya1wfq.js";
 import {
   exports_environment1 as exports_environment
-} from "./project-ym31qssr.js";
+} from "./persistent-pty-q22ck3r9.js";
 import {
   exports_location
-} from "./project-m9g7vbdc.js";
+} from "./persistent-pty-d88p9jy9.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./persistent-pty-rvfvac9x.js";
 
 // src/tool/plugin/patch.ts
 var exports_patch = {};
 __export(exports_patch, {
-  toModelOutput: () => toModelOutput,
+  toModelContent: () => toModelContent,
   name: () => name,
   Plugin: () => Plugin,
   PatchTool: () => exports_patch,
@@ -37,7 +37,6 @@ __export(exports_patch, {
 import { ToolFailure } from "@opencode-ai/ai";
 import { FileDiff } from "@opencode-ai/schema/file-diff";
 import { Effect, Result, Schema } from "effect";
-import path from "path";
 import { Bom } from "@opencode-ai/util/bom";
 import { Patch } from "@opencode-ai/util/patch";
 
@@ -93,7 +92,7 @@ var Output = Schema.Struct({
   applied: Schema.Array(Applied),
   files: Schema.Array(FileDiff.Info)
 });
-var toModelOutput = (output) => [
+var toModelContent = (output) => [
   "Success. Updated the following files:",
   ...output.applied.map((item) => `${item.type === "add" ? "A" : item.type === "delete" ? "D" : "M"} ${item.resource}`)
 ].join(`
@@ -117,8 +116,8 @@ var Plugin = {
         const applied = [];
         const parsed = Patch.parse(input.patchText);
         const lockTargets = Result.isSuccess(parsed) ? parsed.success.flatMap((hunk) => [
-          path.resolve(location.directory, hunk.path),
-          ...hunk.type === "update" && hunk.movePath ? [path.resolve(location.directory, hunk.movePath)] : []
+          exports_location_mutation.resolvePath(location.directory, hunk.path),
+          ...hunk.type === "update" && hunk.movePath ? [exports_location_mutation.resolvePath(location.directory, hunk.movePath)] : []
         ]) : [];
         const fail = (operation, error) => {
           const completed = applied.map((item) => item.resource).join(", ");
@@ -224,15 +223,6 @@ var Plugin = {
             source
           });
           yield* Effect.forEach(prepared, (change) => Effect.gen(function* () {
-            if (change.type === "add") {
-              yield* environment.files.write(change.target.absolute, new TextEncoder().encode(change.content)).pipe(Effect.mapError((error) => fail(`Failed to write ${change.target.resource}`, error)));
-              applied.push({
-                type: change.type,
-                resource: change.target.resource,
-                target: change.target.absolute
-              });
-              return;
-            }
             if (change.type === "delete") {
               yield* environment.files.remove(change.target.absolute).pipe(Effect.mapError((error) => fail(`Failed to delete ${change.target.resource}`, error)));
               applied.push({
@@ -242,7 +232,7 @@ var Plugin = {
               });
               return;
             }
-            if (change.moveTarget) {
+            if (change.type === "update" && change.moveTarget) {
               const moveTarget = change.moveTarget;
               yield* environment.files.write(moveTarget.absolute, new TextEncoder().encode(change.content)).pipe(Effect.mapError((error) => fail(`Failed to write ${moveTarget.resource}`, error)));
               yield* environment.files.remove(change.target.absolute).pipe(Effect.mapError((error) => fail(`Wrote ${moveTarget.resource} but failed to remove ${change.target.resource}`, error)));
@@ -274,7 +264,7 @@ var Plugin = {
           return { applied, files };
         }).pipe(fileMutation.withLock(lockTargets), Effect.map((output) => ({
           output,
-          content: toModelOutput(output),
+          content: toModelContent(output),
           metadata: { files: output.files }
         })), Effect.mapError((error) => error instanceof ToolFailure ? error : new ToolFailure({ message: "Unable to apply patch", error })));
       }
@@ -331,4 +321,4 @@ function trimDiff(diff) {
 `);
 }
 
-export { name, Input, Applied, Output, toModelOutput, Plugin, exports_patch };
+export { name, Input, Applied, Output, toModelContent, Plugin, exports_patch };

package/dist/chunks/{project-gz5f51ks.js → persistent-pty-hjndjhyq.js}

@@ -1,12 +1,12 @@
 import {
   exports_skill
-} from "./project-e6atjbt4.js";
+} from "./persistent-pty-9xg84z6j.js";
 import {
   exports_permission
-} from "./project-rzd353vk.js";
+} from "./persistent-pty-ckw7ggwg.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./persistent-pty-rvfvac9x.js";
 
 // src/tool/plugin/skill.ts
 var exports_skill2 = {};

package/dist/chunks/{project-hp6rpdnc.js → persistent-pty-hp6rpdnc.js}

@@ -1,6 +1,6 @@
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./persistent-pty-rvfvac9x.js";
 
 // src/file-retention.ts
 var exports_file_retention = {};

package/dist/chunks/{project-3exk6c8a.js → persistent-pty-hs1p9dz7.js}

@@ -1,18 +1,18 @@
-import {
-  iife
-} from "./project-ehj9csmv.js";
 import {
   configuredSettings
-} from "./project-c3ca4w0m.js";
+} from "./persistent-pty-ym92bbkh.js";
 import {
-  exports_app
-} from "./project-50jxp3hw.js";
+  iife
+} from "./persistent-pty-ehj9csmv.js";
 import {
   exports_provider
-} from "./project-krsqcmnj.js";
+} from "./persistent-pty-krsqcmnj.js";
+import {
+  exports_app
+} from "./persistent-pty-50jxp3hw.js";
 import {
   __require
-} from "./project-rvfvac9x.js";
+} from "./persistent-pty-rvfvac9x.js";
 
 // src/plugin/provider/cloudflare-ai-gateway.ts
 import os from "os";
@@ -70,8 +70,8 @@ var CloudflareAIGatewayPlugin = define({
       if (!config)
         return;
       const metadata = gatewayMetadata(evt.options);
-      const { createAiGateway } = yield* Effect.promise(() => import("ai-gateway-provider")).pipe(Effect.orDie);
-      const { createUnified } = yield* Effect.promise(() => import("ai-gateway-provider/providers/unified")).pipe(Effect.orDie);
+      const { createAiGateway } = yield* Effect.promise(() => import("ai-gateway-provider"));
+      const { createUnified } = yield* Effect.promise(() => import("ai-gateway-provider/providers/unified"));
       const gateway = createAiGateway({
         accountId: config.accountId,
         gateway: config.gatewayId,

package/dist/chunks/persistent-pty-j32vdj8r.js

@@ -0,0 +1,16 @@
+// src/plugin/provider/sdk-factory.ts
+import { Effect } from "effect";
+import { pathToFileURL } from "url";
+import { importModule } from "@opencode-ai/util/runtime-import";
+var loadSDKFactory = Effect.fnUntraced(function* (npm, packageName) {
+  const installedPath = packageName.startsWith("file://") ? packageName : (yield* npm.add(packageName).pipe(Effect.orDie)).entrypoint;
+  if (!installedPath)
+    return yield* Effect.die(new Error(`Package ${packageName} has no import entrypoint`));
+  const mod = yield* Effect.promise(() => importModule(installedPath.startsWith("file://") ? installedPath : pathToFileURL(installedPath).href));
+  const match = Object.keys(mod).find((name) => name.startsWith("create"));
+  if (!match)
+    return yield* Effect.die(new Error(`Package ${packageName} has no provider factory export`));
+  return mod[match];
+});
+
+export { loadSDKFactory };

package/dist/chunks/{project-4bpp3tz5.js → persistent-pty-j39d0gcp.js}

@@ -1,33 +1,33 @@
 import {
   exports_migrate
-} from "./project-whk0g8cz.js";
-import {
-  exports_plugin
-} from "./project-9f0rnpkn.js";
+} from "./persistent-pty-mxjff6xk.js";
 import {
   exports_command
-} from "./project-thstd87d.js";
-import {
-  exports_mcp
-} from "./project-e1z9a0ts.js";
+} from "./persistent-pty-thstd87d.js";
 import {
-  exports_attachment
-} from "./project-r3k9abhd.js";
+  exports_plugin
+} from "./persistent-pty-9f0rnpkn.js";
 import {
   exports_provider
-} from "./project-18pv8fg3.js";
+} from "./persistent-pty-18pv8fg3.js";
+import {
+  exports_mcp
+} from "./persistent-pty-e1z9a0ts.js";
 import {
   exports_agent
-} from "./project-4s2xwh5d.js";
+} from "./persistent-pty-4s2xwh5d.js";
+import {
+  exports_attachment
+} from "./persistent-pty-r3k9abhd.js";
 import {
   exports_permission
-} from "./project-v9bfv94f.js";
+} from "./persistent-pty-v9bfv94f.js";
 import {
   PositiveInt
-} from "./project-j07kk359.js";
+} from "./persistent-pty-j07kk359.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./persistent-pty-rvfvac9x.js";
 
 // src/config/normalize.ts
 var exports_normalize = {};
@@ -36,6 +36,7 @@ __export(exports_normalize, {
   ConfigNormalize: () => exports_normalize
 });
 import { isDeepStrictEqual } from "node:util";
+import { isRecord } from "@opencode-ai/ai/utils/record";
 import { Option, Schema } from "effect";
 import { Info } from "@opencode-ai/schema/config";
 import { ConfigAgent } from "@opencode-ai/schema/config/agent";
@@ -601,9 +602,6 @@ function isDirectLegacyMcp(value) {
 function isEnabledOnlyMcp(value) {
   return isRecord(value) && !own(value, "type") && typeof value.enabled === "boolean";
 }
-function isRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 function isPlainRecord(value) {
   if (!isRecord(value))
     return false;

package/dist/chunks/{project-fzp6ntht.js → persistent-pty-j8t12rx3.js}

@@ -1,22 +1,23 @@
 import {
   exports_location
-} from "./project-m9g7vbdc.js";
+} from "./persistent-pty-d88p9jy9.js";
 import {
   exports_project
-} from "./project-36pd2x65.js";
+} from "./persistent-pty-wr6wwww9.js";
 import {
   exports_markers
-} from "./project-2f2nw00g.js";
+} from "./persistent-pty-4fpv6vze.js";
 import {
   AbsolutePath
-} from "./project-j07kk359.js";
+} from "./persistent-pty-j07kk359.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./persistent-pty-rvfvac9x.js";
 
 // src/location-mutation.ts
 var exports_location_mutation = {};
 __export(exports_location_mutation, {
+  resolvePath: () => resolvePath,
   node: () => node,
   externalDirectoryPermission: () => externalDirectoryPermission,
   Service: () => Service,
@@ -28,6 +29,7 @@ import { makeLocationNode } from "@opencode-ai/util/effect/app-node";
 import path from "path";
 import { Context, Effect, Layer, Schema } from "effect";
 import { FSUtil } from "@opencode-ai/util/fs-util";
+import { Global } from "@opencode-ai/util/global";
 var Kind = Schema.Literals(["file", "directory"]);
 var ResolveInput = Schema.Struct({
   path: Schema.String,
@@ -38,6 +40,10 @@ var externalDirectoryPermission = (input) => ({
   resources: [input.resource],
   save: [input.save]
 });
+var resolvePath = (directory, input, home = Global.Path.home) => {
+  const normalized = FSUtil.windowsPath(input);
+  return path.resolve(directory, normalized === "~" ? home : normalized.startsWith("~/") || process.platform === "win32" && normalized.startsWith("~\\") ? path.join(home, normalized.slice(2)) : normalized);
+};
 
 class Service extends Context.Service()("@opencode/LocationMutation") {
 }
@@ -47,8 +53,10 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
   const location = yield* exports_location.Service;
   const markers = yield* exports_markers.Service;
   const resolve = Effect.fnUntraced(function* (input) {
-    const absolute = path.resolve(location.directory, input.path);
-    if (FSUtil.contains(location.directory, absolute)) {
+    const absolute = resolvePath(location.directory, input.path);
+    const worktree = path.resolve(location.project.directory);
+    const internal = FSUtil.contains(location.directory, absolute) || worktree !== path.parse(worktree).root && FSUtil.contains(worktree, absolute);
+    if (internal) {
       return {
         absolute,
         resource: slash(path.relative(location.directory, absolute) || ".")
@@ -72,8 +80,8 @@ var layer = Layer.effect(Service, Effect.gen(function* () {
 }));
 var node = makeLocationNode({
   service: Service,
-  layer: layer.pipe(Layer.orDie),
+  layer,
   deps: [FSUtil.node, exports_location.node, exports_markers.node]
 });
 
-export { Kind, ResolveInput, externalDirectoryPermission, Service, node, exports_location_mutation };
+export { Kind, ResolveInput, externalDirectoryPermission, resolvePath, Service, node, exports_location_mutation };

package/dist/chunks/{project-ppjzdvsh.js → persistent-pty-jm9yfqhv.js}

@@ -1,9 +1,9 @@
 import {
   exports_bus
-} from "./project-5dkj9jex.js";
+} from "./persistent-pty-8dqs26x1.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./persistent-pty-rvfvac9x.js";
 
 // src/form.ts
 var exports_form = {};
@@ -252,7 +252,7 @@ function validateField(field, value) {
     }
     if (field.format === "email" && !/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value))
       return `Expected email for form field: ${field.key}`;
-    if (field.format === "uri" && !isUri(value))
+    if (field.format === "uri" && !URL.canParse(value))
       return `Expected URI for form field: ${field.key}`;
     if (field.format === "date" && !isDate(value))
       return `Expected date for form field: ${field.key}`;
@@ -296,14 +296,6 @@ function validateField(field, value) {
 function isStringArray(value) {
   return Array.isArray(value) && value.every((item) => typeof item === "string");
 }
-function isUri(value) {
-  try {
-    new URL(value);
-    return true;
-  } catch {
-    return false;
-  }
-}
 function isDate(value) {
   if (!/^\d{4}-\d{2}-\d{2}$/.test(value))
     return false;

package/dist/chunks/{project-awwcqzj5.js → persistent-pty-jmn1sgkw.js}

@@ -1,17 +1,17 @@
 import {
   exports_permission
-} from "./project-rzd353vk.js";
+} from "./persistent-pty-ckw7ggwg.js";
 import {
   exports_form
-} from "./project-ppjzdvsh.js";
+} from "./persistent-pty-jm9yfqhv.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./persistent-pty-rvfvac9x.js";
 
 // src/tool/plugin/question.ts
 var exports_question = {};
 __export(exports_question, {
-  toModelOutput: () => toModelOutput,
+  toModelContent: () => toModelContent,
   name: () => name,
   description: () => description,
   QuestionTool: () => exports_question,
@@ -46,7 +46,7 @@ class CancelledError extends Schema.TaggedError()("QuestionTool.CancelledError",
     return "The user dismissed this question";
   }
 }
-var toModelOutput = (questions, answers) => {
+var toModelContent = (questions, answers) => {
   const formatted = questions.map((question, index) => `"${question.question}"="${answers[index]?.length ? answers[index].join(", ") : "Unanswered"}"`).join(", ");
   return `User has answered your questions: ${formatted}. You can now continue with the user's answers in mind.`;
 };
@@ -93,7 +93,7 @@ var Plugin = {
         };
         return Effect.succeed({
           output,
-          content: toModelOutput(input.questions, output.answers),
+          content: toModelContent(input.questions, output.answers),
           metadata: { answers: output.answers }
         });
       }))
@@ -115,4 +115,4 @@ function toField(question, index) {
   };
 }
 
-export { name, description, Input, Output, CancelledError, toModelOutput, Plugin, exports_question };
+export { name, description, Input, Output, CancelledError, toModelContent, Plugin, exports_question };

package/dist/chunks/{project-k4w3wsd5.js → persistent-pty-jmntmgq9.js}

@@ -1,54 +1,45 @@
-import {
-  exports_message_updater
-} from "./project-bmknfyv0.js";
 import {
   exports_instruction_entry
-} from "./project-0p8g4tc4.js";
+} from "./persistent-pty-8n5xz4y2.js";
 import {
   exports_inbox
-} from "./project-mkaeg0rc.js";
+} from "./persistent-pty-ayrkq19e.js";
+import {
+  exports_message_updater
+} from "./persistent-pty-2knkewgs.js";
+import {
+  Slug
+} from "./persistent-pty-df3v2q6j.js";
 import {
   exports_instruction_state
-} from "./project-ztjk4rav.js";
+} from "./persistent-pty-0687t5rp.js";
 import {
   SessionInboxTable,
   SessionMessageTable,
   SessionTable
-} from "./project-ygy0xbqa.js";
-import {
-  SessionEvent
-} from "./project-a83yvq99.js";
+} from "./persistent-pty-q606pcse.js";
 import {
   SessionMessage
-} from "./project-8rpfd2h6.js";
-import {
-  exports_agent
-} from "./project-ehktr312.js";
-import {
-  exports_model
-} from "./project-r13w8t0w.js";
+} from "./persistent-pty-8rpfd2h6.js";
 import {
-  exports_workspace
-} from "./project-4e7fkx2j.js";
-import {
-  Slug
-} from "./project-df3v2q6j.js";
+  SessionEvent
+} from "./persistent-pty-a83yvq99.js";
 import {
   ProjectTable
-} from "./project-88jbfw8z.js";
+} from "./persistent-pty-c8ya26sa.js";
 import {
   AbsolutePath,
   RelativePath
-} from "./project-j07kk359.js";
+} from "./persistent-pty-j07kk359.js";
 import {
   exports_bus
-} from "./project-5dkj9jex.js";
+} from "./persistent-pty-8dqs26x1.js";
 import {
   exports_database
-} from "./project-d55ah2nc.js";
+} from "./persistent-pty-agy32ytt.js";
 import {
   __export
-} from "./project-rvfvac9x.js";
+} from "./persistent-pty-rvfvac9x.js";
 
 // src/session/projector.ts
 var exports_projector = {};
@@ -61,6 +52,9 @@ import { and, asc, desc, eq, gt, gte, inArray, isNull, lt, lte, or, sql } from "
 import { DateTime, Effect, Layer, Schema, Stream } from "effect";
 import path from "path";
 import { makeGlobalNode } from "@opencode-ai/util/effect/app-node";
+import { Agent } from "@opencode-ai/schema/agent";
+import { Model } from "@opencode-ai/schema/model";
+import { Workspace } from "@opencode-ai/schema/workspace";
 import { FSUtil } from "@opencode-ai/util/fs-util";
 import { Money } from "@opencode-ai/schema/money";
 import { Worktree } from "@opencode-ai/schema/worktree";
@@ -79,14 +73,14 @@ var forkTitle = (value) => {
     return `${match[1]} (fork #${Number.parseInt(match[2], 10) + 1})`;
   return `${value} (fork #1)`;
 };
-function applyUsage(db, sessionID, value, sign = 1) {
+function applyUsage(db, sessionID, value) {
   return db.update(SessionTable).set({
-    cost: sql`${SessionTable.cost} + ${value.cost * sign}`,
-    tokens_input: sql`${SessionTable.tokens_input} + ${value.tokens.input * sign}`,
-    tokens_output: sql`${SessionTable.tokens_output} + ${value.tokens.output * sign}`,
-    tokens_reasoning: sql`${SessionTable.tokens_reasoning} + ${value.tokens.reasoning * sign}`,
-    tokens_cache_read: sql`${SessionTable.tokens_cache_read} + ${value.tokens.cache.read * sign}`,
-    tokens_cache_write: sql`${SessionTable.tokens_cache_write} + ${value.tokens.cache.write * sign}`,
+    cost: sql`${SessionTable.cost} + ${value.cost}`,
+    tokens_input: sql`${SessionTable.tokens_input} + ${value.tokens.input}`,
+    tokens_output: sql`${SessionTable.tokens_output} + ${value.tokens.output}`,
+    tokens_reasoning: sql`${SessionTable.tokens_reasoning} + ${value.tokens.reasoning}`,
+    tokens_cache_read: sql`${SessionTable.tokens_cache_read} + ${value.tokens.cache.read}`,
+    tokens_cache_write: sql`${SessionTable.tokens_cache_write} + ${value.tokens.cache.write}`,
     time_updated: sql`${SessionTable.time_updated}`
   }).where(eq(SessionTable.id, sessionID)).run().pipe(Effect.orDie);
 }
@@ -134,6 +128,7 @@ var projectFork = Effect.fn("SessionProjector.projectFork")(function* (db, event
     title: forkTitle(parent.title ?? undefined),
     agent: parent.agent,
     model: parent.model,
+    metadata: parent.metadata,
     version: parent.version,
     cost: 0,
     tokens_input: 0,
@@ -180,10 +175,10 @@ function run(db, event) {
     const appendMessage = (message) => insertMessage(db, event, message);
     const adapter = {
       getAgent() {
-        return db.select({ agent: SessionTable.agent }).from(SessionTable).where(eq(SessionTable.id, event.data.sessionID)).get().pipe(Effect.orDie, Effect.map((row) => row?.agent ? exports_agent.ID.make(row.agent) : undefined));
+        return db.select({ agent: SessionTable.agent }).from(SessionTable).where(eq(SessionTable.id, event.data.sessionID)).get().pipe(Effect.orDie, Effect.map((row) => row?.agent ? Agent.ID.make(row.agent) : undefined));
       },
       getModel() {
-        return db.select({ model: SessionTable.model }).from(SessionTable).where(eq(SessionTable.id, event.data.sessionID)).get().pipe(Effect.orDie, Effect.map((row) => row?.model ? Schema.decodeUnknownSync(exports_model.Ref)(row.model) : undefined));
+        return db.select({ model: SessionTable.model }).from(SessionTable).where(eq(SessionTable.id, event.data.sessionID)).get().pipe(Effect.orDie, Effect.map((row) => row?.model ? Schema.decodeUnknownSync(Model.Ref)(row.model) : undefined));
       },
       getLocation() {
         return db.select({
@@ -194,7 +189,7 @@ function run(db, event) {
         }).from(SessionTable).where(eq(SessionTable.id, event.data.sessionID)).get().pipe(Effect.orDie, Effect.map((row) => row ? {
           location: {
             directory: AbsolutePath.make(row.directory),
-            workspaceID: row.workspaceID ? exports_workspace.ID.make(row.workspaceID) : undefined
+            workspaceID: row.workspaceID ? Workspace.ID.make(row.workspaceID) : undefined
           },
           projectID: row.projectID,
           subpath: row.subpath === null ? undefined : RelativePath.make(row.subpath)
@@ -277,7 +272,7 @@ var layer = Layer.effectDiscard(Effect.gen(function* () {
     const stored = yield* db.insert(SessionTable).values({
       id: event.data.sessionID,
       project_id: event.data.projectID,
-      workspace_id: event.data.location.workspaceID ? exports_workspace.ID.make(event.data.location.workspaceID) : null,
+      workspace_id: event.data.location.workspaceID ? Workspace.ID.make(event.data.location.workspaceID) : null,
       parent_id: event.data.parentID,
       slug: event.data.slug,
       directory: event.data.location.directory,
@@ -285,6 +280,7 @@ var layer = Layer.effectDiscard(Effect.gen(function* () {
       title: event.data.title,
       agent: event.data.agent,
       model: event.data.model,
+      metadata: event.data.metadata,
       version: event.data.version,
       time_created: event.created,
       time_updated: event.created
@@ -298,7 +294,7 @@ var layer = Layer.effectDiscard(Effect.gen(function* () {
       directory: event.data.location.directory,
       path: event.data.subpath,
       ...event.data.projectID ? { project_id: event.data.projectID } : {},
-      workspace_id: event.data.location.workspaceID ? exports_workspace.ID.make(event.data.location.workspaceID) : null,
+      workspace_id: event.data.location.workspaceID ? Workspace.ID.make(event.data.location.workspaceID) : null,
       time_updated: event.created
     }).where(eq(SessionTable.id, event.data.sessionID)).run().pipe(Effect.orDie);
   }));